@dhis2/analytics 25.2.1 → 25.2.3

package/build/es/components/FileMenu/__tests__/FileMenu.spec.js

@@ -1,19 +1,16 @@
-import { CustomDataProvider } from '@dhis2/app-runtime';
-import { render, fireEvent, screen, getByText } from '@testing-library/react';
-import '@testing-library/jest-dom';
+import { SharingDialog } from '@dhis2/ui';
+import { shallow } from 'enzyme';
 import React from 'react';
-import { HoverMenuBar } from '../../Toolbar/index.js';
+import { OpenFileDialog } from '../../OpenFileDialog/OpenFileDialog.js';
+import { TranslationDialog } from '../../TranslationDialog/index.js';
+import { DeleteDialog } from '../DeleteDialog.js';
 import { FileMenu } from '../FileMenu.js';
-jest.mock('../../TranslationDialog/TranslationModal/useTranslationsResults.js', () => ({
-  /* This will keep the translation dialog in
-   * a loading state, which prevents it from
-   * throwing other errors */
-  useTranslationsResults: () => ({
-    translationsData: undefined,
-    fetching: true
-  })
-}));
+import { GetLinkDialog } from '../GetLinkDialog.js';
+import { RenameDialog } from '../RenameDialog.js';
+import { SaveAsDialog } from '../SaveAsDialog.js';
 describe('The FileMenu component ', () => {
+  let shallowFileMenu;
+  let props;
   const onDelete = jest.fn();
   const onError = jest.fn();
   const onNew = jest.fn();
@@ -23,307 +20,206 @@ describe('The FileMenu component ', () => {
   const onSaveAs = jest.fn();
   const onShare = jest.fn();
   const onTranslate = jest.fn();
-  const baseProps = {
-    currentUser: {
-      id: 'u1',
-      displayName: 'Test user'
-    },
-    fileType: 'visualization',
-    fileObject: undefined,
-    onDelete,
-    onError,
-    onNew,
-    onOpen,
-    onRename,
-    onSave,
-    onSaveAs,
-    onShare,
-    onTranslate
-  };
-  const fullAccessProps = {
-    fileObject: {
-      id: 'test',
-      access: {
-        delete: true,
-        manage: true,
-        update: true
-      },
-      href: 'http://dhis2.org'
-    }
-  };
-
-  const renderFileMenu = function () {
-    let customProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const props = { ...baseProps,
-      ...customProps
-    };
-    const providerData = {
-      translations: {
-        translations: {}
-      },
-      sharing: {
-        meta: {
-          allowPublicAccess: true
-        },
-        object: {
-          userAccesses: [],
-          userGroupAccesses: []
-        }
-      }
-    };
-    return render( /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: providerData
-    }, /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(FileMenu, props))));
-  };
-
-  const openDropdown = async () => {
-    fireEvent.click(screen.getByTestId('dhis2-analytics-hovermenudropdown'));
-    expect(await screen.findByTestId('file-menu-container')).toBeVisible();
-  };
 
-  const MENU_ITEMS = {
-    NEW: {
-      testId: 'file-menu-new',
-      text: 'New'
-    },
-    OPEN: {
-      testId: 'file-menu-open',
-      text: 'Open…'
-    },
-    SAVE: {
-      testId: 'file-menu-save',
-      text: 'Save'
-    },
-    SAVE_AS: {
-      testId: 'file-menu-saveas',
-      text: 'Save as…'
-    },
-    RENAME: {
-      testId: 'file-menu-rename',
-      text: 'Rename…'
-    },
-    TRANSLATE: {
-      testId: 'file-menu-translate',
-      text: 'Translate…'
-    },
-    SHARE: {
-      testId: 'file-menu-sharing',
-      text: 'Share…'
-    },
-    GET_LINK: {
-      testId: 'file-menu-getlink',
-      text: 'Get link…'
-    },
-    DELETE: {
-      testId: 'file-menu-delete',
-      text: 'Delete'
+  const getFileMenuComponent = props => {
+    if (!shallowFileMenu) {
+      shallowFileMenu = shallow( /*#__PURE__*/React.createElement(FileMenu, props));
     }
-  };
-
-  const assertMenuItemsDisabledState = menuItems => {
-    for (const menuTitem of menuItems) {
-      const li = screen.getByTestId(menuTitem.testId);
-      expect(getByText(li, menuTitem.text)).toBeVisible();
 
-      if (menuTitem.disabled) {
-        expect(li).toHaveClass('disabled');
-      } else {
-        expect(li).not.toHaveClass('disabled');
-      }
-    }
+    return shallowFileMenu;
   };
 
-  it('renders a button', () => {
-    renderFileMenu();
-    expect(screen.getAllByTestId('dhis2-analytics-hovermenudropdown')).toHaveLength(1);
-    const button = screen.getByTestId('dhis2-analytics-hovermenudropdown');
-    expect(button).toBeVisible();
-    expect(button).toHaveTextContent('File');
-  });
-  it('opens when clicking the button', async () => {
-    renderFileMenu();
-    expect(screen.queryByTestId('file-menu-container')).not.toBeInTheDocument();
-    await openDropdown();
-    expect(await screen.findByTestId('file-menu-container')).toBeVisible();
-  });
-  it('renders some enabled buttons regardless of the access settings', async () => {
-    renderFileMenu();
-    await openDropdown();
-    assertMenuItemsDisabledState([{ ...MENU_ITEMS.NEW,
-      disabled: false
-    }, { ...MENU_ITEMS.OPEN,
-      disabled: false
-    }]);
-  });
-  it('renders some disabled buttons when no fileObject is present', async () => {
-    renderFileMenu();
-    await openDropdown();
-    assertMenuItemsDisabledState([{ ...MENU_ITEMS.SAVE_AS,
-      disabled: true
-    }, { ...MENU_ITEMS.RENAME,
-      disabled: true
-    }, { ...MENU_ITEMS.TRANSLATE,
-      disabled: true
-    }, { ...MENU_ITEMS.SHARE,
-      disabled: true
-    }, { ...MENU_ITEMS.GET_LINK,
-      disabled: true
-    }, { ...MENU_ITEMS.DELETE,
-      disabled: true
-    }]);
+  beforeEach(() => {
+    shallowFileMenu = undefined;
+    props = {
+      currentUser: {
+        id: 'u1',
+        displayName: 'Test user'
+      },
+      fileType: 'visualization',
+      fileObject: undefined,
+      onDelete,
+      onError,
+      onNew,
+      onOpen,
+      onRename,
+      onSave,
+      onSaveAs,
+      onShare,
+      onTranslate
+    };
   });
-  it('renders some enabled buttons when update access is granted', async () => {
-    const customProps = {
-      fileObject: {
-        id: 'test',
-        access: {
-          delete: false,
-          manage: false,
-          update: true
-        }
+  it('renders a button', () => {
+    expect(getFileMenuComponent(props).find('button')).toHaveLength(1);
+  });
+  it('renders some enabled buttons regardless of the access settings', () => {
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    const buttonLabels = ['New', 'Open…'];
+    buttonLabels.forEach(buttonLabel => expect(fileMenuComponent.findWhere(n => n.prop('label') === buttonLabel).prop('disabled')).toBe(undefined));
+  });
+  it('renders some disabled buttons when no fileObject is present', () => {
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    const buttonLabels = ['Save as…', 'Rename…', 'Translate…', 'Share…', 'Get link…', 'Delete'];
+    buttonLabels.forEach(buttonLabel => expect(fileMenuComponent.findWhere(n => n.prop('label') === buttonLabel).prop('disabled')).toBe(true));
+  });
+  it('renders some enabled buttons when update access is granted', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: false,
+        manage: false,
+        update: true
       }
     };
-    renderFileMenu(customProps);
-    await openDropdown();
-    assertMenuItemsDisabledState([{ ...MENU_ITEMS.SAVE,
-      disabled: false
-    }, { ...MENU_ITEMS.RENAME,
-      disabled: false
-    }, { ...MENU_ITEMS.TRANSLATE,
-      disabled: false
-    }]);
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    const buttonLabels = ['Save', 'Rename…', 'Translate…'];
+    buttonLabels.forEach(buttonLabel => expect(fileMenuComponent.findWhere(n => n.prop('label') === buttonLabel).prop('disabled')).toBe(false));
   });
-  it('renders enabled Delete button when delete access is granted', async () => {
-    const customProps = {
-      fileObject: {
-        id: 'test',
-        access: {
-          delete: true,
-          manage: false,
-          update: false
-        }
+  it('renders enabled Delete button when delete access is granted', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: false,
+        update: false
       }
     };
-    renderFileMenu(customProps);
-    await openDropdown();
-    assertMenuItemsDisabledState([{ ...MENU_ITEMS.DELETE,
-      disabled: false
-    }]);
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    expect(fileMenuComponent.findWhere(n => n.prop('label') === 'Delete').prop('disabled')).toBe(false);
   });
-  it('renders enabled Share button when manage access is granted', async () => {
-    const customProps = {
-      fileObject: {
-        id: 'test',
-        access: {
-          delete: false,
-          manage: true,
-          update: false
-        }
+  it('renders enabled Share button when manage access is granted', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: false,
+        manage: true,
+        update: false
       }
     };
-    renderFileMenu(customProps);
-    await openDropdown();
-    assertMenuItemsDisabledState([{ ...MENU_ITEMS.SHARE,
-      disabled: false
-    }]);
-  });
-  it('renders the OpenFileDialog component when the Open button is clicked', async () => {
-    renderFileMenu();
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.OPEN.testId));
-    expect(await screen.findByText('Open a visualization', {
-      selector: 'h1'
-    })).toBeVisible();
-  });
-  it('renders the RenameDialog when the Rename button is clicked', async () => {
-    renderFileMenu(fullAccessProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.RENAME.testId));
-    expect(await screen.findByText('Rename visualization', {
-      selector: 'h1'
-    })).toBeVisible();
-  });
-  it('renders the TranslationDialog when the Translate button is clicked', async () => {
-    renderFileMenu(fullAccessProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.TRANSLATE.testId));
-    expect(await screen.findByText('Translate', {
-      exact: false,
-      selector: 'h1'
-    })).toBeVisible();
-  });
-  it('renders the SharingDialog when the Share button is clicked', async () => {
-    renderFileMenu(fullAccessProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SHARE.testId));
-    expect(await screen.findByText('Sharing and access', {
-      selector: 'h1'
-    })).toBeVisible();
-  });
-  it('renders the GetLinkDialog when the Get link button is clicked', async () => {
-    const url = 'http://localhost/dhis-web-data-visualizer/#/test';
-    renderFileMenu(fullAccessProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.GET_LINK.testId));
-    expect(await screen.findByTestId('dhis2-uicore-modal')).toBeVisible();
-    expect(screen.getByRole('link', {
-      name: url
-    })).toHaveAttribute('href', url);
-  });
-  it('renders the DeleteDialog when the Delete button is clicked', async () => {
-    const customProps = {
-      fileObject: {
-        id: 'delete-test',
-        access: {
-          delete: true,
-          manage: true,
-          update: true
-        }
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    expect(fileMenuComponent.findWhere(n => n.prop('label') === 'Share…').prop('disabled')).toBe(false);
+  });
+  it('renders the OpenFileDialog component when the Open button is clicked', () => {
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Open…').simulate('click');
+    expect(fileMenuComponent.find(OpenFileDialog)).toHaveLength(1);
+  });
+  it('renders the RenameDialog when the Rename button is clicked', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
       }
     };
-    renderFileMenu(customProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.DELETE.testId));
-    expect(await screen.findByText('Delete visualization', {
-      selector: 'h1'
-    })).toBeVisible();
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Rename…').simulate('click');
+    expect(fileMenuComponent.find(RenameDialog)).toHaveLength(1);
   });
-  it('renders the SaveAsDialog when the Save as… button is clicked', async () => {
-    renderFileMenu(fullAccessProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SAVE_AS.testId));
-    expect(await screen.findByText('Save visualization as', {
-      selector: 'h1'
-    })).toBeVisible();
+  it('renders the TranslationDialog when the Translate button is clicked', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
+      }
+    };
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Translate…').simulate('click');
+    expect(fileMenuComponent.find(TranslationDialog)).toHaveLength(1);
   });
-  it('renders the SaveAsDialog when the Save… button is clicked but no fileObject is present', async () => {
-    const customProps = {
-      fileObject: {
-        // NOTE: no `id` field
-        access: {
-          update: true
-        }
+  it('renders the SharingDialog when the Share button is clicked', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
       }
     };
-    renderFileMenu(customProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SAVE.testId));
-    expect(await screen.findByText('Save visualization as', {
-      selector: 'h1'
-    })).toBeVisible();
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Share…').simulate('click');
+    expect(fileMenuComponent.find(SharingDialog)).toHaveLength(1);
   });
-  it('calls the onSave callback when the Save button is clicked and a fileObject is present', async () => {
-    renderFileMenu(fullAccessProps);
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SAVE.testId));
-    expect(screen.queryByText('Open a visualization')).not.toBeVisible();
-    expect(onSave).toHaveBeenCalledTimes(1);
+  it('renders the GetLinkDialog when the Get link button is clicked', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
+      }
+    };
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Get link…').simulate('click');
+    expect(fileMenuComponent.find(GetLinkDialog)).toHaveLength(1);
+  });
+  it('renders the DeleteDialog when the Delete button is clicked', () => {
+    props.fileObject = {
+      id: 'delete-test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
+      }
+    };
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Delete').simulate('click');
+    expect(fileMenuComponent.find(DeleteDialog)).toHaveLength(1);
   });
-  it('calls the onNew callback when the New button is clicked', async () => {
-    renderFileMenu();
-    await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.NEW.testId));
-    expect(screen.queryByText('Open a visualization')).not.toBeVisible();
-    expect(onNew).toHaveBeenCalledTimes(1);
+  it('renders the SaveAsDialog when the Save as… button is clicked', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
+      }
+    };
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Save as…').simulate('click');
+    expect(fileMenuComponent.find(SaveAsDialog)).toHaveLength(1);
+  });
+  it('renders the SaveAsDialog when the Save… button is clicked but no fileObject is present', () => {
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Save…').simulate('click');
+    expect(fileMenuComponent.find(SaveAsDialog)).toHaveLength(1);
+  });
+  it('calls the onSave callback when the Save button is clicked and a fileObject is present', () => {
+    props.fileObject = {
+      id: 'test',
+      access: {
+        delete: true,
+        manage: true,
+        update: true
+      }
+    };
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'Save').simulate('click');
+    expect(fileMenuComponent.find(OpenFileDialog).prop('open')).toBe(false);
+    expect(onSave).toHaveBeenCalled();
+  });
+  it('calls the onNew callback when the New button is clicked', () => {
+    const fileMenuComponent = getFileMenuComponent(props);
+    fileMenuComponent.find('button').simulate('click');
+    fileMenuComponent.findWhere(n => n.prop('label') === 'New').simulate('click');
+    expect(fileMenuComponent.find(OpenFileDialog).prop('open')).toBe(false);
+    expect(onNew).toHaveBeenCalled();
   });
 });

package/build/es/components/Options/VisualizationOptions.js

@@ -6,12 +6,11 @@ import { modalContent, tabSection, tabSectionTitle, tabSectionTitleMargin, tabSe
 
 const VisualizationOptions = _ref => {
   let {
-    initiallyActiveTabKey,
     optionsConfig,
     onClose,
     onUpdate
   } = _ref;
-  const [activeTabKey, setActiveTabKey] = useState(initiallyActiveTabKey);
+  const [activeTabKey, setActiveTabKey] = useState();
 
   const generateTabContent = sections => sections.map(_ref2 => {
     let {
@@ -93,7 +92,6 @@ const VisualizationOptions = _ref => {
 
 VisualizationOptions.propTypes = {
   optionsConfig: PropTypes.array.isRequired,
-  initiallyActiveTabKey: PropTypes.string,
   onClose: PropTypes.func,
   onUpdate: PropTypes.func
 };

package/build/es/index.js

@@ -16,7 +16,6 @@ export { default as LegendKey } from './components/LegendKey/LegendKey.js';
 export { default as AboutAOUnit } from './components/AboutAOUnit/AboutAOUnit.js';
 export { InterpretationsUnit } from './components/Interpretations/InterpretationsUnit/InterpretationsUnit.js';
 export { InterpretationModal } from './components/Interpretations/InterpretationModal/InterpretationModal.js';
-export * from './components/Toolbar/index.js';
 export { TranslationDialog } from './components/TranslationDialog/index.js';
 export { OfflineTooltip } from './components/OfflineTooltip.js';
 export { CachedDataQueryProvider, useCachedDataQuery } from './components/CachedDataQueryProvider.js'; // Api

package/build/es/locales/en/translations.json

@@ -267,7 +267,6 @@
     "Six-months": "Six-months",
     "Financial Years": "Financial Years",
     "Years": "Years",
-    "Interpretations and details": "Interpretations and details",
     "Translating to": "Translating to",
     "Choose a locale": "Choose a locale",
     "Base locale reference": "Base locale reference",

package/build/es/modules/ouLevelUtils/index.js

@@ -7,15 +7,17 @@ import { DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js';
 const isOuLevelIntId = id => ouIdHelper.hasLevelPrefix(id) ? Number.isInteger(parseInt(ouIdHelper.removePrefix(id), 10)) : false;
 
 const replaceNumericOuLevelWithUid = ouLevels => item => {
+  var _ouLevels$find;
+
   if (!isOuLevelIntId(item.id)) {
     return item;
   }
 
   const ouIntId = parseInt(ouIdHelper.removePrefix(item.id), 10);
-  const ouUid = ouLevels.find(l => parseInt(l.level, 10) === ouIntId).id;
-  return Object.assign({}, item, {
+  const ouUid = (_ouLevels$find = ouLevels.find(l => parseInt(l.level, 10) === ouIntId)) === null || _ouLevels$find === void 0 ? void 0 : _ouLevels$find.id;
+  return ouUid ? Object.assign({}, item, {
     id: ouIdHelper.addLevelPrefix(ouUid)
-  });
+  }) : item;
 };
 
 export const convertOuLevelsToUids = (ouLevels, layout) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "25.2.1",
+    "version": "25.2.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -40,8 +40,6 @@
         "@storybook/addons": "^6.5.9",
         "@storybook/preset-create-react-app": "^3.1.7",
         "@storybook/react": "^6.1.14",
-        "@testing-library/jest-dom": "^5.16.5",
-        "@testing-library/react": "^12.1.5",
         "enzyme": "^3.9.0",
         "enzyme-adapter-react-16": "^1.15.6",
         "fs-extra": "^10.1.0",