@dhis2-ui/organisation-unit-tree 9.4.3 → 9.4.5

package/build/es/__e2e__/get-organisation-unit-data.js

@@ -0,0 +1,131 @@
+const createResponse = _ref => {
+  let {
+    fields,
+    id,
+    path,
+    displayName,
+    children
+  } = _ref;
+  return { ...(fields.includes('id') ? {
+      id
+    } : {}),
+    ...(fields.includes('path') ? {
+      path
+    } : {}),
+    ...(fields.includes('displayName') ? {
+      displayName
+    } : {}),
+    ...(fields.includes('children::size') ? {
+      children: children.length
+    } : {}),
+    ...(fields.includes('children[id,path,displayName]') ? {
+      children
+    } : {})
+  };
+};
+
+export const getOrganisationUnitData = (id, _ref2) => {
+  let {
+    fields
+  } = _ref2;
+  let data;
+
+  if (id === 'A0000000000') {
+    data = createResponse({
+      fields,
+      id: 'A0000000000',
+      path: '/A0000000000',
+      displayName: 'Org Unit 1',
+      children: [{
+        id: 'A0000000001',
+        path: '/A0000000000/A0000000001',
+        displayName: 'Org Unit 2'
+      }, {
+        id: 'A0000000002',
+        path: '/A0000000000/A0000000002',
+        displayName: 'Org Unit 3'
+      }, {
+        id: 'A0000000006',
+        path: '/A0000000000/A0000000006',
+        displayName: 'Org Unit 7'
+      }]
+    });
+  }
+
+  if (id === 'A0000000001') {
+    data = createResponse({
+      fields,
+      id: 'A0000000001',
+      path: '/A0000000000/A0000000001',
+      displayName: 'Org Unit 2',
+      children: [{
+        id: 'A0000000003',
+        path: '/A0000000000/A0000000001/A0000000003',
+        children: [],
+        displayName: 'Org Unit 4'
+      }, {
+        id: 'A0000000004',
+        path: '/A0000000000/A0000000001/A0000000004',
+        children: [],
+        displayName: 'Org Unit 5'
+      }]
+    });
+  }
+
+  if (id === 'A0000000002') {
+    data = createResponse({
+      fields,
+      displayName: 'Org Unit 3',
+      id: 'A0000000002',
+      path: '/A0000000000/A0000000002',
+      children: []
+    });
+  }
+
+  if (id === 'A0000000003') {
+    data = createResponse({
+      fields,
+      displayName: 'Org Unit 4',
+      id: 'A0000000003',
+      path: '/A0000000000/A0000000001/A0000000003',
+      children: [{
+        id: 'A0000000007',
+        path: '/A0000000000/A0000000001/A0000000003/A0000000007',
+        children: [],
+        displayName: 'Org Unit 8'
+      }]
+    });
+  }
+
+  if (id === 'A0000000004') {
+    data = createResponse({
+      fields,
+      displayName: 'Org Unit 5',
+      id: 'A0000000004',
+      path: '/A0000000000/A0000000001/A0000000004',
+      children: []
+    });
+  }
+
+  if (id === 'A0000000006') {
+    data = createResponse({
+      fields,
+      displayName: 'Org Unit 7',
+      id: 'A0000000006',
+      path: '/A0000000000/A0000000006',
+      children: []
+    });
+  }
+
+  if (id === 'A0000000007') {
+    data = createResponse({
+      fields,
+      displayName: 'Org Unit 8',
+      id: 'A0000000007',
+      path: '/A0000000000/A0000000001/A0000000003/A0000000007',
+      children: []
+    });
+  }
+
+  return data;
+};

package/build/es/__e2e__/namespace.js

@@ -0,0 +1 @@
+export const namespace = 'OrganisationUnitTree';

package/build/es/features/children_as_child_nodes/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('an OrganisationUnitTree with children is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'Closed with children');
 });

package/build/es/features/controlled_expanded/index.js

@@ -1,5 +1,6 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { getOrganisationUnitData, namespace } from '../../__e2e__/common.js';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
+import { getOrganisationUnitData } from '../../__e2e__/get-organisation-unit-data.js';
+import { namespace } from '../../__e2e__/namespace.js';
 
 const expectOrgUnitsToBeDisplayed = ids => {
   const expandedLabels = ids.map(id => getOrganisationUnitData(id, {

package/build/es/features/displaying_loading_error/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given("loading errors do not display automatically and loading A0000000001's children will fail", () => {
   cy.visitStory('OrganisationUnitTree', 'A0000000001 loading error');
 });

package/build/es/features/expanded/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 
 const getRootOrgUnitByLabel = label => {
   const rootOrgUnitLabelSelector = "\n        [data-test=\"dhis2-uiwidgets-orgunittree\"]\n        > [data-test=\"dhis2-uiwidgets-orgunittree-node\"]\n        > [data-test=\"dhis2-uiwidgets-orgunittree-node-content\"]\n        > [data-test=\"dhis2-uiwidgets-orgunittree-node-label\"]\n        label\n    ";

package/build/es/features/force_reload/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('a OrganisationUnitTree with three levels is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'Force reloading');
 });

package/build/es/features/highlight/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('a OrganisationUnitTree with a highlighted root unit is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'Root highlighted');
 });

package/build/es/features/loading_state/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('a OrganisationUnitTree with two levels is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'A0000000001 loading');
 });

package/build/es/features/multi_selection/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('an OrganisationUnitTree with two levels is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'Multiple selection');
 });

package/build/es/features/no_selection/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('a disabled, collapsed OrganisationUnitTree with two levels is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'No selection closed');
 });

package/build/es/features/path_based_filtering/index.js

@@ -1,4 +1,4 @@
-import { Before, Given, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Before, Given, Then } from '@badeball/cypress-cucumber-preprocessor';
 Before(() => {
   cy.wrap([]).as('displayedUnits');
 });
@@ -47,7 +47,7 @@ Then('the second node on the first level is visible', () => {
   cy.getOrgUnitByLabel('Org Unit 3').should('exist');
   addDisplayedUnit('A0000000002');
 });
-Then('all other nodes are not rendered', async () => {
+Then('all other nodes are not rendered', () => {
   cy.get('@displayedUnits').then(displayedUnits => {
     cy.window().then(win => {
       const excludedUnitNumbers = win.allUnits.filter(unit => !displayedUnits.includes(unit)).map(id => parseInt(id.replace(/^.*(\d)$/, '$1'), 10) + 1);

package/build/es/features/single_selection/index.js

@@ -1,8 +1,8 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 Given('an OrganisationUnitTree with two nodes is rendered', () => {
   cy.visitStory('OrganisationUnitTree', 'Single selection');
 });
-Given('no unit is selected', () => {
+Given('no unit has been selected', () => {
   cy.get('.checked').should('not.exist');
 });
 Given('the first unit has been selected', () => {
@@ -27,9 +27,5 @@ Then('the second unit is selected', () => {
   cy.getOrgUnitByLabel('Org Unit 2').shouldBeASelectedOrgUnitNode(true);
 });
 Then('no unit is selected', () => {
-  cy.get('[data-test="dhis2-uiwidgets-orgunittree-node"]').should($nodes => {
-    $nodes.each((index, node) => {
-      cy.wrap(Cypress.$(node)).shouldNotBeASelectedOrgUnitNode();
-    });
-  });
+  cy.get('.checked').should('not.exist');
 });

package/build/es/features/single_selection.feature

@@ -2,7 +2,7 @@ Feature: When specified only one unit can be selected
 
     Scenario: The user selects a unit when no other unit is selected
         Given an OrganisationUnitTree with two nodes is rendered
-        And no unit is selected
+        And no unit has been selected
         When the user selects the first unit
         Then the first unit is selected
 

package/build/es/features/sub_unit_as_root/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 const rootOrgUnitLabelSelector = "\n    [data-test=\"dhis2-uiwidgets-orgunittree\"]\n    > [data-test=\"dhis2-uiwidgets-orgunittree-node\"]\n    > [data-test=\"dhis2-uiwidgets-orgunittree-node-content\"]\n    > [data-test=\"dhis2-uiwidgets-orgunittree-node-label\"]\n    label\n";
 Given('a sub org unit is a root org unit', () => {
   cy.visitStory('OrganisationUnitTree', 'multiple root sub and one main org unit');
@@ -6,18 +6,12 @@ Given('a sub org unit is a root org unit', () => {
 Given('both a sub org unit and a main org unit are root org units', () => {
   cy.visitStory('OrganisationUnitTree', 'multiple root sub and one main org unit');
 });
-Given('both a sub org unit and a main org unit are root org units', () => {
-  cy.visitStory('OrganisationUnitTree', 'multiple root sub and one main org unit');
-});
 Given('multiple sub org units is a root org unit', () => {
   cy.visitStory('OrganisationUnitTree', 'multiple root sub and one main org unit');
 });
 Given('the root sub org unit is a child of the root main org unit', () => {
   cy.visitStory('OrganisationUnitTree', 'multiple root sub and one main org unit');
 });
-Given('the root sub org unit is a child of the root main org unit', () => {
-  cy.visitStory('OrganisationUnitTree', 'multiple root sub and one main org unit');
-});
 Given('the user provided one root sub org unit to the filter', () => {
   cy.get('input[type="input"]').clear().type('/A0000000001');
 });

package/build/es/features/tree_api/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
 
 const expectStubPayloadToEqual = (stub, prop, expected) => {
   const calls = stub.getCalls();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/organisation-unit-tree",
-    "version": "9.4.3",
+    "version": "9.4.5",
     "description": "UI OrganisationUnitTree",
     "repository": {
         "type": "git",
@@ -35,10 +35,10 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/checkbox": "9.4.3",
-        "@dhis2-ui/loader": "9.4.3",
-        "@dhis2-ui/node": "9.4.3",
-        "@dhis2/ui-constants": "9.4.3",
+        "@dhis2-ui/checkbox": "9.4.5",
+        "@dhis2-ui/loader": "9.4.5",
+        "@dhis2-ui/node": "9.4.5",
+        "@dhis2/ui-constants": "9.4.5",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },