@dhis2/analytics 24.9.0 → 24.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/build/cjs/components/FileMenu/FileMenu.styles.js +5 -2
  3. package/build/cjs/components/FileMenu/RenameDialog.js +12 -4
  4. package/build/cjs/components/FileMenu/SaveAsDialog.js +11 -3
  5. package/build/es/components/FileMenu/FileMenu.styles.js +3 -1
  6. package/build/es/components/FileMenu/RenameDialog.js +10 -4
  7. package/build/es/components/FileMenu/SaveAsDialog.js +9 -3
  8. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## [24.9.1](https://github.com/dhis2/analytics/compare/v24.9.0...v24.9.1) (2023-03-10)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * spacing in Rename and SaveAs dialogs ([#1447](https://github.com/dhis2/analytics/issues/1447)) ([35e1872](https://github.com/dhis2/analytics/commit/35e18724ff88a09d13deedb54e897ad2506c4f08))
7
+
1
8
  # [24.9.0](https://github.com/dhis2/analytics/compare/v24.8.0...v24.9.0) (2023-02-24)
2
9
 
3
10
 
package/build/cjs/components/FileMenu/FileMenu.styles.js CHANGED
@@ -3,10 +3,13 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.fileMenuStyles = void 0;
6
+ exports.modalStyles = exports.fileMenuStyles = void 0;
7
7
 
8
8
  var _ui = require("@dhis2/ui");
9
9
 
10
10
  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;}"];
11
11
  exports.fileMenuStyles = fileMenuStyles;
12
- fileMenuStyles.__hash = "2670121391";
12
+ fileMenuStyles.__hash = "2670121391";
13
+ 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, ";}")];
14
+ exports.modalStyles = modalStyles;
15
+ modalStyles.__hash = "3091623050";
package/build/cjs/components/FileMenu/RenameDialog.js CHANGED
@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.RenameDialog = void 0;
7
7
 
8
+ var _style = _interopRequireDefault(require("styled-jsx/style"));
9
+
8
10
  var _appRuntime = require("@dhis2/app-runtime");
9
11
 
10
12
  var _ui = require("@dhis2/ui");
@@ -15,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
15
17
 
16
18
  var _index = _interopRequireDefault(require("../../locales/index.js"));
17
19
 
20
+ var _FileMenuStyles = require("./FileMenu.styles.js");
21
+
18
22
  var _utils = require("./utils.js");
19
23
 
20
24
  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 => {
55
59
  } = _ref3;
56
60
  const [name, setName] = (0, _react.useState)(object.name);
57
61
  const [description, setDescription] = (0, _react.useState)(object.description);
58
- const mutation = (0, _react.useMemo)(() => getMutation(type), []);
62
+ const mutation = (0, _react.useMemo)(() => getMutation(type), [type]);
59
63
  const [mutate, {
60
64
  loading
61
65
  }] = (0, _appRuntime.useDataMutation)(mutation, {
@@ -82,9 +86,13 @@ const RenameDialog = _ref3 => {
82
86
 
83
87
  return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
84
88
  onClose: onClose
85
- }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Rename {{fileType}}', {
89
+ }, /*#__PURE__*/_react.default.createElement(_style.default, {
90
+ id: _FileMenuStyles.modalStyles.__hash
91
+ }, _FileMenuStyles.modalStyles), /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Rename {{fileType}}', {
86
92
  fileType: (0, _utils.labelForFileType)(type)
87
- })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
93
+ })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("div", {
94
+ className: "jsx-".concat(_FileMenuStyles.modalStyles.__hash) + " " + "modal-content"
95
+ }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
88
96
  label: _index.default.t('Name'),
89
97
  disabled: loading,
90
98
  required: true,
@@ -106,7 +114,7 @@ const RenameDialog = _ref3 => {
106
114
  } = _ref5;
107
115
  return setDescription(value);
108
116
  }
109
- })), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
117
+ }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
110
118
  onClick: onClose,
111
119
  disabled: loading,
112
120
  secondary: true
package/build/cjs/components/FileMenu/SaveAsDialog.js CHANGED
@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.SaveAsDialog = void 0;
7
7
 
8
+ var _style = _interopRequireDefault(require("styled-jsx/style"));
9
+
8
10
  var _ui = require("@dhis2/ui");
9
11
 
10
12
  var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -13,6 +15,8 @@ var _react = _interopRequireWildcard(require("react"));
13
15
 
14
16
  var _index = _interopRequireDefault(require("../../locales/index.js"));
15
17
 
18
+ var _FileMenuStyles = require("./FileMenu.styles.js");
19
+
16
20
  var _utils = require("./utils.js");
17
21
 
18
22
  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 => {
46
50
  return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
47
51
  onClose: onClose,
48
52
  dataTest: "file-menu-saveas-modal"
49
- }, /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Save {{fileType}} as', {
53
+ }, /*#__PURE__*/_react.default.createElement(_style.default, {
54
+ id: _FileMenuStyles.modalStyles.__hash
55
+ }, _FileMenuStyles.modalStyles), /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Save {{fileType}} as', {
50
56
  fileType: (0, _utils.labelForFileType)(type)
51
- })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
57
+ })), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("div", {
58
+ className: "jsx-".concat(_FileMenuStyles.modalStyles.__hash) + " " + "modal-content"
59
+ }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
52
60
  label: _index.default.t('Name'),
53
61
  value: name,
54
62
  onChange: _ref2 => {
@@ -69,7 +77,7 @@ const SaveAsDialog = _ref => {
69
77
  return setDescription(value);
70
78
  },
71
79
  dataTest: "file-menu-saveas-modal-description"
72
- })), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
80
+ }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
73
81
  onClick: onClose,
74
82
  secondary: true,
75
83
  dataTest: "file-menu-saveas-modal-cancel"
package/build/es/components/FileMenu/FileMenu.styles.js CHANGED
@@ -1,3 +1,5 @@
1
1
  import { colors, spacers } from '@dhis2/ui';
2
2
  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;}"];
3
- fileMenuStyles.__hash = "2670121391";
3
+ fileMenuStyles.__hash = "2670121391";
4
+ 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, ";}")];
5
+ modalStyles.__hash = "3091623050";
package/build/es/components/FileMenu/RenameDialog.js CHANGED
@@ -1,8 +1,10 @@
1
+ import _JSXStyle from "styled-jsx/style";
1
2
  import { useDataMutation } from '@dhis2/app-runtime';
2
3
  import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
3
4
  import PropTypes from 'prop-types';
4
5
  import React, { useMemo, useState } from 'react';
5
6
  import i18n from '../../locales/index.js';
7
+ import { modalStyles } from './FileMenu.styles.js';
6
8
  import { supportedFileTypes, endpointFromFileType, labelForFileType } from './utils.js';
7
9
 
8
10
  const getMutation = type => ({
@@ -37,7 +39,7 @@ export const RenameDialog = _ref3 => {
37
39
  } = _ref3;
38
40
  const [name, setName] = useState(object.name);
39
41
  const [description, setDescription] = useState(object.description);
40
- const mutation = useMemo(() => getMutation(type), []);
42
+ const mutation = useMemo(() => getMutation(type), [type]);
41
43
  const [mutate, {
42
44
  loading
43
45
  }] = useDataMutation(mutation, {
@@ -64,9 +66,13 @@ export const RenameDialog = _ref3 => {
64
66
 
65
67
  return /*#__PURE__*/React.createElement(Modal, {
66
68
  onClose: onClose
67
- }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Rename {{fileType}}', {
69
+ }, /*#__PURE__*/React.createElement(_JSXStyle, {
70
+ id: modalStyles.__hash
71
+ }, modalStyles), /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Rename {{fileType}}', {
68
72
  fileType: labelForFileType(type)
69
- })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(InputField, {
73
+ })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("div", {
74
+ className: "jsx-".concat(modalStyles.__hash) + " " + "modal-content"
75
+ }, /*#__PURE__*/React.createElement(InputField, {
70
76
  label: i18n.t('Name'),
71
77
  disabled: loading,
72
78
  required: true,
@@ -88,7 +94,7 @@ export const RenameDialog = _ref3 => {
88
94
  } = _ref5;
89
95
  return setDescription(value);
90
96
  }
91
- })), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
97
+ }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
92
98
  onClick: onClose,
93
99
  disabled: loading,
94
100
  secondary: true
package/build/es/components/FileMenu/SaveAsDialog.js CHANGED
@@ -1,7 +1,9 @@
1
+ import _JSXStyle from "styled-jsx/style";
1
2
  import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
2
3
  import PropTypes from 'prop-types';
3
4
  import React, { useState } from 'react';
4
5
  import i18n from '../../locales/index.js';
6
+ import { modalStyles } from './FileMenu.styles.js';
5
7
  import { supportedFileTypes, labelForFileType } from './utils.js';
6
8
  const NAME_MAXLENGTH = 230;
7
9
  export const SaveAsDialog = _ref => {
@@ -27,9 +29,13 @@ export const SaveAsDialog = _ref => {
27
29
  return /*#__PURE__*/React.createElement(Modal, {
28
30
  onClose: onClose,
29
31
  dataTest: "file-menu-saveas-modal"
30
- }, /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Save {{fileType}} as', {
32
+ }, /*#__PURE__*/React.createElement(_JSXStyle, {
33
+ id: modalStyles.__hash
34
+ }, modalStyles), /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Save {{fileType}} as', {
31
35
  fileType: labelForFileType(type)
32
- })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(InputField, {
36
+ })), /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("div", {
37
+ className: "jsx-".concat(modalStyles.__hash) + " " + "modal-content"
38
+ }, /*#__PURE__*/React.createElement(InputField, {
33
39
  label: i18n.t('Name'),
34
40
  value: name,
35
41
  onChange: _ref2 => {
@@ -50,7 +56,7 @@ export const SaveAsDialog = _ref => {
50
56
  return setDescription(value);
51
57
  },
52
58
  dataTest: "file-menu-saveas-modal-description"
53
- })), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
59
+ }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
54
60
  onClick: onClose,
55
61
  secondary: true,
56
62
  dataTest: "file-menu-saveas-modal-cancel"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "24.9.0",
3
+ "version": "24.9.1",
4
4
  "main": "./build/cjs/index.js",
5
5
  "module": "./build/es/index.js",
6
6
  "exports": {