@dhis2/analytics 24.9.0 → 24.9.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [24.9.2](https://github.com/dhis2/analytics/compare/v24.9.1...v24.9.2) (2023-03-14)
+
+
+### Bug Fixes
+
+* deduplicate yarn.lock ([#1450](https://github.com/dhis2/analytics/issues/1450)) ([85781ef](https://github.com/dhis2/analytics/commit/85781efeb3f347eabb70ff0db327f888dfcb3da3))
+* prevent wrong URL with duplicated path parts DHIS2-14789 ([#1449](https://github.com/dhis2/analytics/issues/1449)) ([7c5c2a6](https://github.com/dhis2/analytics/commit/7c5c2a6870f14f9a18c155ee7f7817a3055b6205))
+* use connection status to handle local offline conditions ([#1443](https://github.com/dhis2/analytics/issues/1443)) ([df4bb97](https://github.com/dhis2/analytics/commit/df4bb97f52d9bc03555621beadfe929721500e31))
+
+## [24.9.1](https://github.com/dhis2/analytics/compare/v24.9.0...v24.9.1) (2023-03-10)
+
+
+### Bug Fixes
+
+* spacing in Rename and SaveAs dialogs ([#1447](https://github.com/dhis2/analytics/issues/1447)) ([35e1872](https://github.com/dhis2/analytics/commit/35e18724ff88a09d13deedb54e897ad2506c4f08))
+
 # [24.9.0](https://github.com/dhis2/analytics/compare/v24.8.0...v24.9.0) (2023-02-24)
 
 

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

@@ -3,10 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fileMenuStyles = void 0;
+exports.modalStyles = exports.fileMenuStyles = void 0;
 
 var _ui = require("@dhis2/ui");
 
 const fileMenuStyles = [".menu-toggle.jsx-2670121391{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;position:relative;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;font-size:14px;font-weight:400;text-transform:none;padding:6px ".concat(_ui.spacers.dp12, ";border-radius:3px;color:").concat(_ui.colors.grey900, ";box-sizing:border-box;line-height:1.75;background:none;border:none;-webkit-transition:background-color 250ms cubic-bezier(0.4,0,0.2,1) 0ms;transition:background-color 250ms cubic-bezier(0.4,0,0.2,1) 0ms;cursor:pointer;}"), ".menu-toggle.jsx-2670121391:hover.jsx-2670121391:enabled{background-color:".concat(_ui.colors.grey200, ";}"), ".menu-toggle.jsx-2670121391:disabled{color:".concat(_ui.colors.grey400, ";cursor:not-allowed;}"), ".menu-toggle.jsx-2670121391:active{background-color:".concat(_ui.colors.grey300, ";}"), ".menuButton.jsx-2670121391:focus{outline:2px solid ".concat(_ui.colors.blue600, ";}"), ".menuButton.jsx-2670121391:focus.jsx-2670121391:not(:focus-visible){outline:none;}"];
 exports.fileMenuStyles = fileMenuStyles;
-fileMenuStyles.__hash = "2670121391";
+fileMenuStyles.__hash = "2670121391";
+const modalStyles = [".modal-content.jsx-3091623050{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:".concat(_ui.spacers.dp12, ";}")];
+exports.modalStyles = modalStyles;
+modalStyles.__hash = "3091623050";

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

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GetLinkDialog = void 0;
 
+var _style = _interopRequireDefault(require("styled-jsx/style"));
+
+var _appRuntime = require("@dhis2/app-runtime");
+
 var _ui = require("@dhis2/ui");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -13,6 +17,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 
+var _GetLinkDialogStyles = require("./GetLinkDialog.styles.js");
+
 var _utils = require("./utils.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -23,13 +29,27 @@ const GetLinkDialog = _ref => {
     id,
     onClose
   } = _ref;
-  // TODO simply use href from the visualization object?
-  const appUrl = new URL((0, _utils.appPathFor)(type, id), "".concat(window.location.origin).concat(window.location.pathname));
+  const {
+    baseUrl
+  } = (0, _appRuntime.useConfig)(); // TODO simply use href from the visualization object?
+
+  const appUrl = new URL((0, _utils.appPathFor)(type, id), baseUrl);
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose
-  }, /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("p", null, _index.default.t('Open in this app')), /*#__PURE__*/_react.default.createElement("a", {
-    href: appUrl.href
-  }, appUrl.href)), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }, /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _GetLinkDialogStyles.styles.__hash
+  }, _GetLinkDialogStyles.styles), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("p", {
+    className: "jsx-".concat(_GetLinkDialogStyles.styles.__hash)
+  }, _index.default.t('Open in this app')), /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_GetLinkDialogStyles.styles.__hash) + " " + "link-container"
+  }, /*#__PURE__*/_react.default.createElement("a", {
+    href: appUrl.href,
+    className: "jsx-".concat(_GetLinkDialogStyles.styles.__hash)
+  }, appUrl.href), /*#__PURE__*/_react.default.createElement(_ui.Button, {
+    icon: /*#__PURE__*/_react.default.createElement(_ui.IconCopy24, null),
+    small: true,
+    onClick: () => navigator.clipboard.writeText(appUrl.href)
+  }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,
     secondary: true
   }, _index.default.t('Close')))));

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

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.styles = void 0;
+
+var _ui = require("@dhis2/ui");
+
+const styles = [".link-container.jsx-844167137{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;gap:".concat(_ui.spacers.dp12, ";}")];
+exports.styles = styles;
+styles.__hash = "844167137";

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RenameDialog = void 0;
 
+var _style = _interopRequireDefault(require("styled-jsx/style"));
+
 var _appRuntime = require("@dhis2/app-runtime");
 
 var _ui = require("@dhis2/ui");
@@ -15,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 
+var _FileMenuStyles = require("./FileMenu.styles.js");
+
 var _utils = require("./utils.js");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -55,7 +59,7 @@ const RenameDialog = _ref3 => {
   } = _ref3;
   const [name, setName] = (0, _react.useState)(object.name);
   const [description, setDescription] = (0, _react.useState)(object.description);
-  const mutation = (0, _react.useMemo)(() => getMutation(type), []);
+  const mutation = (0, _react.useMemo)(() => getMutation(type), [type]);
   const [mutate, {
     loading
   }] = (0, _appRuntime.useDataMutation)(mutation, {
@@ -82,9 +86,13 @@ const RenameDialog = _ref3 => {
 
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose
-  }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Rename {{fileType}}', {
+  }, /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _FileMenuStyles.modalStyles.__hash
+  }, _FileMenuStyles.modalStyles), /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Rename {{fileType}}', {
     fileType: (0, _utils.labelForFileType)(type)
-  })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
+  })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_FileMenuStyles.modalStyles.__hash) + " " + "modal-content"
+  }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
     label: _index.default.t('Name'),
     disabled: loading,
     required: true,
@@ -106,7 +114,7 @@ const RenameDialog = _ref3 => {
       } = _ref5;
       return setDescription(value);
     }
-  })), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,
     disabled: loading,
     secondary: true

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SaveAsDialog = void 0;
 
+var _style = _interopRequireDefault(require("styled-jsx/style"));
+
 var _ui = require("@dhis2/ui");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -13,6 +15,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 
+var _FileMenuStyles = require("./FileMenu.styles.js");
+
 var _utils = require("./utils.js");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -46,9 +50,13 @@ const SaveAsDialog = _ref => {
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose,
     dataTest: "file-menu-saveas-modal"
-  }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Save {{fileType}} as', {
+  }, /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _FileMenuStyles.modalStyles.__hash
+  }, _FileMenuStyles.modalStyles), /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Save {{fileType}} as', {
     fileType: (0, _utils.labelForFileType)(type)
-  })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
+  })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_FileMenuStyles.modalStyles.__hash) + " " + "modal-content"
+  }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
     label: _index.default.t('Name'),
     value: name,
     onChange: _ref2 => {
@@ -69,7 +77,7 @@ const SaveAsDialog = _ref => {
       return setDescription(value);
     },
     dataTest: "file-menu-saveas-modal-description"
-  })), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,
     secondary: true,
     dataTest: "file-menu-saveas-modal-cancel"

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

@@ -12,6 +12,12 @@ var _utils = require("../utils.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const testBaseUrl = 'http://test.tld/test';
+jest.mock('@dhis2/app-runtime', () => ({
+  useConfig: () => ({
+    baseUrl: testBaseUrl
+  })
+}));
 describe('The FileMenu - GetLinkDialog component', () => {
   let shallowGetLinkDialog;
   let props;
@@ -38,10 +44,10 @@ describe('The FileMenu - GetLinkDialog component', () => {
   });
   it('renders a <a> tag containing the type and id props', () => {
     const href = getGetLinkDialogComponent(props).find('a').prop('href');
-    expect(href).toMatch((0, _utils.appPathFor)(props.type, props.id));
+    expect(href).toMatch(new URL((0, _utils.appPathFor)(props.type, props.id), testBaseUrl).href);
   });
   it('calls the onClose callback when the Close button is clicked', () => {
-    getGetLinkDialogComponent(props).find(_ui.Button).first().simulate('click');
+    getGetLinkDialogComponent(props).find(_ui.Button).at(1).simulate('click');
     expect(onClose).toHaveBeenCalled();
   });
 });

package/build/cjs/components/OfflineTooltip.js

@@ -31,8 +31,8 @@ const OfflineTooltip = _ref => {
     children
   } = _ref;
   const {
-    offline
-  } = (0, _appRuntime.useOnlineStatus)();
+    isDisconnected: offline
+  } = (0, _appRuntime.useDhis2ConnectionStatus)();
   const notAllowed = disabled || disabledWhenOffline && offline;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
     content: content || _d2I18n.default.t('Not available offline'),

package/build/cjs/components/TranslationDialog/TranslationModal/TranslationModalActions.js

@@ -52,8 +52,8 @@ const TranslationModalActions = _ref2 => {
     saveButtonDisabled
   } = _ref2;
   const {
-    offline
-  } = (0, _appRuntime.useOnlineStatus)();
+    isDisconnected: offline
+  } = (0, _appRuntime.useDhis2ConnectionStatus)();
   return /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     secondary: true,
     onClick: onClose

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

@@ -1,3 +1,5 @@
 import { colors, spacers } from '@dhis2/ui';
 export const fileMenuStyles = [".menu-toggle.jsx-2670121391{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;position:relative;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;font-size:14px;font-weight:400;text-transform:none;padding:6px ".concat(spacers.dp12, ";border-radius:3px;color:").concat(colors.grey900, ";box-sizing:border-box;line-height:1.75;background:none;border:none;-webkit-transition:background-color 250ms cubic-bezier(0.4,0,0.2,1) 0ms;transition:background-color 250ms cubic-bezier(0.4,0,0.2,1) 0ms;cursor:pointer;}"), ".menu-toggle.jsx-2670121391:hover.jsx-2670121391:enabled{background-color:".concat(colors.grey200, ";}"), ".menu-toggle.jsx-2670121391:disabled{color:".concat(colors.grey400, ";cursor:not-allowed;}"), ".menu-toggle.jsx-2670121391:active{background-color:".concat(colors.grey300, ";}"), ".menuButton.jsx-2670121391:focus{outline:2px solid ".concat(colors.blue600, ";}"), ".menuButton.jsx-2670121391:focus.jsx-2670121391:not(:focus-visible){outline:none;}"];
-fileMenuStyles.__hash = "2670121391";
+fileMenuStyles.__hash = "2670121391";
+export const modalStyles = [".modal-content.jsx-3091623050{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:".concat(spacers.dp12, ";}")];
+modalStyles.__hash = "3091623050";

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

@@ -1,7 +1,10 @@
-import { Modal, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
+import _JSXStyle from "styled-jsx/style";
+import { useConfig } from '@dhis2/app-runtime';
+import { Modal, ModalContent, ModalActions, ButtonStrip, Button, IconCopy24 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../locales/index.js';
+import { styles } from './GetLinkDialog.styles.js';
 import { supportedFileTypes, appPathFor } from './utils.js';
 export const GetLinkDialog = _ref => {
   let {
@@ -9,13 +12,27 @@ export const GetLinkDialog = _ref => {
     id,
     onClose
   } = _ref;
-  // TODO simply use href from the visualization object?
-  const appUrl = new URL(appPathFor(type, id), "".concat(window.location.origin).concat(window.location.pathname));
+  const {
+    baseUrl
+  } = useConfig(); // TODO simply use href from the visualization object?
+
+  const appUrl = new URL(appPathFor(type, id), baseUrl);
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose
-  }, /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("p", null, i18n.t('Open in this app')), /*#__PURE__*/React.createElement("a", {
-    href: appUrl.href
-  }, appUrl.href)), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("p", {
+    className: "jsx-".concat(styles.__hash)
+  }, i18n.t('Open in this app')), /*#__PURE__*/React.createElement("div", {
+    className: "jsx-".concat(styles.__hash) + " " + "link-container"
+  }, /*#__PURE__*/React.createElement("a", {
+    href: appUrl.href,
+    className: "jsx-".concat(styles.__hash)
+  }, appUrl.href), /*#__PURE__*/React.createElement(Button, {
+    icon: /*#__PURE__*/React.createElement(IconCopy24, null),
+    small: true,
+    onClick: () => navigator.clipboard.writeText(appUrl.href)
+  }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     onClick: onClose,
     secondary: true
   }, i18n.t('Close')))));

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

@@ -0,0 +1,3 @@
+import { spacers } from '@dhis2/ui';
+export const styles = [".link-container.jsx-844167137{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;gap:".concat(spacers.dp12, ";}")];
+styles.__hash = "844167137";

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

@@ -1,8 +1,10 @@
+import _JSXStyle from "styled-jsx/style";
 import { useDataMutation } from '@dhis2/app-runtime';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import i18n from '../../locales/index.js';
+import { modalStyles } from './FileMenu.styles.js';
 import { supportedFileTypes, endpointFromFileType, labelForFileType } from './utils.js';
 
 const getMutation = type => ({
@@ -37,7 +39,7 @@ export const RenameDialog = _ref3 => {
   } = _ref3;
   const [name, setName] = useState(object.name);
   const [description, setDescription] = useState(object.description);
-  const mutation = useMemo(() => getMutation(type), []);
+  const mutation = useMemo(() => getMutation(type), [type]);
   const [mutate, {
     loading
   }] = useDataMutation(mutation, {
@@ -64,9 +66,13 @@ export const RenameDialog = _ref3 => {
 
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose
-  }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Rename {{fileType}}', {
+  }, /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: modalStyles.__hash
+  }, modalStyles), /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Rename {{fileType}}', {
     fileType: labelForFileType(type)
-  })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(InputField, {
+  })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("div", {
+    className: "jsx-".concat(modalStyles.__hash) + " " + "modal-content"
+  }, /*#__PURE__*/React.createElement(InputField, {
     label: i18n.t('Name'),
     disabled: loading,
     required: true,
@@ -88,7 +94,7 @@ export const RenameDialog = _ref3 => {
       } = _ref5;
       return setDescription(value);
     }
-  })), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
+  }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     onClick: onClose,
     disabled: loading,
     secondary: true

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

@@ -1,7 +1,9 @@
+import _JSXStyle from "styled-jsx/style";
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import i18n from '../../locales/index.js';
+import { modalStyles } from './FileMenu.styles.js';
 import { supportedFileTypes, labelForFileType } from './utils.js';
 const NAME_MAXLENGTH = 230;
 export const SaveAsDialog = _ref => {
@@ -27,9 +29,13 @@ export const SaveAsDialog = _ref => {
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose,
     dataTest: "file-menu-saveas-modal"
-  }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Save {{fileType}} as', {
+  }, /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: modalStyles.__hash
+  }, modalStyles), /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Save {{fileType}} as', {
     fileType: labelForFileType(type)
-  })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(InputField, {
+  })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("div", {
+    className: "jsx-".concat(modalStyles.__hash) + " " + "modal-content"
+  }, /*#__PURE__*/React.createElement(InputField, {
     label: i18n.t('Name'),
     value: name,
     onChange: _ref2 => {
@@ -50,7 +56,7 @@ export const SaveAsDialog = _ref => {
       return setDescription(value);
     },
     dataTest: "file-menu-saveas-modal-description"
-  })), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
+  }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     onClick: onClose,
     secondary: true,
     dataTest: "file-menu-saveas-modal-cancel"

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

@@ -3,6 +3,12 @@ import { shallow } from 'enzyme';
 import React from 'react';
 import { GetLinkDialog } from '../GetLinkDialog.js';
 import { appPathFor } from '../utils.js';
+const testBaseUrl = 'http://test.tld/test';
+jest.mock('@dhis2/app-runtime', () => ({
+  useConfig: () => ({
+    baseUrl: testBaseUrl
+  })
+}));
 describe('The FileMenu - GetLinkDialog component', () => {
   let shallowGetLinkDialog;
   let props;
@@ -29,10 +35,10 @@ describe('The FileMenu - GetLinkDialog component', () => {
   });
   it('renders a <a> tag containing the type and id props', () => {
     const href = getGetLinkDialogComponent(props).find('a').prop('href');
-    expect(href).toMatch(appPathFor(props.type, props.id));
+    expect(href).toMatch(new URL(appPathFor(props.type, props.id), testBaseUrl).href);
   });
   it('calls the onClose callback when the Close button is clicked', () => {
-    getGetLinkDialogComponent(props).find(Button).first().simulate('click');
+    getGetLinkDialogComponent(props).find(Button).at(1).simulate('click');
     expect(onClose).toHaveBeenCalled();
   });
 });

package/build/es/components/OfflineTooltip.js

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { useOnlineStatus } from '@dhis2/app-runtime';
+import { useDhis2ConnectionStatus } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { Tooltip } from '@dhis2/ui';
 import cx from 'classnames';
@@ -15,8 +15,8 @@ const OfflineTooltip = _ref => {
     children
   } = _ref;
   const {
-    offline
-  } = useOnlineStatus();
+    isDisconnected: offline
+  } = useDhis2ConnectionStatus();
   const notAllowed = disabled || disabledWhenOffline && offline;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
     content: content || i18n.t('Not available offline'),

package/build/es/components/TranslationDialog/TranslationModal/TranslationModalActions.js

@@ -1,4 +1,4 @@
-import { useOnlineStatus } from '@dhis2/app-runtime';
+import { useDhis2ConnectionStatus } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { Button, ButtonStrip, ModalActions } from '@dhis2/ui';
 import PropTypes from 'prop-types';
@@ -37,8 +37,8 @@ export const TranslationModalActions = _ref2 => {
     saveButtonDisabled
   } = _ref2;
   const {
-    offline
-  } = useOnlineStatus();
+    isDisconnected: offline
+  } = useDhis2ConnectionStatus();
   return /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     secondary: true,
     onClick: onClose

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "24.9.0",
+    "version": "24.9.2",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -31,7 +31,7 @@
         "validate-push": "yarn test"
     },
     "devDependencies": {
-        "@dhis2/app-runtime": "^3.4.4",
+        "@dhis2/app-runtime": "^3.9.0",
         "@dhis2/cli-app-scripts": "^9.0.1",
         "@dhis2/cli-style": "^10.4.1",
         "@dhis2/d2-i18n": "^1.1.0",