MWB-900: conceptual mappings fix

meaningfy-ws · Dec 9, 2024 · fc70874 · fc70874
1 parent 68945a2
commit fc70874
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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/...orkbench/frontend/cypress/e2e/conceptualMappingsDevelop/conceptualMappingsDevelopSteps.js b/...orkbench/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
@@ -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/...kbench/frontend/cypress/e2e/conceptualMappingsOverview/conceptualMappingsOverviewSteps.js b/...kbench/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
@@ -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/..._workbench/frontend/cypress/e2e/conceptualMappingsReview/conceptualMappingsReviewSteps.js b/..._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/...ng_workbench/frontend/src/sections/app/conceptual-mapping-rule/conceptual-mapping-tabs.js b/...ng_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 value={router.pathname}
                  onChange={handleTabsChange}>
         {TABS.map(tab => <Tab key={tab.value}
+                              id={tab.id}
                               label={tab.label}
                               value={tab.value}/>)}
     </Tabs>