From fc70874739f717210a03f5d799d989765e175d6d Mon Sep 17 00:00:00 2001 From: Victor Frunze Date: Mon, 9 Dec 2024 16:20:07 +0200 Subject: [PATCH] MWB-900: conceptual mappings fix --- mapping_workbench/frontend/cypress.config.js | 2 +- .../cypress/e2e/conceptualMappingsDevelop.feature | 1 - .../conceptualMappingsDevelopSteps.js | 4 ++-- .../cypress/e2e/conceptualMappingsOverview.feature | 1 - .../conceptualMappingsOverviewSteps.js | 4 ++-- .../cypress/e2e/conceptualMappingsReview.feature | 1 - .../conceptualMappingsReviewSteps.js | 4 ++-- .../conceptual-mapping-rule/conceptual-mapping-tabs.js | 10 +++++++--- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/mapping_workbench/frontend/cypress.config.js b/mapping_workbench/frontend/cypress.config.js index 3fe57905e..258722025 100644 --- a/mapping_workbench/frontend/cypress.config.js +++ b/mapping_workbench/frontend/cypress.config.js @@ -38,7 +38,7 @@ module.exports = defineConfig({ "cypress/e2e/fieldsDevelop.feature", "cypress/e2e/fieldsTree.feature", "cypress/e2e/fieldsOverview.feature", - //ConceptualMappings + //Conceptual Mappings "cypress/e2e/conceptualMappingsDevelop.feature", "cypress/e2e/conceptualMappingsReview.feature", "cypress/e2e/conceptualMappingsOverview.feature", diff --git a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop.feature b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop.feature index 537d3be60..503ae7a24 100644 --- a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop.feature +++ b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop.feature @@ -5,7 +5,6 @@ Feature: Conceptual Mappings Rules Develop Background: Given Session Login Then Go Home - Then I open side menu Scenario: View Conceptual Mapping Then I click on CM Develop diff --git a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop/conceptualMappingsDevelopSteps.js b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop/conceptualMappingsDevelopSteps.js index 56eec7408..f404b3aa6 100644 --- a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop/conceptualMappingsDevelopSteps.js +++ b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsDevelop/conceptualMappingsDevelopSteps.js @@ -19,8 +19,8 @@ Given('Session Login', () => { When('I click on CM Develop', () => { cy.intercept('GET', appURLPrefix + 'conceptual_mapping_rules*',).as('get') - cy.get('#nav_conceptual_mappings').click(); - cy.get(':nth-child(1) > #nav_develop').eq(1).click(); + cy.get('#conceptual_mappings').click(); + cy.get('#conceptual_mappings_develop_tab').click(); }) diff --git a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview.feature b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview.feature index 579126dcc..c54e83d26 100644 --- a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview.feature +++ b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview.feature @@ -5,7 +5,6 @@ Feature: Conceptual Mappings Rules Overview Background: Given Session Login Then Go Home - Then I open side menu Scenario: View Conceptual Mapping Then I click on CM Overview diff --git a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview/conceptualMappingsOverviewSteps.js b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview/conceptualMappingsOverviewSteps.js index 139a0b2da..3e9af1c93 100644 --- a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview/conceptualMappingsOverviewSteps.js +++ b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsOverview/conceptualMappingsOverviewSteps.js @@ -19,8 +19,8 @@ Given('Session Login', () => { When('I click on CM Overview', () => { cy.intercept('GET', appURLPrefix + 'conceptual_mapping_rules*',).as('get') - cy.get('#nav_conceptual_mappings').click(); - cy.get(':nth-child(3) > #nav_overview').click(); + cy.get('#conceptual_mappings').click(); + cy.get('#conceptual_mappings_overview_tab').click(); }) diff --git a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview.feature b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview.feature index bd1fcc5fc..3d38a077e 100644 --- a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview.feature +++ b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview.feature @@ -5,7 +5,6 @@ Feature: Conceptual Mappings Rules Review Background: Given Session Login Then Go Home - Then I open side menu Scenario: View Conceptual Mapping Then I click on CM Review diff --git a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview/conceptualMappingsReviewSteps.js b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview/conceptualMappingsReviewSteps.js index 13d6f1b20..40e38f98a 100644 --- a/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview/conceptualMappingsReviewSteps.js +++ b/mapping_workbench/frontend/cypress/e2e/conceptualMappingsReview/conceptualMappingsReviewSteps.js @@ -19,8 +19,8 @@ Given('Session Login', () => { When('I click on CM Review', () => { cy.intercept('GET', appURLPrefix + 'conceptual_mapping_rules*',).as('get') - cy.get('#nav_conceptual_mappings').click(); - cy.get('#nav_review').click(); + cy.get('#conceptual_mappings').click(); + cy.get('#conceptual_mappings_review_tab').click(); }) diff --git a/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/conceptual-mapping-tabs.js b/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/conceptual-mapping-tabs.js index 0093180e0..ff3fd4faf 100644 --- a/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/conceptual-mapping-tabs.js +++ b/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/conceptual-mapping-tabs.js @@ -6,15 +6,18 @@ import {paths} from '../../../paths'; const TABS = [ { label: 'In development', - value: paths.app.conceptual_mapping_rules.develop.index + value: paths.app.conceptual_mapping_rules.develop.index, + id:'conceptual_mappings_develop_tab' }, { label: 'In review', - value: paths.app.conceptual_mapping_rules.review.index + value: paths.app.conceptual_mapping_rules.review.index, + id:'conceptual_mappings_review_tab' }, { label: 'Approved', - value: paths.app.conceptual_mapping_rules.overview.index + value: paths.app.conceptual_mapping_rules.overview.index, + id:'conceptual_mappings_overview_tab' }] export const ConceptualMappingTabs = () => { @@ -24,6 +27,7 @@ export const ConceptualMappingTabs = () => { return {TABS.map(tab => )}