@dhis2/analytics 25.2.3 → 26.0.1

package/build/cjs/locales/zh/translations.json

@@ -20,28 +20,28 @@
     "About this visualization": "关于此可视化",
     "This app could not retrieve required data.": "此应用无法检索所需数据。",
     "Network error": "网络错误",
-    "Data / Edit calculation": "",
-    "Data / New calculation": "",
-    "Remove item": "",
-    "Check formula": "",
-    "Calculation name": "",
-    "Shown in table headers and chart axes/legends": "",
-    "Delete calculation": "",
+    "Data / Edit calculation": "数据/编辑计算",
+    "Data / New calculation": "数据/新计算",
+    "Remove item": "除去项目",
+    "Check formula": "检查公式",
+    "Calculation name": "计算名称",
+    "Shown in table headers and chart axes/legends": "显示在表格标题和图表轴/图例中",
+    "Delete calculation": "删除计算",
     "Cancel": "取消",
-    "The calculation can only be saved with a valid formula": "",
-    "Add a name to save this calculation": "",
-    "Save calculation": "",
-    "Are you sure you want to delete this calculation? It may be used by other visualizations.": "",
-    "Yes, delete": "",
+    "The calculation can only be saved with a valid formula": "计算只能用有效的公式保存",
+    "Add a name to save this calculation": "添加名称以保存此计算",
+    "Save calculation": "保存计算",
+    "Are you sure you want to delete this calculation? It may be used by other visualizations.": "您确定要删除此计算吗？它可以被其他可视化使用。",
+    "Yes, delete": "是的，删除",
     "Totals only": "总计",
     "Details only": "仅详细信息",
     "Loading": "载入",
     "Data elements": "数据元",
-    "Search by data element name": "",
+    "Search by data element name": "按数据元素名称搜索",
     "No data elements found for \"{{- searchTerm}}\"": "找不到“ {{-searchTerm}}”的数据元素",
     "No data elements found": "找不到数据元素",
-    "Drag items here, or double click in the list, to start building a calculation formula": "",
-    "Math operators": "",
+    "Drag items here, or double click in the list, to start building a calculation formula": "将项目拖到此处，或在列表中双击，开始构建计算公式",
+    "Math operators": "数学运算符",
     "Data Type": "数据类型",
     "All types": "所有类型",
     "Disaggregation": "分解",
@@ -58,7 +58,7 @@
     "No event data items found for \"{{- searchTerm}}\"": "找不到“ {{-searchTerm}}”的事件数据项",
     "No program indicators found for \"{{- searchTerm}}\"": "找不到“ {{-searchTerm}}”的计划指标",
     "Nothing found for \"{{- searchTerm}}\"": "找不到“ {{-searchTerm}}”",
-    "Calculation": "",
+    "Calculation": "计算",
     "Metric type": "尺度类型",
     "All metrics": "所有尺度",
     "Move to {{axisName}}": "移动到 {{axisName}}",
@@ -97,7 +97,7 @@
     "Name": "名称",
     "Description": "描述",
     "Rename": "改名",
-    "{{- objectName}} (copy)": "",
+    "{{- objectName}} (copy)": "{{- objectName}}（复制）",
     "Save {{fileType}} as": "将{{fileType}}另存为",
     "event report": "事件报表",
     "line list": "行列表",
@@ -263,6 +263,7 @@
     "Six-months": "Six-months",
     "Financial Years": "Financial Years",
     "Years": "年",
+    "Interpretations and details": "解释和细节",
     "Translating to": "翻译成",
     "Choose a locale": "选择语言环境",
     "Base locale reference": "基本语言环境参考",
@@ -306,15 +307,15 @@
     "Loading programs": "正在载入项目",
     "Program indicators": "项目指标",
     "Program indicator": "项目指标",
-    "Calculations": "",
+    "Calculations": "计算",
     "Number": "数据",
-    "Formula is empty. Add items to the formula from the lists on the left.": "",
-    "Consecutive math operators": "",
-    "Consecutive data elements": "",
-    "Starts or ends with a math operator": "",
-    "Empty parentheses": "",
-    "Missing right parenthesis )": "",
-    "Missing left parenthesis (": "",
+    "Formula is empty. Add items to the formula from the lists on the left.": "公式为空。将左侧列表中的项目添加到公式中。",
+    "Consecutive math operators": "连续的数学运算符",
+    "Consecutive data elements": "连续的数据元素",
+    "Starts or ends with a math operator": "以数学运算符开始或结束",
+    "Empty parentheses": "空括号",
+    "Missing right parenthesis )": "缺少右括号 ）",
+    "Missing left parenthesis (": "缺少左括号 (",
     "Extra Small": "特小",
     "Small": "小",
     "Regular": "定期",

package/build/es/__demo__/FileMenu.stories.js

@@ -2,6 +2,7 @@ import { Provider } from '@dhis2/app-runtime';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { FileMenu } from '../components/FileMenu/FileMenu.js';
+import { HoverMenuBar } from '../components/Toolbar/index.js';
 const configMock = {
   baseUrl: 'http://localhost:8080',
   apiVersion: 33
@@ -52,19 +53,19 @@ const visReadonlyObject = { ...visObject,
 };
 storiesOf('FileMenu', module).add('Simple', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
-}, /*#__PURE__*/React.createElement(FileMenu, {
+}, /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(FileMenu, {
   currentUser: user,
   fileType: "visualization"
-}))).add('With AO', () => /*#__PURE__*/React.createElement(Provider, {
+})))).add('With AO', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
-}, /*#__PURE__*/React.createElement(FileMenu, {
+}, /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(FileMenu, {
   currentUser: user,
   fileType: "visualization",
   fileObject: visObject
-}))).add('With readonly AO', () => /*#__PURE__*/React.createElement(Provider, {
+})))).add('With readonly AO', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
-}, /*#__PURE__*/React.createElement(FileMenu, {
+}, /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(FileMenu, {
   currentUser: user,
   fileType: "visualization",
   fileObject: visReadonlyObject
-})));
+}))));

package/build/es/__demo__/Toolbar.stories.js

@@ -0,0 +1,69 @@
+import { storiesOf } from '@storybook/react';
+import React, { useState } from 'react';
+import { HoverMenuBar, HoverMenuDropdown, HoverMenuList, HoverMenuListItem, InterpretationsAndDetailsToggler, Toolbar, ToolbarSidebar, UpdateButton } from '../components/Toolbar/index.js';
+
+function ToolbarWithState() {
+  const [isHidden, setIsHidden] = useState(false);
+  const [isSidebarShowing, setIsSidebarShowing] = useState(false);
+  return /*#__PURE__*/React.createElement(Toolbar, null, /*#__PURE__*/React.createElement(ToolbarSidebar, {
+    isHidden: isHidden
+  }, /*#__PURE__*/React.createElement("span", null, "Toolbar side bar"), /*#__PURE__*/React.createElement("a", {
+    style: {
+      paddingLeft: 12,
+      textDecoration: 'underline',
+      cursor: 'pointer'
+    },
+    onClick: () => setIsHidden(true)
+  }, "click to hide")), /*#__PURE__*/React.createElement(UpdateButton, null), /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: "Menu A"
+  }, /*#__PURE__*/React.createElement(HoverMenuList, null, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item A.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item A.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item A.3"
+  }))), /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: "Menu B"
+  }, /*#__PURE__*/React.createElement(HoverMenuList, null, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1"
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1.3"
+  })), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2"
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2.3"
+  })), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3",
+    disabled: true
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3.3"
+  })))), /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: "Menu C",
+    disabled: true
+  }, /*#__PURE__*/React.createElement(HoverMenuList, null, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item C.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item C.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item C.3"
+  })))), /*#__PURE__*/React.createElement(InterpretationsAndDetailsToggler, {
+    isShowing: isSidebarShowing,
+    onClick: () => setIsSidebarShowing(current => !current)
+  }));
+}
+
+storiesOf('Toolbar', module).add('default', () => {
+  return /*#__PURE__*/React.createElement(ToolbarWithState, null);
+});

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

@@ -1,12 +1,11 @@
-import _JSXStyle from "styled-jsx/style";
-import { IconAdd24, IconLaunch24, IconSave24, IconEdit24, IconTranslate24, IconShare24, IconLink24, IconDelete24, SharingDialog, colors, FlyoutMenu, Layer, MenuItem, MenuDivider, Popper } from '@dhis2/ui';
+import { IconAdd24, IconLaunch24, IconSave24, IconEdit24, IconTranslate24, IconShare24, IconLink24, IconDelete24, SharingDialog, colors, MenuDivider } from '@dhis2/ui';
 import PropTypes from 'prop-types';
-import React, { createRef, useState } from 'react';
+import React, { useState } from 'react';
 import i18n from '../../locales/index.js';
 import { OpenFileDialog } from '../OpenFileDialog/OpenFileDialog.js';
+import { HoverMenuListItem, HoverMenuList, HoverMenuDropdown } from '../Toolbar/index.js';
 import { TranslationDialog } from '../TranslationDialog/index.js';
 import { DeleteDialog } from './DeleteDialog.js';
-import { fileMenuStyles } from './FileMenu.styles.js';
 import { GetLinkDialog } from './GetLinkDialog.js';
 import { RenameDialog } from './RenameDialog.js';
 import { SaveAsDialog } from './SaveAsDialog.js';
@@ -30,24 +29,14 @@ export const FileMenu = _ref => {
     onError,
     onTranslate
   } = _ref;
-  const [menuIsOpen, setMenuIsOpen] = useState(false);
-  const [currentDialog, setCurrentDialog] = useState(null); // Escape key press closes the menu
-
-  const onKeyDown = e => {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 27) {
-      setMenuIsOpen(false);
-    }
-  };
+  const [currentDialog, setCurrentDialog] = useState(null);
 
   const onMenuItemClick = dialogToOpen => () => {
-    setMenuIsOpen(false);
     setCurrentDialog(dialogToOpen);
   };
 
   const onDialogClose = () => setCurrentDialog(null);
 
-  const toggleMenu = () => setMenuIsOpen(!menuIsOpen);
-
   const onDeleteConfirm = () => {
     // The dialog must be closed before calling the callback
     // otherwise the fileObject is changed to null before the
@@ -57,8 +46,6 @@ export const FileMenu = _ref => {
     onDelete();
   };
 
-  const buttonRef = /*#__PURE__*/createRef();
-
   const renderDialog = () => {
     switch (currentDialog) {
       case 'rename':
@@ -120,19 +107,7 @@ export const FileMenu = _ref => {
 
   const iconActiveColor = colors.grey700;
   const iconInactiveColor = colors.grey500;
-  return /*#__PURE__*/React.createElement("div", {
-    onKeyDown: onKeyDown,
-    className: "jsx-".concat(fileMenuStyles.__hash)
-  }, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: fileMenuStyles.__hash
-  }, fileMenuStyles), /*#__PURE__*/React.createElement("div", {
-    ref: buttonRef,
-    className: "jsx-".concat(fileMenuStyles.__hash)
-  }, /*#__PURE__*/React.createElement("button", {
-    onClick: toggleMenu,
-    "data-test": "file-menu-toggle",
-    className: "jsx-".concat(fileMenuStyles.__hash) + " " + "menu-toggle"
-  }, i18n.t('File'))), /*#__PURE__*/React.createElement(OpenFileDialog, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OpenFileDialog, {
     open: currentDialog === 'open',
     type: fileType,
     filterVisTypes: filterVisTypes,
@@ -144,45 +119,33 @@ export const FileMenu = _ref => {
     },
     onNew: onNew,
     currentUser: currentUser
-  }), menuIsOpen && /*#__PURE__*/React.createElement(Layer, {
-    onBackdropClick: toggleMenu,
-    position: "fixed",
-    level: 2000,
-    dataTest: "file-menu-toggle-layer"
-  }, /*#__PURE__*/React.createElement(Popper, {
-    reference: buttonRef,
-    placement: "bottom-start"
-  }, /*#__PURE__*/React.createElement(FlyoutMenu, {
+  }), /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: i18n.t('File')
+  }, /*#__PURE__*/React.createElement(HoverMenuList, {
     dataTest: "file-menu-container"
-  }, /*#__PURE__*/React.createElement(MenuItem, {
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('New'),
     icon: /*#__PURE__*/React.createElement(IconAdd24, {
       color: iconActiveColor
     }),
-    onClick: () => {
-      toggleMenu();
-      onNew();
-    },
+    onClick: onNew,
     dataTest: "file-menu-new"
-  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Open…'),
     icon: /*#__PURE__*/React.createElement(IconLaunch24, {
       color: iconActiveColor
     }),
     onClick: onMenuItemClick('open'),
     dataTest: "file-menu-open"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: fileObject !== null && fileObject !== void 0 && fileObject.id ? i18n.t('Save') : i18n.t('Save…'),
     icon: /*#__PURE__*/React.createElement(IconSave24, {
       color: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access = fileObject.access) !== null && _fileObject$access !== void 0 && _fileObject$access.update) ? iconInactiveColor : iconActiveColor
     }),
     disabled: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access2 = fileObject.access) !== null && _fileObject$access2 !== void 0 && _fileObject$access2.update),
-    onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? () => {
-      toggleMenu();
-      onSave();
-    } : onMenuItemClick('saveas'),
+    onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? onSave : onMenuItemClick('saveas'),
     dataTest: "file-menu-save"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Save as…'),
     icon: /*#__PURE__*/React.createElement(IconSave24, {
       color: !(onSaveAs && fileObject !== null && fileObject !== void 0 && fileObject.id) ? iconInactiveColor : iconActiveColor
@@ -190,7 +153,7 @@ export const FileMenu = _ref => {
     disabled: !(onSaveAs && fileObject !== null && fileObject !== void 0 && fileObject.id),
     onClick: onMenuItemClick('saveas'),
     dataTest: "file-menu-saveas"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Rename…'),
     icon: /*#__PURE__*/React.createElement(IconEdit24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access3 = fileObject.access) !== null && _fileObject$access3 !== void 0 && _fileObject$access3.update ? iconActiveColor : iconInactiveColor
@@ -198,7 +161,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access4 = fileObject.access) !== null && _fileObject$access4 !== void 0 && _fileObject$access4.update),
     onClick: onMenuItemClick('rename'),
     dataTest: "file-menu-rename"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Translate…'),
     icon: /*#__PURE__*/React.createElement(IconTranslate24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access5 = fileObject.access) !== null && _fileObject$access5 !== void 0 && _fileObject$access5.update ? iconActiveColor : iconInactiveColor
@@ -206,7 +169,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access6 = fileObject.access) !== null && _fileObject$access6 !== void 0 && _fileObject$access6.update),
     onClick: onMenuItemClick('translate'),
     dataTest: "file-menu-translate"
-  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Share…'),
     icon: /*#__PURE__*/React.createElement(IconShare24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access7 = fileObject.access) !== null && _fileObject$access7 !== void 0 && _fileObject$access7.manage ? iconActiveColor : iconInactiveColor
@@ -214,7 +177,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access8 = fileObject.access) !== null && _fileObject$access8 !== void 0 && _fileObject$access8.manage),
     onClick: onMenuItemClick('sharing'),
     dataTest: "file-menu-sharing"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Get link…'),
     icon: /*#__PURE__*/React.createElement(IconLink24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id ? iconActiveColor : iconInactiveColor
@@ -222,7 +185,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id),
     onClick: onMenuItemClick('getlink'),
     dataTest: "file-menu-getlink"
-  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Delete'),
     destructive: true,
     icon: /*#__PURE__*/React.createElement(IconDelete24, {
@@ -231,7 +194,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access10 = fileObject.access) !== null && _fileObject$access10 !== void 0 && _fileObject$access10.delete),
     onClick: onMenuItemClick('delete'),
     dataTest: "file-menu-delete"
-  })))), renderDialog());
+  }))), renderDialog());
 };
 FileMenu.defaultProps = {
   onDelete: Function.prototype,