merge: Merge branch 'ESAS/display_etl_runner_name_PROD-13334'

Author: esasova

cypress/e2e/brewery/DatasetManager.cy.js

@@ -9,6 +9,8 @@ import {
   DATASETS_TO_REFRESH,
   ORGANIZATION_WITH_DEFAULT_ROLE_USER,
 } from '../../fixtures/stubbing/DatasetManager';
+import { RUNNERS_FOR_ETL_DATASETS } from '../../fixtures/stubbing/DatasetManager/runners';
+import { SOLUTION_WITH_TRANSLATED_RUN_TEMPLATES } from '../../fixtures/stubbing/DatasetManager/solutions';
 import { USER_EXAMPLE } from '../../fixtures/stubbing/default';
 
 const WORKSPACES = [WORKSPACE];
@@ -43,30 +45,48 @@ describe('Data edition in dataset manager', () => {
   before(() => {
     stub.start();
     stub.setWorkspaces(WORKSPACES);
+    stub.setSolutions([SOLUTION_WITH_TRANSLATED_RUN_TEMPLATES]);
     // we use the copy of DATASETS array to be able to reuse the same fixture
     // in all tests in the suite. The cypress doc says that  "fixture files are
     // assumed to be unchanged during the test, and thus Cypress loads them just once",
     // perhaps, we are modifying the list while creating and deleting datasets, so,
     // to keep the same list at the beginning of every describe block, we provide a copy
     // to stubbing function
     stub.setDatasets([...DATASETS]);
+    stub.setRunners(RUNNERS_FOR_ETL_DATASETS);
   });
   beforeEach(() => Login.login({ url: '/W-stbbdbrwryWithDM', workspaceId: 'W-stbbdbrwryWithDM' }));
   after(stub.stop);
 
-  it('can edit datasets metadata', () => {
+  it('can display and edit datasets metadata', () => {
     const DATASET_A = DATASETS[0];
     const DATASET_B = DATASETS[1];
+    const DATASET_ETL = DATASETS[3];
+    const SUBDATASET = DATASETS[4];
     const DATASET_Z = DATASETS[2]; // Non-main dataset
 
     DatasetManager.ignoreDatasetTwingraphQueries();
     DatasetManager.switchToDatasetManagerView();
 
-    DatasetManager.getDatasetsListItemButtons().should('have.length', 2);
+    DatasetManager.getDatasetsListItemButtons().should('have.length', 4);
     DatasetManager.getDatasetsListItemButton(DATASET_A.id).should('be.visible');
     DatasetManager.getDatasetsListItemButton(DATASET_B.id).should('be.visible');
+    DatasetManager.getDatasetsListItemButton(DATASET_ETL.id).should('be.visible');
+    DatasetManager.getDatasetsListItemButton(SUBDATASET.id).should('be.visible');
     DatasetManager.getDatasetsListItemButton(DATASET_Z.id).should('not.exist');
 
+    DatasetManager.selectDatasetById(DATASET_ETL.id);
+    DatasetManager.getDatasetMetadataSourceType().should(
+      'have.text',
+      'Source:' + 'ETL run template with dynamic filter'
+    );
+
+    DatasetManager.selectDatasetById(SUBDATASET.id);
+    DatasetManager.getDatasetMetadataSourceType().should(
+      'have.text',
+      'Source:' + 'Subdataset run template with static filter'
+    );
+
     DatasetManager.selectDatasetById(DATASET_A.id);
     DatasetManager.getDatasetMetadataDescription().should('contain', DATASET_A.description);
     DatasetManager.getDatasetMetadataTags().should('have.length', 2);
@@ -136,7 +156,7 @@ describe('Dataset creation', () => {
 
     DatasetManager.ignoreDatasetTwingraphQueries();
     DatasetManager.switchToDatasetManagerView();
-    DatasetManager.getDatasetsListItemButtons().should('have.length', 2);
+    DatasetManager.getDatasetsListItemButtons().should('have.length', 4);
     DatasetManager.startDatasetCreation();
     DatasetManager.setNewDatasetName(datasetName);
     datasetTags.forEach((tag) => DatasetManager.addNewDatasetTag(tag));
@@ -251,14 +271,16 @@ describe('Dataset delete', () => {
   it('can delete all scenarios from the list and display noDatasets placeholder', () => {
     DatasetManager.ignoreDatasetTwingraphQueries();
     DatasetManager.switchToDatasetManagerView();
-    DatasetManager.getDatasetsListItemButtons().should('have.length', 2);
+    DatasetManager.getDatasetsListItemButtons().should('have.length', 4);
     DatasetManager.getDatasetDeleteButton(DATASETS[0].id).click();
     DatasetManager.getDeleteDatasetDialog().should('be.visible');
     DatasetManager.getDeleteDatasetDialogBody().contains(DATASETS[0].name);
     DatasetManager.closeDeleteDatasetDialog();
     DatasetManager.deleteDataset(DATASETS[0].id, DATASETS[0].name);
-    DatasetManager.getDatasetsListItemButtons().should('have.length', 1);
+    DatasetManager.getDatasetsListItemButtons().should('have.length', 3);
     DatasetManager.deleteDataset(DATASETS[1].id, DATASETS[1].name);
+    DatasetManager.deleteDataset(DATASETS[3].id, DATASETS[3].name);
+    DatasetManager.deleteDataset(DATASETS[4].id, DATASETS[4].name);
     DatasetManager.getNoDatasetsPlaceholder().should('be.visible');
     DatasetManager.getNoDatasetsPlaceholderUserSubtitle().should('not.exist'); // Default role not set to "user"
   });

cypress/fixtures/stubbing/DatasetManager/datasets.js

@@ -35,6 +35,39 @@ const FILE_DATASET_NON_MAIN = {
   description: 'hidden dataset',
 };
 
+const ETL_DATASET = {
+  ...EDITABLE_DATASET,
+  main: true,
+  id: 'D-stbdataset13',
+  parentId: 'D-stbdataset2',
+  name: 'Dataset ETL',
+  description: 'ETL dataset',
+  sourceType: 'ETL',
+  source: {
+    location: 'W-stbbdbrwry',
+    name: 'r-stbdrnr1',
+    path: null,
+    jobId: 'run-stbrun1',
+  },
+  tags: ['dataset', 'ETL'],
+};
+
+const SUBDATASET = {
+  ...EDITABLE_DATASET,
+  main: true,
+  id: 'D-stbdataset14',
+  name: 'Subdataset',
+  description: 'ETL dataset',
+  sourceType: 'ETL',
+  source: {
+    location: 'W-stbbdbrwry',
+    name: 'r-stbdrnr2',
+    path: null,
+    jobId: 'run-stbrun2',
+  },
+  tags: ['dataset', 'ETL'],
+};
+
 const DATASET_AMSTERDAM = {
   ...EDITABLE_DATASET,
   id: 'D-stbdataset3',
@@ -125,7 +158,7 @@ const DATASET_TWINGRAPH_B = {
   twincacheStatus: 'FULL',
 };
 
-export const DATASETS = [FILE_DATASET_MAIN_A, FILE_DATASET_MAIN_B, FILE_DATASET_NON_MAIN];
+export const DATASETS = [FILE_DATASET_MAIN_A, FILE_DATASET_MAIN_B, FILE_DATASET_NON_MAIN, ETL_DATASET, SUBDATASET];
 
 export const DATASETS_TO_FILTER = [
   DATASET_AMSTERDAM,

cypress/fixtures/stubbing/DatasetManager/runners.js

@@ -0,0 +1,29 @@
+// Copyright (c) Cosmo Tech.
+// Licensed under the MIT license.
+import { DEFAULT_RUNNER } from '../default';
+
+const EDITABLE_RUNNER = {
+  ...DEFAULT_RUNNER,
+  status: 'Running',
+  security: { default: 'admin', accessControlList: [] },
+};
+
+const RUNNER_ETL = {
+  ...EDITABLE_RUNNER,
+  id: 'r-stbdrnr1',
+  organizationId: 'O-stbdbrwry',
+  name: 'ETL Runner',
+  description: 'Runner for ETL',
+  runTemplateId: 'etl_run_template',
+};
+
+const RUNNER_SUBDATASET = {
+  ...EDITABLE_RUNNER,
+  id: 'r-stbdrnr2',
+  organizationId: 'O-stbdbrwry',
+  name: 'Subdataset runner',
+  description: 'Runner for subdataset ETL',
+  runTemplateId: 'subdataset_run_template',
+};
+
+export const RUNNERS_FOR_ETL_DATASETS = [RUNNER_ETL, RUNNER_SUBDATASET];

cypress/fixtures/stubbing/DatasetManager/solutions.js

@@ -68,3 +68,23 @@ export const SOLUTION_WITH_DYNAMIC_VALUES = {
     { id: 'dynamic_values_enum_filter', parameterGroups: ['dynamicValuesEnumGroup'], tags: ['subdatasource'] },
   ],
 };
+
+export const SOLUTION_WITH_TRANSLATED_RUN_TEMPLATES = {
+  ...DEFAULT_SOLUTION,
+  runTemplates: [
+    ...DEFAULT_SOLUTION.runTemplates,
+    {
+      id: 'etl_run_template',
+      labels: { en: 'ETL run template with dynamic filter', fr: 'Run template avec un filtre dynamique' },
+      tags: ['datasource'],
+    },
+    {
+      id: 'subdataset_run_template',
+      labels: {
+        en: 'Subdataset run template with static filter',
+        fr: 'Run template de sous-dataset avec un filtre statique',
+      },
+      tags: ['subdatasource'],
+    },
+  ],
+};

src/views/DatasetManager/components/DatasetMetadata/DatasetMetadata.js

@@ -23,7 +23,8 @@ const useStyles = makeStyles((theme) => ({
 export const DatasetMetadata = () => {
   const classes = useStyles();
   const { t } = useTranslation();
-  const { dataset, updateDataset, selectedDatasetIndex, parentDatasetName } = useDatasetMetadata();
+  const { dataset, updateDataset, selectedDatasetIndex, parentDatasetName, etlDatasetRunTemplateName } =
+    useDatasetMetadata();
   const datasetId = dataset?.id;
   const userPermissionsOnDataset = dataset?.security?.currentUserPermissions ?? [];
 
@@ -123,7 +124,7 @@ export const DatasetMetadata = () => {
         <MetadataItem
           id="source-type"
           label={t('commoncomponents.datasetmanager.metadata.sourceType', 'Source')}
-          value={dataset?.sourceType}
+          value={etlDatasetRunTemplateName || dataset?.sourceType}
         ></MetadataItem>
         <MetadataItem
           id="api-url"

src/views/DatasetManager/components/DatasetMetadata/DatasetMetadataHook.js

@@ -1,16 +1,33 @@
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
   useCurrentDataset,
   useDatasets,
   useUpdateDataset,
   useSelectedDatasetIndex,
 } from '../../../../state/hooks/DatasetHooks';
+import { useGetETLRunners } from '../../../../state/hooks/RunnerHooks';
+import { TranslationUtils } from '../../../../utils';
 
 export const useDatasetMetadata = () => {
+  const { t } = useTranslation();
   const currentDataset = useCurrentDataset();
   const selectedDatasetIndex = useSelectedDatasetIndex();
+  const runners = useGetETLRunners();
+
+  const etlDatasetRunTemplateName = useMemo(() => {
+    if (currentDataset?.sourceType === 'ETL') {
+      const datasetRelatedRunner = runners.find((runner) => runner.id === currentDataset?.source?.name) || null;
+      return datasetRelatedRunner
+        ? t(
+            TranslationUtils.getRunTemplateTranslationKey(datasetRelatedRunner?.runTemplateId),
+            datasetRelatedRunner?.runTemplateId
+          )
+        : '';
+    }
+  }, [currentDataset, runners, t]);
   const updateDataset = useUpdateDataset();
 
   const datasets = useDatasets();
@@ -20,5 +37,5 @@ export const useDatasetMetadata = () => {
     return parentDataset?.name;
   }, [datasets, currentDataset?.parentId]);
 
-  return { dataset: currentDataset, updateDataset, selectedDatasetIndex, parentDatasetName };
+  return { dataset: currentDataset, updateDataset, selectedDatasetIndex, parentDatasetName, etlDatasetRunTemplateName };
 };

src/views/DatasetManager/components/UpdateDatasetButton/components/UpdateDatasetDialog.js

@@ -70,5 +70,5 @@ UpdateDatasetDialog.propTypes = {
   open: PropTypes.bool.isRequired,
   closeDialog: PropTypes.func.isRequired,
   dataset: PropTypes.object.isRequired,
-  selectedRunner: PropTypes.object.isRequired,
+  selectedRunner: PropTypes.object,
 };