@dhis2/analytics 23.6.5 → 23.7.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [23.7.0](https://github.com/dhis2/analytics/compare/v23.6.7...v23.7.0) (2022-03-24)
+
+
+### Features
+
+* **FileMenu:** use custom labels in dialog titles TECH-1035 ([#1173](https://github.com/dhis2/analytics/issues/1173)) ([4f02fdf](https://github.com/dhis2/analytics/commit/4f02fdf9d314f0705416442d39f50324d10552e4))
+
+## [23.6.7](https://github.com/dhis2/analytics/compare/v23.6.6...v23.6.7) (2022-03-24)
+
+
+### Bug Fixes
+
+* return the URL portion after origin as default TECH-1036 ([#1175](https://github.com/dhis2/analytics/issues/1175)) ([38607d9](https://github.com/dhis2/analytics/commit/38607d9716f45a8f47ae6003a2e9f90dd4d170a2))
+
+## [23.6.6](https://github.com/dhis2/analytics/compare/v23.6.5...v23.6.6) (2022-03-19)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([5568e55](https://github.com/dhis2/analytics/commit/5568e55b1f8d6e2bd0ff0e1b748bbd3ef84d8b71))
+
 ## [23.6.5](https://github.com/dhis2/analytics/compare/v23.6.4...v23.6.5) (2022-03-18)
 
 

package/build/cjs/components/FileMenu/DeleteDialog.js

@@ -55,9 +55,9 @@ const DeleteDialog = ({
     onClose: onClose,
     dataTest: "file-menu-delete-modal"
   }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Delete {{fileType}}', {
-    fileType: type
+    fileType: (0, _utils.labelForFileType)(type)
   })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, _index.default.t('This {{fileType}} and related interpretations will be deleted. Continue?', {
-    fileType: type
+    fileType: (0, _utils.labelForFileType)(type)
   })), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,
     secondary: true,

package/build/cjs/components/FileMenu/RenameDialog.js

@@ -76,7 +76,7 @@ const RenameDialog = ({
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose
   }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Rename {{fileType}}', {
-    fileType: type
+    fileType: (0, _utils.labelForFileType)(type)
   })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
     label: _index.default.t('Name'),
     disabled: loading,

package/build/cjs/components/FileMenu/SaveAsDialog.js

@@ -42,7 +42,7 @@ const SaveAsDialog = ({
     onClose: onClose,
     dataTest: "file-menu-saveas-modal"
   }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Save {{fileType}} as', {
-    fileType: type
+    fileType: (0, _utils.labelForFileType)(type)
   })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
     label: _index.default.t('Name'),
     required: true,

package/build/cjs/components/FileMenu/utils.js

@@ -3,31 +3,59 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.appPathFor = exports.endpointFromFileType = exports.supportedFileTypes = void 0;
-const supportedFileTypes = ['eventReport', 'visualization', 'map', 'eventVisualization'];
+exports.appPathFor = exports.labelForFileType = exports.endpointFromFileType = exports.supportedFileTypes = exports.FILE_TYPE_EVENT_VISUALIZATION = exports.FILE_TYPE_MAP = exports.FILE_TYPE_VISUALIZATION = exports.FILE_TYPE_EVENT_REPORT = void 0;
+
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const FILE_TYPE_EVENT_REPORT = 'eventReport';
+exports.FILE_TYPE_EVENT_REPORT = FILE_TYPE_EVENT_REPORT;
+const FILE_TYPE_VISUALIZATION = 'visualization';
+exports.FILE_TYPE_VISUALIZATION = FILE_TYPE_VISUALIZATION;
+const FILE_TYPE_MAP = 'map';
+exports.FILE_TYPE_MAP = FILE_TYPE_MAP;
+const FILE_TYPE_EVENT_VISUALIZATION = 'eventVisualization';
+exports.FILE_TYPE_EVENT_VISUALIZATION = FILE_TYPE_EVENT_VISUALIZATION;
+const supportedFileTypes = [FILE_TYPE_EVENT_REPORT, FILE_TYPE_VISUALIZATION, FILE_TYPE_MAP, FILE_TYPE_EVENT_VISUALIZATION];
 exports.supportedFileTypes = supportedFileTypes;
 
-const endpointFromFileType = fileType => {
+const endpointFromFileType = fileType => "".concat(fileType, "s");
+
+exports.endpointFromFileType = endpointFromFileType;
+
+const labelForFileType = fileType => {
   switch (fileType) {
-    case 'visualization':
-    case 'map':
+    case FILE_TYPE_EVENT_REPORT:
+      return _d2I18n.default.t('event report');
+
+    case FILE_TYPE_EVENT_VISUALIZATION:
+      return _d2I18n.default.t('line list');
+
+    case FILE_TYPE_MAP:
+      return _d2I18n.default.t('map');
+
+    case FILE_TYPE_VISUALIZATION:
+      return _d2I18n.default.t('visualization');
+
     default:
-      return "".concat(fileType, "s");
+      return fileType;
   }
 };
 
-exports.endpointFromFileType = endpointFromFileType;
+exports.labelForFileType = labelForFileType;
 
 const appPathFor = (fileType, id) => {
   switch (fileType) {
-    case 'visualization':
+    case FILE_TYPE_VISUALIZATION:
       return "dhis-web-data-visualizer/#/".concat(id);
 
-    case 'map':
+    case FILE_TYPE_MAP:
       return "dhis-web-maps/index.html?id=".concat(id);
 
     default:
-      return;
+      // strip origin and the first /
+      return "".concat(window.location.pathname).concat(window.location.search).concat(window.location.hash).substring(1);
   }
 };
 

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

@@ -112,13 +112,13 @@
     "No maps found. Click New map to get started.": "Nenalezeny žádné mapy. Začněte kliknutím na Nová mapa.",
     "No maps found. Try adjusting your search or filter options to find what you're looking for.": "Nenalezeny žádné mapy. Zkuste upravit možnosti vyhledávání nebo filtrování, abyste našli to, co hledáte.",
     "New map": "Nová mapa",
-    "Open a line list": "",
-    "Loading line lists": "",
-    "Couldn't load line lists": "",
-    "There was a problem loading line lists. Try again or contact your system administrator.": "",
-    "No line lists found. Click New line list to get started.": "",
-    "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
-    "New line list": "",
+    "Open a line list": "Otevřít řádkový seznam",
+    "Loading line lists": "Načítání řádkových seznamů",
+    "Couldn't load line lists": "Řádkové seznamy se nepodařilo načíst",
+    "There was a problem loading line lists. Try again or contact your system administrator.": "Při načítání řádkových seznamů došlo k problému. Zkuste to znovu nebo se obraťte na správce systému.",
+    "No line lists found. Click New line list to get started.": "Nebyly nalezeny žádné řádkové seznamy. Začněte kliknutím na Nový řádkový seznam.",
+    "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "Nebyly nalezeny žádné řádkové seznamy. Zkuste upravit možnosti vyhledávání nebo filtru, abyste našli to, co hledáte.",
+    "New line list": "Nový řádkový seznam",
     "Options": "Možnosti",
     "Hide": "Skrýt",
     "Update": "Aktualizovat",

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

@@ -79,6 +79,10 @@
     "Description": "Description",
     "Rename": "Rename",
     "Save {{fileType}} as": "Save {{fileType}} as",
+    "event report": "event report",
+    "line list": "line list",
+    "map": "map",
+    "visualization": "visualization",
     "Created by": "Created by",
     "Anyone": "Anyone",
     "Only you": "Only you",

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

@@ -222,7 +222,7 @@
     "Bi-months": "Bimestres",
     "Quarters": "Trimestral",
     "Six-months": "Semestres",
-    "Financial Years": "",
+    "Financial Years": "Años fiscales",
     "Years": "Años",
     "Translating to": "",
     "Choose a locale": "",

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

@@ -3,7 +3,7 @@ import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button } fr
 import PropTypes from 'prop-types';
 import React, { useMemo } from 'react';
 import i18n from '../../locales/index.js';
-import { supportedFileTypes, endpointFromFileType } from './utils.js';
+import { supportedFileTypes, endpointFromFileType, labelForFileType } from './utils.js';
 
 const getMutation = type => ({
   resource: endpointFromFileType(type),
@@ -37,9 +37,9 @@ export const DeleteDialog = ({
     onClose: onClose,
     dataTest: "file-menu-delete-modal"
   }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Delete {{fileType}}', {
-    fileType: type
+    fileType: labelForFileType(type)
   })), /*#__PURE__*/React.createElement(ModalContent, null, i18n.t('This {{fileType}} and related interpretations will be deleted. Continue?', {
-    fileType: type
+    fileType: labelForFileType(type)
   })), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     onClick: onClose,
     secondary: true,

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

@@ -3,7 +3,7 @@ import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, Inp
 import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import i18n from '../../locales/index.js';
-import { supportedFileTypes, endpointFromFileType } from './utils.js';
+import { supportedFileTypes, endpointFromFileType, labelForFileType } from './utils.js';
 
 const getMutation = type => ({
   resource: endpointFromFileType(type),
@@ -58,7 +58,7 @@ export const RenameDialog = ({
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose
   }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Rename {{fileType}}', {
-    fileType: type
+    fileType: labelForFileType(type)
   })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(InputField, {
     label: i18n.t('Name'),
     disabled: loading,

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

@@ -2,7 +2,7 @@ import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, Inp
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import i18n from '../../locales/index.js';
-import { supportedFileTypes } from './utils.js';
+import { supportedFileTypes, labelForFileType } from './utils.js';
 export const SaveAsDialog = ({
   type,
   object,
@@ -24,7 +24,7 @@ export const SaveAsDialog = ({
     onClose: onClose,
     dataTest: "file-menu-saveas-modal"
   }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Save {{fileType}} as', {
-    fileType: type
+    fileType: labelForFileType(type)
   })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(InputField, {
     label: i18n.t('Name'),
     required: true,

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

@@ -1,21 +1,38 @@
-export const supportedFileTypes = ['eventReport', 'visualization', 'map', 'eventVisualization'];
-export const endpointFromFileType = fileType => {
+import i18n from '@dhis2/d2-i18n';
+export const FILE_TYPE_EVENT_REPORT = 'eventReport';
+export const FILE_TYPE_VISUALIZATION = 'visualization';
+export const FILE_TYPE_MAP = 'map';
+export const FILE_TYPE_EVENT_VISUALIZATION = 'eventVisualization';
+export const supportedFileTypes = [FILE_TYPE_EVENT_REPORT, FILE_TYPE_VISUALIZATION, FILE_TYPE_MAP, FILE_TYPE_EVENT_VISUALIZATION];
+export const endpointFromFileType = fileType => "".concat(fileType, "s");
+export const labelForFileType = fileType => {
   switch (fileType) {
-    case 'visualization':
-    case 'map':
+    case FILE_TYPE_EVENT_REPORT:
+      return i18n.t('event report');
+
+    case FILE_TYPE_EVENT_VISUALIZATION:
+      return i18n.t('line list');
+
+    case FILE_TYPE_MAP:
+      return i18n.t('map');
+
+    case FILE_TYPE_VISUALIZATION:
+      return i18n.t('visualization');
+
     default:
-      return "".concat(fileType, "s");
+      return fileType;
   }
 };
 export const appPathFor = (fileType, id) => {
   switch (fileType) {
-    case 'visualization':
+    case FILE_TYPE_VISUALIZATION:
       return "dhis-web-data-visualizer/#/".concat(id);
 
-    case 'map':
+    case FILE_TYPE_MAP:
       return "dhis-web-maps/index.html?id=".concat(id);
 
     default:
-      return;
+      // strip origin and the first /
+      return "".concat(window.location.pathname).concat(window.location.search).concat(window.location.hash).substring(1);
   }
 };

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

@@ -112,13 +112,13 @@
     "No maps found. Click New map to get started.": "Nenalezeny žádné mapy. Začněte kliknutím na Nová mapa.",
     "No maps found. Try adjusting your search or filter options to find what you're looking for.": "Nenalezeny žádné mapy. Zkuste upravit možnosti vyhledávání nebo filtrování, abyste našli to, co hledáte.",
     "New map": "Nová mapa",
-    "Open a line list": "",
-    "Loading line lists": "",
-    "Couldn't load line lists": "",
-    "There was a problem loading line lists. Try again or contact your system administrator.": "",
-    "No line lists found. Click New line list to get started.": "",
-    "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
-    "New line list": "",
+    "Open a line list": "Otevřít řádkový seznam",
+    "Loading line lists": "Načítání řádkových seznamů",
+    "Couldn't load line lists": "Řádkové seznamy se nepodařilo načíst",
+    "There was a problem loading line lists. Try again or contact your system administrator.": "Při načítání řádkových seznamů došlo k problému. Zkuste to znovu nebo se obraťte na správce systému.",
+    "No line lists found. Click New line list to get started.": "Nebyly nalezeny žádné řádkové seznamy. Začněte kliknutím na Nový řádkový seznam.",
+    "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "Nebyly nalezeny žádné řádkové seznamy. Zkuste upravit možnosti vyhledávání nebo filtru, abyste našli to, co hledáte.",
+    "New line list": "Nový řádkový seznam",
     "Options": "Možnosti",
     "Hide": "Skrýt",
     "Update": "Aktualizovat",

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

@@ -79,6 +79,10 @@
     "Description": "Description",
     "Rename": "Rename",
     "Save {{fileType}} as": "Save {{fileType}} as",
+    "event report": "event report",
+    "line list": "line list",
+    "map": "map",
+    "visualization": "visualization",
     "Created by": "Created by",
     "Anyone": "Anyone",
     "Only you": "Only you",

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

@@ -222,7 +222,7 @@
     "Bi-months": "Bimestres",
     "Quarters": "Trimestral",
     "Six-months": "Semestres",
-    "Financial Years": "",
+    "Financial Years": "Años fiscales",
     "Years": "Años",
     "Translating to": "",
     "Choose a locale": "",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "23.6.5",
+    "version": "23.7.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {