@dhis2/analytics 26.13.2 → 26.13.3

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

@@ -20,12 +20,11 @@ const GetLinkDialog = _ref => {
     onClose
   } = _ref;
   const {
+    apiVersion,
     baseUrl
   } = (0, _appRuntime.useConfig)();
-
-  // TODO simply use href from the visualization object?
-  const appBaseUrl = new URL(baseUrl, self.location.href);
-  const appUrl = new URL((0, _utils.appPathFor)(type, id), appBaseUrl);
+  const appBaseUrl = new URL(baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`, self.location.href).href;
+  const appUrl = new URL((0, _utils.appPathFor)(type, id, apiVersion), appBaseUrl).href;
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose
   }, /*#__PURE__*/_react.default.createElement(_style.default, {
@@ -35,12 +34,12 @@ const GetLinkDialog = _ref => {
   }, _index.default.t('Open in this app')), /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_GetLinkDialogStyles.styles.__hash}` + " " + "link-container"
   }, /*#__PURE__*/_react.default.createElement("a", {
-    href: appUrl.href,
+    href: appUrl,
     className: `jsx-${_GetLinkDialogStyles.styles.__hash}`
-  }, appUrl.href), /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }, appUrl), /*#__PURE__*/_react.default.createElement(_ui.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconCopy24, null),
     small: true,
-    onClick: () => navigator.clipboard.writeText(appUrl.href)
+    onClick: () => navigator.clipboard.writeText(appUrl)
   }))), /*#__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/__tests__/GetLinkDialog.spec.js

@@ -4,17 +4,49 @@ var _ui = require("@dhis2/ui");
 var _enzyme = require("enzyme");
 var _react = _interopRequireDefault(require("react"));
 var _GetLinkDialog = require("../GetLinkDialog.js");
-var _utils = require("../utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const testBaseUrl = 'http://test.tld/test';
+const testBaseUrl = 'http://host.tld/test/';
+const mockUseConfig = jest.fn(() => ({
+  apiVersion: 42,
+  baseUrl: testBaseUrl
+}));
 jest.mock('@dhis2/app-runtime', () => ({
-  useConfig: () => ({
-    baseUrl: testBaseUrl
-  })
+  useConfig: () => mockUseConfig()
 }));
+const tests = [{
+  type: 'visualization',
+  baseUrl: 'http://host.tld',
+  id: 'dv-id-1',
+  expected: 'http://host.tld/dhis-web-data-visualizer/#/dv-id-1'
+}, {
+  type: 'visualization',
+  baseUrl: testBaseUrl,
+  id: 'dv-id-2',
+  expected: 'http://host.tld/test/dhis-web-data-visualizer/#/dv-id-2'
+}, {
+  type: 'eventVisualization',
+  baseUrl: 'http://host.tld/other-path/',
+  id: 'll-id-1',
+  expected: 'http://host.tld/other-path/dhis-web-line-listing/#/ll-id-1'
+}, {
+  type: 'eventVisualization',
+  apiVersion: 41,
+  baseUrl: 'http://host.tld/other-path',
+  id: 'll-id-2',
+  expected: 'http://host.tld/other-path/api/apps/line-listing/#/ll-id-2'
+}, {
+  type: 'map',
+  baseUrl: testBaseUrl,
+  id: 'map-id-1',
+  expected: 'http://host.tld/test/dhis-web-maps/#/map-id-1'
+}, {
+  type: 'map',
+  baseUrl: '../',
+  id: 'map-id-2',
+  expected: 'http://localhost/dhis-web-maps/#/map-id-2'
+}];
 describe('The FileMenu - GetLinkDialog component', () => {
   let shallowGetLinkDialog;
-  let props;
   const onClose = jest.fn();
   const getGetLinkDialogComponent = props => {
     if (!shallowGetLinkDialog) {
@@ -24,21 +56,38 @@ describe('The FileMenu - GetLinkDialog component', () => {
   };
   beforeEach(() => {
     shallowGetLinkDialog = undefined;
-    props = {
-      type: 'visualization',
-      id: 'get-link-test-id',
-      onClose
-    };
   });
   it('renders a Modal component', () => {
-    expect(getGetLinkDialogComponent(props).find(_ui.Modal)).toHaveLength(1);
+    expect(getGetLinkDialogComponent({
+      type: tests[0].type,
+      id: tests[0].id
+    }).find(_ui.Modal)).toHaveLength(1);
   });
-  it('renders a <a> tag containing the type and id props', () => {
-    const href = getGetLinkDialogComponent(props).find('a').prop('href');
-    expect(href).toMatch(new URL((0, _utils.appPathFor)(props.type, props.id), testBaseUrl).href);
+  test.each(tests)('renders a <a> tag containing the correct app path and id', _ref => {
+    let {
+      apiVersion,
+      baseUrl,
+      type,
+      id,
+      expected
+    } = _ref;
+    mockUseConfig.mockReturnValueOnce({
+      apiVersion: apiVersion || 42,
+      baseUrl
+    });
+    const href = getGetLinkDialogComponent({
+      type,
+      id,
+      onClose
+    }).find('a').prop('href');
+    expect(href).toMatch(expected);
   });
   it('calls the onClose callback when the Close button is clicked', () => {
-    getGetLinkDialogComponent(props).find(_ui.Button).at(1).simulate('click');
+    getGetLinkDialogComponent({
+      type: tests[0].type,
+      id: tests[0].id,
+      onClose
+    }).find(_ui.Button).at(1).simulate('click');
     expect(onClose).toHaveBeenCalled();
   });
 });

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

@@ -28,14 +28,15 @@ const labelForFileType = fileType => {
   }
 };
 exports.labelForFileType = labelForFileType;
-const appPathFor = (fileType, id) => {
+const appPathFor = (fileType, id, apiVersion) => {
   switch (fileType) {
     case FILE_TYPE_VISUALIZATION:
       return `dhis-web-data-visualizer/#/${id}`;
     case FILE_TYPE_MAP:
-      return `dhis-web-maps/index.html?id=${id}`;
+      return `dhis-web-maps/#/${id}`;
     case FILE_TYPE_EVENT_VISUALIZATION:
-      return `api/apps/line-listing/#/${id}`;
+      // VERSION-TOGGLE: remove when 42 is the lowest supported version
+      return apiVersion >= 42 ? `dhis-web-line-listing/#/${id}` : `api/apps/line-listing/#/${id}`;
     default:
       return `${window.location.search}${window.location.hash}`;
   }

package/build/cjs/components/RichText/Parser/MdParser.js

@@ -87,6 +87,24 @@ class MdParser {
       breaks: true
     });
 
+    // From: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
+    // Remember the old renderer if overridden, or proxy to the default renderer.
+    const defaultRender = md.renderer.rules.link_open || (
+    // eslint-disable-next-line max-params
+    (tokens, idx, options, env, self) => {
+      return self.renderToken(tokens, idx, options);
+    });
+
+    // eslint-disable-next-line max-params
+    md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
+      // Add a new 'target' and 'rel' attributes, or replace the value of the existing ones.
+      tokens[idx].attrSet('target', '_blank');
+      tokens[idx].attrSet('rel', 'noreferrer');
+
+      // Pass the token to the default renderer.
+      return defaultRender(tokens, idx, options, env, self);
+    };
+
     // *bold* -> <strong>bold</strong>
     md.inline.ruler.push('strong', parse(codes.bold.name));
 

package/build/cjs/components/RichText/Parser/__tests__/MdParser.spec.js

@@ -16,13 +16,13 @@ describe('MdParser class', () => {
     // nested italic/bold combinations not allowed
     ['_italic with *bold* inside_', '<em>italic with *bold* inside</em>'], ['*bold with _italic_ inside*', '<strong>bold with _italic_ inside</strong>'], ['text with : and :)', 'text with : and <span>\u{1F642}</span>'], ['(parenthesis and :))', '(parenthesis and <span>\u{1F642}</span>)'], [':((parenthesis:))', '<span>\u{1F641}</span>(parenthesis<span>\u{1F642}</span>)'], [':+1+1', '<span>\u{1F44D}</span>+1'], ['-1:-1', '-1<span>\u{1F44E}</span>'],
     // links
-    ['example.com/path', '<a href="http://example.com/path">example.com/path</a>'],
+    ['[Test link](https://host.tld/path/link)', '<a href="https://host.tld/path/link" target="_blank" rel="noreferrer">Test link</a>'], ['example.com/path', '<a href="http://example.com/path" target="_blank" rel="noreferrer">example.com/path</a>'],
     // not recognized links with italic marker inside not converted
     ['example_with_underscore.com/path', 'example_with_underscore.com/path'], ['example_with_underscore.com/path_with_underscore', 'example_with_underscore.com/path_with_underscore'],
     // markers around non-recognized links
     ['link example_with_underscore.com/path should _not_ be converted', 'link example_with_underscore.com/path should <em>not</em> be converted'], ['link example_with_underscore.com/path should *not* be converted', 'link example_with_underscore.com/path should <strong>not</strong> be converted'],
     // italic marker inside links not converted
-    ['example.com/path_with_underscore', '<a href="http://example.com/path_with_underscore">example.com/path_with_underscore</a>'], ['_italic_ and *bold* with a example.com/link_with_underscore', '<em>italic</em> and <strong>bold</strong> with a <a href="http://example.com/link_with_underscore">example.com/link_with_underscore</a>'], ['example.com/path with *bold* after :)', '<a href="http://example.com/path">example.com/path</a> with <strong>bold</strong> after <span>\u{1F642}</span>'], ['_before_ example.com/path_with_underscore *after* :)', '<em>before</em> <a href="http://example.com/path_with_underscore">example.com/path_with_underscore</a> <strong>after</strong> <span>\u{1F642}</span>'],
+    ['example.com/path_with_underscore', '<a href="http://example.com/path_with_underscore" target="_blank" rel="noreferrer">example.com/path_with_underscore</a>'], ['_italic_ and *bold* with a example.com/link_with_underscore', '<em>italic</em> and <strong>bold</strong> with a <a href="http://example.com/link_with_underscore" target="_blank" rel="noreferrer">example.com/link_with_underscore</a>'], ['example.com/path with *bold* after :)', '<a href="http://example.com/path" target="_blank" rel="noreferrer">example.com/path</a> with <strong>bold</strong> after <span>\u{1F642}</span>'], ['_before_ example.com/path_with_underscore *after* :)', '<em>before</em> <a href="http://example.com/path_with_underscore" target="_blank" rel="noreferrer">example.com/path_with_underscore</a> <strong>after</strong> <span>\u{1F642}</span>'],
     // italic/bold markers right after non-word characters
     ['_If % of ART retention rate after 12 months >90(%)_: Sustain the efforts.', '<em>If % of ART retention rate after 12 months &gt;90(%)</em>: Sustain the efforts.'], ['*If % of ART retention rate after 12 months >90(%)*: Sustain the efforts.', '<strong>If % of ART retention rate after 12 months &gt;90(%)</strong>: Sustain the efforts.']];
     inlineTests.forEach(test => {

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

@@ -13,12 +13,11 @@ export const GetLinkDialog = _ref => {
     onClose
   } = _ref;
   const {
+    apiVersion,
     baseUrl
   } = useConfig();
-
-  // TODO simply use href from the visualization object?
-  const appBaseUrl = new URL(baseUrl, self.location.href);
-  const appUrl = new URL(appPathFor(type, id), appBaseUrl);
+  const appBaseUrl = new URL(baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`, self.location.href).href;
+  const appUrl = new URL(appPathFor(type, id, apiVersion), appBaseUrl).href;
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose
   }, /*#__PURE__*/React.createElement(_JSXStyle, {
@@ -28,12 +27,12 @@ export const GetLinkDialog = _ref => {
   }, i18n.t('Open in this app')), /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + "link-container"
   }, /*#__PURE__*/React.createElement("a", {
-    href: appUrl.href,
+    href: appUrl,
     className: `jsx-${styles.__hash}`
-  }, appUrl.href), /*#__PURE__*/React.createElement(Button, {
+  }, appUrl), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(IconCopy24, null),
     small: true,
-    onClick: () => navigator.clipboard.writeText(appUrl.href)
+    onClick: () => navigator.clipboard.writeText(appUrl)
   }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     onClick: onClose,
     secondary: true

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

@@ -2,16 +2,48 @@ import { Button, Modal } from '@dhis2/ui';
 import { shallow } from 'enzyme';
 import React from 'react';
 import { GetLinkDialog } from '../GetLinkDialog.js';
-import { appPathFor } from '../utils.js';
-const testBaseUrl = 'http://test.tld/test';
+const testBaseUrl = 'http://host.tld/test/';
+const mockUseConfig = jest.fn(() => ({
+  apiVersion: 42,
+  baseUrl: testBaseUrl
+}));
 jest.mock('@dhis2/app-runtime', () => ({
-  useConfig: () => ({
-    baseUrl: testBaseUrl
-  })
+  useConfig: () => mockUseConfig()
 }));
+const tests = [{
+  type: 'visualization',
+  baseUrl: 'http://host.tld',
+  id: 'dv-id-1',
+  expected: 'http://host.tld/dhis-web-data-visualizer/#/dv-id-1'
+}, {
+  type: 'visualization',
+  baseUrl: testBaseUrl,
+  id: 'dv-id-2',
+  expected: 'http://host.tld/test/dhis-web-data-visualizer/#/dv-id-2'
+}, {
+  type: 'eventVisualization',
+  baseUrl: 'http://host.tld/other-path/',
+  id: 'll-id-1',
+  expected: 'http://host.tld/other-path/dhis-web-line-listing/#/ll-id-1'
+}, {
+  type: 'eventVisualization',
+  apiVersion: 41,
+  baseUrl: 'http://host.tld/other-path',
+  id: 'll-id-2',
+  expected: 'http://host.tld/other-path/api/apps/line-listing/#/ll-id-2'
+}, {
+  type: 'map',
+  baseUrl: testBaseUrl,
+  id: 'map-id-1',
+  expected: 'http://host.tld/test/dhis-web-maps/#/map-id-1'
+}, {
+  type: 'map',
+  baseUrl: '../',
+  id: 'map-id-2',
+  expected: 'http://localhost/dhis-web-maps/#/map-id-2'
+}];
 describe('The FileMenu - GetLinkDialog component', () => {
   let shallowGetLinkDialog;
-  let props;
   const onClose = jest.fn();
   const getGetLinkDialogComponent = props => {
     if (!shallowGetLinkDialog) {
@@ -21,21 +53,38 @@ describe('The FileMenu - GetLinkDialog component', () => {
   };
   beforeEach(() => {
     shallowGetLinkDialog = undefined;
-    props = {
-      type: 'visualization',
-      id: 'get-link-test-id',
-      onClose
-    };
   });
   it('renders a Modal component', () => {
-    expect(getGetLinkDialogComponent(props).find(Modal)).toHaveLength(1);
+    expect(getGetLinkDialogComponent({
+      type: tests[0].type,
+      id: tests[0].id
+    }).find(Modal)).toHaveLength(1);
   });
-  it('renders a <a> tag containing the type and id props', () => {
-    const href = getGetLinkDialogComponent(props).find('a').prop('href');
-    expect(href).toMatch(new URL(appPathFor(props.type, props.id), testBaseUrl).href);
+  test.each(tests)('renders a <a> tag containing the correct app path and id', _ref => {
+    let {
+      apiVersion,
+      baseUrl,
+      type,
+      id,
+      expected
+    } = _ref;
+    mockUseConfig.mockReturnValueOnce({
+      apiVersion: apiVersion || 42,
+      baseUrl
+    });
+    const href = getGetLinkDialogComponent({
+      type,
+      id,
+      onClose
+    }).find('a').prop('href');
+    expect(href).toMatch(expected);
   });
   it('calls the onClose callback when the Close button is clicked', () => {
-    getGetLinkDialogComponent(props).find(Button).at(1).simulate('click');
+    getGetLinkDialogComponent({
+      type: tests[0].type,
+      id: tests[0].id,
+      onClose
+    }).find(Button).at(1).simulate('click');
     expect(onClose).toHaveBeenCalled();
   });
 });

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

@@ -19,14 +19,15 @@ export const labelForFileType = fileType => {
       return fileType;
   }
 };
-export const appPathFor = (fileType, id) => {
+export const appPathFor = (fileType, id, apiVersion) => {
   switch (fileType) {
     case FILE_TYPE_VISUALIZATION:
       return `dhis-web-data-visualizer/#/${id}`;
     case FILE_TYPE_MAP:
-      return `dhis-web-maps/index.html?id=${id}`;
+      return `dhis-web-maps/#/${id}`;
     case FILE_TYPE_EVENT_VISUALIZATION:
-      return `api/apps/line-listing/#/${id}`;
+      // VERSION-TOGGLE: remove when 42 is the lowest supported version
+      return apiVersion >= 42 ? `dhis-web-line-listing/#/${id}` : `api/apps/line-listing/#/${id}`;
     default:
       return `${window.location.search}${window.location.hash}`;
   }

package/build/es/components/RichText/Parser/MdParser.js

@@ -80,6 +80,24 @@ export class MdParser {
       breaks: true
     });
 
+    // From: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
+    // Remember the old renderer if overridden, or proxy to the default renderer.
+    const defaultRender = md.renderer.rules.link_open || (
+    // eslint-disable-next-line max-params
+    (tokens, idx, options, env, self) => {
+      return self.renderToken(tokens, idx, options);
+    });
+
+    // eslint-disable-next-line max-params
+    md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
+      // Add a new 'target' and 'rel' attributes, or replace the value of the existing ones.
+      tokens[idx].attrSet('target', '_blank');
+      tokens[idx].attrSet('rel', 'noreferrer');
+
+      // Pass the token to the default renderer.
+      return defaultRender(tokens, idx, options, env, self);
+    };
+
     // *bold* -> <strong>bold</strong>
     md.inline.ruler.push('strong', parse(codes.bold.name));
 

package/build/es/components/RichText/Parser/__tests__/MdParser.spec.js

@@ -14,13 +14,13 @@ describe('MdParser class', () => {
     // nested italic/bold combinations not allowed
     ['_italic with *bold* inside_', '<em>italic with *bold* inside</em>'], ['*bold with _italic_ inside*', '<strong>bold with _italic_ inside</strong>'], ['text with : and :)', 'text with : and <span>\u{1F642}</span>'], ['(parenthesis and :))', '(parenthesis and <span>\u{1F642}</span>)'], [':((parenthesis:))', '<span>\u{1F641}</span>(parenthesis<span>\u{1F642}</span>)'], [':+1+1', '<span>\u{1F44D}</span>+1'], ['-1:-1', '-1<span>\u{1F44E}</span>'],
     // links
-    ['example.com/path', '<a href="http://example.com/path">example.com/path</a>'],
+    ['[Test link](https://host.tld/path/link)', '<a href="https://host.tld/path/link" target="_blank" rel="noreferrer">Test link</a>'], ['example.com/path', '<a href="http://example.com/path" target="_blank" rel="noreferrer">example.com/path</a>'],
     // not recognized links with italic marker inside not converted
     ['example_with_underscore.com/path', 'example_with_underscore.com/path'], ['example_with_underscore.com/path_with_underscore', 'example_with_underscore.com/path_with_underscore'],
     // markers around non-recognized links
     ['link example_with_underscore.com/path should _not_ be converted', 'link example_with_underscore.com/path should <em>not</em> be converted'], ['link example_with_underscore.com/path should *not* be converted', 'link example_with_underscore.com/path should <strong>not</strong> be converted'],
     // italic marker inside links not converted
-    ['example.com/path_with_underscore', '<a href="http://example.com/path_with_underscore">example.com/path_with_underscore</a>'], ['_italic_ and *bold* with a example.com/link_with_underscore', '<em>italic</em> and <strong>bold</strong> with a <a href="http://example.com/link_with_underscore">example.com/link_with_underscore</a>'], ['example.com/path with *bold* after :)', '<a href="http://example.com/path">example.com/path</a> with <strong>bold</strong> after <span>\u{1F642}</span>'], ['_before_ example.com/path_with_underscore *after* :)', '<em>before</em> <a href="http://example.com/path_with_underscore">example.com/path_with_underscore</a> <strong>after</strong> <span>\u{1F642}</span>'],
+    ['example.com/path_with_underscore', '<a href="http://example.com/path_with_underscore" target="_blank" rel="noreferrer">example.com/path_with_underscore</a>'], ['_italic_ and *bold* with a example.com/link_with_underscore', '<em>italic</em> and <strong>bold</strong> with a <a href="http://example.com/link_with_underscore" target="_blank" rel="noreferrer">example.com/link_with_underscore</a>'], ['example.com/path with *bold* after :)', '<a href="http://example.com/path" target="_blank" rel="noreferrer">example.com/path</a> with <strong>bold</strong> after <span>\u{1F642}</span>'], ['_before_ example.com/path_with_underscore *after* :)', '<em>before</em> <a href="http://example.com/path_with_underscore" target="_blank" rel="noreferrer">example.com/path_with_underscore</a> <strong>after</strong> <span>\u{1F642}</span>'],
     // italic/bold markers right after non-word characters
     ['_If % of ART retention rate after 12 months >90(%)_: Sustain the efforts.', '<em>If % of ART retention rate after 12 months &gt;90(%)</em>: Sustain the efforts.'], ['*If % of ART retention rate after 12 months >90(%)*: Sustain the efforts.', '<strong>If % of ART retention rate after 12 months &gt;90(%)</strong>: Sustain the efforts.']];
     inlineTests.forEach(test => {

package/package.json

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