@dhis2/analytics 23.13.4 → 23.13.7

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 (14) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/build/cjs/components/AboutAOUnit/AboutAOUnit.js +7 -7
  3. package/build/cjs/components/DynamicDimension/ItemSelector.js +1 -1
  4. package/build/cjs/components/Interpretations/InterpretationModal/InterpretationModal.js +1 -1
  5. package/build/cjs/components/Interpretations/common/UserMention/UserMentionWrapper.js +1 -1
  6. package/build/cjs/components/LegendKey/LegendKey.js +1 -1
  7. package/build/cjs/locales/en/translations.json +3 -3
  8. package/build/es/components/AboutAOUnit/AboutAOUnit.js +7 -7
  9. package/build/es/components/DynamicDimension/ItemSelector.js +1 -1
  10. package/build/es/components/Interpretations/InterpretationModal/InterpretationModal.js +1 -1
  11. package/build/es/components/Interpretations/common/UserMention/UserMentionWrapper.js +1 -1
  12. package/build/es/components/LegendKey/LegendKey.js +1 -1
  13. package/build/es/locales/en/translations.json +3 -3
  14. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,24 @@
1
+ ## [23.13.7](https://github.com/dhis2/analytics/compare/v23.13.6...v23.13.7) (2022-08-12)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * always display legend set name in legend key (DHIS2-75) ([#1306](https://github.com/dhis2/analytics/issues/1306)) ([57502ee](https://github.com/dhis2/analytics/commit/57502eebce5ccb52aca62c080708587c008da822))
7
+
8
+ ## [23.13.6](https://github.com/dhis2/analytics/compare/v23.13.5...v23.13.6) (2022-08-12)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * **AboutUnit:** read sharing info from sharing object in AO ([#1299](https://github.com/dhis2/analytics/issues/1299)) ([d73a34f](https://github.com/dhis2/analytics/commit/d73a34f8f4b5498c9106cab7fb6f2a373be073b6))
14
+
15
+ ## [23.13.5](https://github.com/dhis2/analytics/compare/v23.13.4...v23.13.5) (2022-08-08)
16
+
17
+
18
+ ### Bug Fixes
19
+
20
+ * avoid encoding when interpolating certain variables in i18n.t ([#1304](https://github.com/dhis2/analytics/issues/1304)) ([db83318](https://github.com/dhis2/analytics/commit/db8331800a5132dfe266b2f9a42c5c68bb7e9b6e))
21
+
1
22
  ## [23.13.4](https://github.com/dhis2/analytics/compare/v23.13.3...v23.13.4) (2022-08-05)
2
23
 
3
24
 
package/build/cjs/components/AboutAOUnit/AboutAOUnit.js CHANGED
@@ -44,7 +44,7 @@ const getQueries = type => ({
44
44
  return id;
45
45
  },
46
46
  params: {
47
- fields: 'id,displayDescription,created,createdBy[displayName],lastUpdated,subscribed,publicAccess,userAccesses[displayName,access],userGroupAccesses[displayName,access]'
47
+ fields: 'id,displayDescription,created,createdBy[displayName],lastUpdated,subscribed,sharing'
48
48
  }
49
49
  },
50
50
  dataStatistics: {
@@ -112,7 +112,7 @@ const AboutAOUnit = _ref3 => {
112
112
  id
113
113
  });
114
114
  }
115
- }, [type, id]);
115
+ }, [type, id, refetch]);
116
116
 
117
117
  const getAccessLevelString = access => {
118
118
  const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
@@ -131,15 +131,15 @@ const AboutAOUnit = _ref3 => {
131
131
  const sharingTextParts = [];
132
132
  const re = new RegExp("^".concat(READ_AND_WRITE, "?"));
133
133
 
134
- if (re.test(ao.publicAccess)) {
134
+ if (re.test(ao.sharing.public)) {
135
135
  sharingTextParts.push(_d2I18n.default.t('all users ({{accessLevel}})', {
136
- accessLevel: getAccessLevelString(ao.publicAccess)
136
+ accessLevel: getAccessLevelString(ao.sharing.public)
137
137
  }));
138
138
  }
139
139
 
140
- const userAccesses = ao.userAccesses;
141
- const groupAccesses = ao.userGroupAccesses;
142
- userAccesses.concat(groupAccesses).forEach(accessRule => {
140
+ const userAccesses = ao.sharing.users;
141
+ const groupAccesses = ao.sharing.userGroups;
142
+ Object.values(userAccesses).concat(Object.values(groupAccesses)).forEach(accessRule => {
143
143
  sharingTextParts.push(_d2I18n.default.t('{{userOrGroup}} ({{accessLevel}})', {
144
144
  userOrGroup: accessRule.displayName,
145
145
  accessLevel: getAccessLevelString(accessRule.access)
package/build/cjs/components/DynamicDimension/ItemSelector.js CHANGED
@@ -85,7 +85,7 @@ const SourceEmptyPlaceholder = _ref3 => {
85
85
  if (!loading && !options.length && !filter) {
86
86
  message = noItemsMessage || _index.default.t('No data');
87
87
  } else if (!loading && !options.length && filter) {
88
- message = _index.default.t('Nothing found for {{searchTerm}}', {
88
+ message = _index.default.t('Nothing found for {{- searchTerm}}', {
89
89
  searchTerm: filter
90
90
  });
91
91
  }
package/build/cjs/components/Interpretations/InterpretationModal/InterpretationModal.js CHANGED
@@ -132,7 +132,7 @@ const InterpretationModal = _ref2 => {
132
132
  className: _style.default.dynamic([["3175860552", [_ui.colors.grey900, _ui.spacers.dp24, _ui.spacers.dp4, _ui.spacers.dp4]]]) + " " + "title"
133
133
  }, /*#__PURE__*/_react.default.createElement("span", {
134
134
  className: _style.default.dynamic([["3175860552", [_ui.colors.grey900, _ui.spacers.dp24, _ui.spacers.dp4, _ui.spacers.dp4]]]) + " " + "ellipsis"
135
- }, _d2I18n.default.t('Viewing interpretation: {{visualisationName}}', {
135
+ }, _d2I18n.default.t('Viewing interpretation: {{- visualisationName}}', {
136
136
  visualisationName: visualization.displayName,
137
137
  nsSeparator: '^^'
138
138
  }))), /*#__PURE__*/_react.default.createElement(_ui.ModalContent, {
package/build/cjs/components/Interpretations/common/UserMention/UserMentionWrapper.js CHANGED
@@ -192,7 +192,7 @@ const UserMentionWrapper = _ref => {
192
192
  className: _UserMentionWrapperStyle.resolvedHeaderStyle.className,
193
193
  dense: true,
194
194
  hideDivider: true,
195
- label: capturedText === '' ? _d2I18n.default.t('Search for a user') : _d2I18n.default.t('Searching for "{{searchText}}"', {
195
+ label: capturedText === '' ? _d2I18n.default.t('Search for a user') : _d2I18n.default.t('Searching for "{{- searchText}}"', {
196
196
  searchText: capturedText
197
197
  })
198
198
  }), fetching && /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
package/build/cjs/components/LegendKey/LegendKey.js CHANGED
@@ -30,7 +30,7 @@ const LegendKey = _ref => {
30
30
  className: "jsx-".concat(_LegendKeyStyle.default.__hash) + " " + ((0, _classnames.default)('legendSet', {
31
31
  divider: index > 0
32
32
  }) || "")
33
- }, legendSets.length > 1 && /*#__PURE__*/_react.default.createElement("span", {
33
+ }, /*#__PURE__*/_react.default.createElement("span", {
34
34
  className: "jsx-".concat(_LegendKeyStyle.default.__hash) + " " + "legendSetName"
35
35
  }, legendSet.name), legendSet.legends.sort((a, b) => a.startValue - b.startValue).map(legend => /*#__PURE__*/_react.default.createElement("div", {
36
36
  key: legend.startValue,
package/build/cjs/locales/en/translations.json CHANGED
@@ -57,7 +57,7 @@
57
57
  "Manually select items...": "Manually select items...",
58
58
  "Nothing found in {{- dimensionTitle}}": "Nothing found in {{- dimensionTitle}}",
59
59
  "Search": "Search",
60
- "Nothing found for {{searchTerm}}": "Nothing found for {{searchTerm}}",
60
+ "Nothing found for {{- searchTerm}}": "Nothing found for {{- searchTerm}}",
61
61
  "Delete {{fileType}}": "Delete {{fileType}}",
62
62
  "This {{fileType}} and related interpretations will be deleted. Continue?": "This {{fileType}} and related interpretations will be deleted. Continue?",
63
63
  "Cancel": "Cancel",
@@ -89,7 +89,7 @@
89
89
  "Could not update comment": "Could not update comment",
90
90
  "Enter comment text": "Enter comment text",
91
91
  "Update": "Update",
92
- "Viewing interpretation: {{visualisationName}}": "Viewing interpretation: {{visualisationName}}",
92
+ "Viewing interpretation: {{- visualisationName}}": "Viewing interpretation: {{- visualisationName}}",
93
93
  "Could not load interpretation": "Could not load interpretation",
94
94
  "The interpretation couldn’t be displayed. Try again or contact your system administrator.": "The interpretation couldn’t be displayed. Try again or contact your system administrator.",
95
95
  "Hide interpretation": "Hide interpretation",
@@ -113,7 +113,7 @@
113
113
  "Back to write mode": "Back to write mode",
114
114
  "Too many results. Try refining the search.": "Too many results. Try refining the search.",
115
115
  "Search for a user": "Search for a user",
116
- "Searching for \"{{searchText}}\"": "Searching for \"{{searchText}}\"",
116
+ "Searching for \"{{- searchText}}\"": "Searching for \"{{- searchText}}\"",
117
117
  "No results found": "No results found",
118
118
  "Created by": "Created by",
119
119
  "Anyone": "Anyone",
package/build/es/components/AboutAOUnit/AboutAOUnit.js CHANGED
@@ -21,7 +21,7 @@ const getQueries = type => ({
21
21
  return id;
22
22
  },
23
23
  params: {
24
- fields: 'id,displayDescription,created,createdBy[displayName],lastUpdated,subscribed,publicAccess,userAccesses[displayName,access],userGroupAccesses[displayName,access]'
24
+ fields: 'id,displayDescription,created,createdBy[displayName],lastUpdated,subscribed,sharing'
25
25
  }
26
26
  },
27
27
  dataStatistics: {
@@ -89,7 +89,7 @@ const AboutAOUnit = _ref3 => {
89
89
  id
90
90
  });
91
91
  }
92
- }, [type, id]);
92
+ }, [type, id, refetch]);
93
93
 
94
94
  const getAccessLevelString = access => {
95
95
  const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
@@ -108,15 +108,15 @@ const AboutAOUnit = _ref3 => {
108
108
  const sharingTextParts = [];
109
109
  const re = new RegExp("^".concat(READ_AND_WRITE, "?"));
110
110
 
111
- if (re.test(ao.publicAccess)) {
111
+ if (re.test(ao.sharing.public)) {
112
112
  sharingTextParts.push(i18n.t('all users ({{accessLevel}})', {
113
- accessLevel: getAccessLevelString(ao.publicAccess)
113
+ accessLevel: getAccessLevelString(ao.sharing.public)
114
114
  }));
115
115
  }
116
116
 
117
- const userAccesses = ao.userAccesses;
118
- const groupAccesses = ao.userGroupAccesses;
119
- userAccesses.concat(groupAccesses).forEach(accessRule => {
117
+ const userAccesses = ao.sharing.users;
118
+ const groupAccesses = ao.sharing.userGroups;
119
+ Object.values(userAccesses).concat(Object.values(groupAccesses)).forEach(accessRule => {
120
120
  sharingTextParts.push(i18n.t('{{userOrGroup}} ({{accessLevel}})', {
121
121
  userOrGroup: accessRule.displayName,
122
122
  accessLevel: getAccessLevelString(accessRule.access)
package/build/es/components/DynamicDimension/ItemSelector.js CHANGED
@@ -64,7 +64,7 @@ const SourceEmptyPlaceholder = _ref3 => {
64
64
  if (!loading && !options.length && !filter) {
65
65
  message = noItemsMessage || i18n.t('No data');
66
66
  } else if (!loading && !options.length && filter) {
67
- message = i18n.t('Nothing found for {{searchTerm}}', {
67
+ message = i18n.t('Nothing found for {{- searchTerm}}', {
68
68
  searchTerm: filter
69
69
  });
70
70
  }
package/build/es/components/Interpretations/InterpretationModal/InterpretationModal.js CHANGED
@@ -110,7 +110,7 @@ const InterpretationModal = _ref2 => {
110
110
  className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "title"
111
111
  }, /*#__PURE__*/React.createElement("span", {
112
112
  className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "ellipsis"
113
- }, i18n.t('Viewing interpretation: {{visualisationName}}', {
113
+ }, i18n.t('Viewing interpretation: {{- visualisationName}}', {
114
114
  visualisationName: visualization.displayName,
115
115
  nsSeparator: '^^'
116
116
  }))), /*#__PURE__*/React.createElement(ModalContent, {
package/build/es/components/Interpretations/common/UserMention/UserMentionWrapper.js CHANGED
@@ -171,7 +171,7 @@ export const UserMentionWrapper = _ref => {
171
171
  className: resolvedHeaderStyle.className,
172
172
  dense: true,
173
173
  hideDivider: true,
174
- label: capturedText === '' ? i18n.t('Search for a user') : i18n.t('Searching for "{{searchText}}"', {
174
+ label: capturedText === '' ? i18n.t('Search for a user') : i18n.t('Searching for "{{- searchText}}"', {
175
175
  searchText: capturedText
176
176
  })
177
177
  }), fetching && /*#__PURE__*/React.createElement(MenuItem, {
package/build/es/components/LegendKey/LegendKey.js CHANGED
@@ -17,7 +17,7 @@ const LegendKey = _ref => {
17
17
  className: "jsx-".concat(styles.__hash) + " " + (cx('legendSet', {
18
18
  divider: index > 0
19
19
  }) || "")
20
- }, legendSets.length > 1 && /*#__PURE__*/React.createElement("span", {
20
+ }, /*#__PURE__*/React.createElement("span", {
21
21
  className: "jsx-".concat(styles.__hash) + " " + "legendSetName"
22
22
  }, legendSet.name), legendSet.legends.sort((a, b) => a.startValue - b.startValue).map(legend => /*#__PURE__*/React.createElement("div", {
23
23
  key: legend.startValue,
package/build/es/locales/en/translations.json CHANGED
@@ -57,7 +57,7 @@
57
57
  "Manually select items...": "Manually select items...",
58
58
  "Nothing found in {{- dimensionTitle}}": "Nothing found in {{- dimensionTitle}}",
59
59
  "Search": "Search",
60
- "Nothing found for {{searchTerm}}": "Nothing found for {{searchTerm}}",
60
+ "Nothing found for {{- searchTerm}}": "Nothing found for {{- searchTerm}}",
61
61
  "Delete {{fileType}}": "Delete {{fileType}}",
62
62
  "This {{fileType}} and related interpretations will be deleted. Continue?": "This {{fileType}} and related interpretations will be deleted. Continue?",
63
63
  "Cancel": "Cancel",
@@ -89,7 +89,7 @@
89
89
  "Could not update comment": "Could not update comment",
90
90
  "Enter comment text": "Enter comment text",
91
91
  "Update": "Update",
92
- "Viewing interpretation: {{visualisationName}}": "Viewing interpretation: {{visualisationName}}",
92
+ "Viewing interpretation: {{- visualisationName}}": "Viewing interpretation: {{- visualisationName}}",
93
93
  "Could not load interpretation": "Could not load interpretation",
94
94
  "The interpretation couldn’t be displayed. Try again or contact your system administrator.": "The interpretation couldn’t be displayed. Try again or contact your system administrator.",
95
95
  "Hide interpretation": "Hide interpretation",
@@ -113,7 +113,7 @@
113
113
  "Back to write mode": "Back to write mode",
114
114
  "Too many results. Try refining the search.": "Too many results. Try refining the search.",
115
115
  "Search for a user": "Search for a user",
116
- "Searching for \"{{searchText}}\"": "Searching for \"{{searchText}}\"",
116
+ "Searching for \"{{- searchText}}\"": "Searching for \"{{- searchText}}\"",
117
117
  "No results found": "No results found",
118
118
  "Created by": "Created by",
119
119
  "Anyone": "Anyone",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "23.13.4",
3
+ "version": "23.13.7",
4
4
  "main": "./build/cjs/index.js",
5
5
  "module": "./build/es/index.js",
6
6
  "exports": {