Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RHOAIENG-7943] Navigate to pipeline details on import #3026

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
2 changes: 2 additions & 0 deletions frontend/src/__mocks__/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ export * from './mockDscStatus';
export * from './mockNotebookK8sResource';
export * from './mockPipelineKF';
export * from './mockSecretK8sResource';
export * from './mockGoogleRpcStatusKF';
export * from './mockK8sStatus';
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
/* eslint-disable camelcase */
import { mockDataSciencePipelineApplicationK8sResource } from '~/__mocks__/mockDataSciencePipelinesApplicationK8sResource';
import { mockK8sResourceList } from '~/__mocks__/mockK8sResourceList';
import { buildMockPipelineV2, buildMockPipelines } from '~/__mocks__/mockPipelinesProxy';
import {
mockDataSciencePipelineApplicationK8sResource,
mockK8sResourceList,
buildMockPipelineV2,
buildMockPipelines,
buildMockPipelineVersionV2,
buildMockPipelineVersionsV2,
} from '~/__mocks__/mockPipelineVersionsProxy';
import { mockProjectK8sResource } from '~/__mocks__/mockProjectK8sResource';
import { mockRouteK8sResource } from '~/__mocks__/mockRouteK8sResource';
mockProjectK8sResource,
mockRouteK8sResource,
mockSecretK8sResource,
mockSuccessGoogleRpcStatus,
} from '~/__mocks__';
import {
pipelinesGlobal,
pipelinesTable,
Expand All @@ -26,10 +29,8 @@ import {
SecretModel,
} from '~/__tests__/cypress/cypress/utils/models';
import { asProductAdminUser } from '~/__tests__/cypress/cypress/utils/mockUsers';
import { mockSecretK8sResource } from '~/__mocks__/mockSecretK8sResource';
import type { PipelineKFv2 } from '~/concepts/pipelines/kfTypes';
import { tablePagination } from '~/__tests__/cypress/cypress/pages/components/Pagination';
import { mockSuccessGoogleRpcStatus } from '~/__mocks__/mockGoogleRpcStatusKF';

const projectName = 'test-project-name';
const initialMockPipeline = buildMockPipelineV2({ display_name: 'Test pipeline' });
Expand Down Expand Up @@ -560,6 +561,11 @@ describe('Pipelines', () => {
// Intercept upload/re-fetch of pipelines
pipelineImportModal.mockUploadPipeline(uploadPipelineParams, projectName).as('uploadPipeline');
pipelinesTable.mockGetPipelines([initialMockPipeline], projectName);
pipelinesTable.mockGetPipelineVersions(
[initialMockPipelineVersion],
'new-pipeline',
projectName,
);

// Wait for the pipelines table to load
pipelinesTable.find();
Expand Down Expand Up @@ -601,8 +607,10 @@ describe('Pipelines', () => {
});
});

// Verify the uploaded pipeline is in the table
pipelinesTable.getRowById(uploadedMockPipeline.pipeline_id).find().should('exist');
cy.url().should(
'include',
`/pipelines/${projectName}/${uploadedMockPipeline.pipeline_id}/${initialMockPipelineVersion.pipeline_version_id}/view`,
);
});

it('fails to import a too-large file', () => {
Expand Down Expand Up @@ -637,17 +645,16 @@ describe('Pipelines', () => {
},
};
const createdMockPipeline = buildMockPipelineV2(createPipelineAndVersionParams.pipeline);
const createdVersion = buildMockPipelineVersionV2(
createPipelineAndVersionParams.pipeline_version,
);

// Intercept upload/re-fetch of pipelines
pipelineImportModal
.mockCreatePipelineAndVersion(createPipelineAndVersionParams, projectName)
.as('createPipelineAndVersion');
pipelinesTable.mockGetPipelines([initialMockPipeline], projectName);
pipelinesTable.mockGetPipelineVersions(
[buildMockPipelineVersionV2(createPipelineAndVersionParams.pipeline_version)],
initialMockPipeline.pipeline_id,
projectName,
);
pipelinesTable.mockGetPipelineVersions([createdVersion], 'new-pipeline', projectName);

// Wait for the pipelines table to load
pipelinesTable.find();
Expand All @@ -669,8 +676,10 @@ describe('Pipelines', () => {
cy.wait('@createPipelineAndVersion');
cy.wait('@refreshPipelines');

// Verify the uploaded pipeline is in the table
pipelinesTable.getRowById(createdMockPipeline.pipeline_id).find().should('exist');
cy.url().should(
'include',
`/pipelines/${projectName}/${createdMockPipeline.pipeline_id}/${createdVersion.pipeline_version_id}/view`,
);
});

it('uploads a new pipeline version', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import {
mockProjectK8sResource,
mockRouteK8sResource,
mockSecretK8sResource,
mockDataSciencePipelineApplicationK8sResource,
mockK8sResourceList,
mock404Error,
buildMockPipelineV2,
buildMockPipelines,
} from '~/__mocks__';
import { mockDataSciencePipelineApplicationK8sResource } from '~/__mocks__/mockDataSciencePipelinesApplicationK8sResource';
import { mockK8sResourceList } from '~/__mocks__/mockK8sResourceList';
import { mock404Error } from '~/__mocks__/mockK8sStatus';
import { buildMockPipelineV2, buildMockPipelines } from '~/__mocks__/mockPipelinesProxy';
import {
pipelinesTable,
configurePipelineServerModal,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import * as React from 'react';
import { useNavigate } from 'react-router-dom';

import {
Alert,
Button,
Expand All @@ -10,13 +12,15 @@ import {
TextArea,
TextInput,
} from '@patternfly/react-core';

import { usePipelinesAPI } from '~/concepts/pipelines/context';
import { usePipelineImportModalData } from '~/concepts/pipelines/content/import/useImportModalData';
import { PipelineKFv2 } from '~/concepts/pipelines/kfTypes';
import { getDisplayNameFromK8sResource } from '~/concepts/k8s/utils';
import { DuplicateNameHelperText } from '~/concepts/pipelines/content/DuplicateNameHelperText';
import { getNameEqualsFilter } from '~/concepts/pipelines/utils';
import useDebounceCallback from '~/utilities/useDebounceCallback';
import { pipelineVersionDetailsRoute } from '~/routes';
import PipelineUploadRadio from './PipelineUploadRadio';
import { PipelineUploadOption } from './utils';

Expand All @@ -26,7 +30,8 @@ type PipelineImportModalProps = {
};

const PipelineImportModal: React.FC<PipelineImportModalProps> = ({ isOpen, onClose }) => {
const { project, api, apiAvailable } = usePipelinesAPI();
const navigate = useNavigate();
const { project, api, apiAvailable, namespace } = usePipelinesAPI();
const [importing, setImporting] = React.useState(false);
const [error, setError] = React.useState<Error | undefined>();
const [{ name, description, fileContents, pipelineUrl, uploadOption }, setData, resetData] =
Expand All @@ -39,12 +44,35 @@ const PipelineImportModal: React.FC<PipelineImportModalProps> = ({ isOpen, onClo
!name ||
(uploadOption === PipelineUploadOption.URL_IMPORT ? !pipelineUrl : !fileContents);

const onBeforeClose = (pipeline?: PipelineKFv2) => {
onClose(pipeline);
setImporting(false);
setError(undefined);
resetData();
};
const onBeforeClose = React.useCallback(
(pipeline?: PipelineKFv2) => {
onClose(pipeline);
setImporting(false);
setError(undefined);
resetData();
},
[onClose, resetData],
);

const onSubmitSuccess = React.useCallback(
async (pipeline: PipelineKFv2) => {
onBeforeClose(pipeline);

const { pipeline_versions: versions } = await api.listPipelineVersions(
{},
pipeline.pipeline_id,
{
pageSize: 1,
},
);
const versionId = versions?.[0].pipeline_version_id;

if (versionId) {
navigate(pipelineVersionDetailsRoute(namespace, pipeline.pipeline_id, versionId));
}
},
[api, namespace, navigate, onBeforeClose],
);

const checkForDuplicateName = useDebounceCallback(
React.useCallback(
Expand Down Expand Up @@ -72,7 +100,7 @@ const PipelineImportModal: React.FC<PipelineImportModalProps> = ({ isOpen, onClo
if (uploadOption === PipelineUploadOption.FILE_UPLOAD) {
api
.uploadPipeline({}, name, description, fileContents)
.then((pipeline) => onBeforeClose(pipeline))
.then(onSubmitSuccess)
.catch((e) => {
setImporting(false);
setError(e);
Expand All @@ -97,7 +125,7 @@ const PipelineImportModal: React.FC<PipelineImportModalProps> = ({ isOpen, onClo
},
},
)
.then((pipeline) => onBeforeClose(pipeline))
.then(onSubmitSuccess)
.catch((e) => {
setImporting(false);
setError(e);
Expand Down
Loading