Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions Dockerfile.dev-mcp
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@

FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder

USER 0

WORKDIR /opt/app-root

ENV HUSKY=0
USER 0

ENV HUSKY=0
COPY web/package*.json web/
COPY Makefile Makefile
COPY scripts/update-plugin-name.sh scripts/update-plugin-name.sh
COPY web/ web/

RUN make update-plugin-name

ENV I18N_NAMESPACE="plugin__monitoring-console-plugin"

RUN make install-frontend-ci

COPY web/ web/
COPY config/ config/
ENV CONSOLE_PLUGIN_NAME="monitoring-console-plugin"
RUN make build-frontend

FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS go-builder
Expand Down
41 changes: 15 additions & 26 deletions web/src/components/dashboards/perses/dashboard-action-modals.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
useUpdateDashboardMutation,
useCreateDashboardMutation,
useDeleteDashboardMutation,
useCreateProjectMutation,
} from './dashboard-api';
import {
renameDashboardDialogValidationSchema,
Expand All @@ -39,7 +38,11 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { DashboardResource, getResourceExtendedDisplayName } from '@perses-dev/core';
import { useToast } from './ToastProvider';
import { generateMetadataName } from './dashboard-utils';
import { DashboardDeniedHelperText, useDashboardProjects } from './dashboard-dialog-helpers';
import {
DashboardDeniedHelperText,
useDashboardProjects,
useProjectCreation,
} from './dashboard-dialog-helpers';
import { useOcpProjects } from './hooks/useOcpProjects';
import { usePersesDashboardAccess } from './hooks/usePersesDashboardAccess';
import { t_global_spacer_200, t_global_font_weight_200 } from '@patternfly/react-tokens';
Expand Down Expand Up @@ -195,7 +198,7 @@ export const DuplicateActionModal = ({ dashboard, isOpen, onClose }: ActionModal

const { ocpProjects } = useOcpProjects();
const { availableProjects } = useDashboardProjects();
const createProjectMutation = useCreateProjectMutation();
const { ensureProjectExists, isCreatingProject } = useProjectCreation();

const defaultProject = useMemo(() => {
if (!dashboard) return '';
Expand Down Expand Up @@ -293,27 +296,10 @@ export const DuplicateActionModal = ({ dashboard, isOpen, onClose }: ActionModal
}

const processForm: SubmitHandler<CreateDashboardValidationType> = async (data) => {
// Check if project exists, create it if it doesn't
const projectExists = ocpProjects?.some(
(project) => project.metadata.name === data.projectName,
);

if (!projectExists) {
try {
await createProjectMutation.mutateAsync(data.projectName);
addAlert(
t('Project "{{project}}" created successfully', { project: data.projectName }),
'success',
);
} catch (projectError) {
const errorMessage =
projectError?.message ||
t('Failed to create project "{{project}}". Please try again.', {
project: data.projectName,
});
addAlert(t('Error creating project: {{error}}', { error: errorMessage }), 'danger');
return;
}
try {
await ensureProjectExists(data.projectName);
} catch {
return;
}

const newDashboard: DashboardResource = {
Expand Down Expand Up @@ -472,9 +458,12 @@ export const DuplicateActionModal = ({ dashboard, isOpen, onClose }: ActionModal
checkingAccess ||
createDenied ||
isSchemaLoading ||
createDashboardMutation.isPending
createDashboardMutation.isPending ||
isCreatingProject
}
isLoading={
createDashboardMutation.isPending || isCreatingProject || isSchemaLoading
}
isLoading={createDashboardMutation.isPending || isSchemaLoading}
>
{t('Duplicate')}
</Button>
Expand Down