@dhis2/analytics 24.2.6 → 24.3.0

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.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ # [24.3.0](https://github.com/dhis2/analytics/compare/v24.2.7...v24.3.0) (2022-10-17)
2
+
3
+
4
+ ### Features
5
+
6
+ * export VALUE_TYPE_AGE ([#1360](https://github.com/dhis2/analytics/issues/1360)) ([200cc0b](https://github.com/dhis2/analytics/commit/200cc0b9736cdebfec95e1701fd5f23d7fe312a6))
7
+
8
+ ## [24.2.7](https://github.com/dhis2/analytics/compare/v24.2.6...v24.2.7) (2022-10-14)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * parse markdown in description DHIS2-13911 ([#1358](https://github.com/dhis2/analytics/issues/1358)) ([1606319](https://github.com/dhis2/analytics/commit/16063192c747fbf67e6b5f9fadcd3b1d19f00ef0))
14
+
1
15
  ## [24.2.6](https://github.com/dhis2/analytics/compare/v24.2.5...v24.2.6) (2022-10-11)
2
16
 
3
17
 
@@ -11,6 +11,8 @@ var _appRuntime = require("@dhis2/app-runtime");
11
11
 
12
12
  var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
13
13
 
14
+ var _d2UiRichText = require("@dhis2/d2-ui-rich-text");
15
+
14
16
  var _ui = require("@dhis2/ui");
15
17
 
16
18
  var _classnames = _interopRequireDefault(require("classnames"));
@@ -181,7 +183,7 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
181
183
  className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + ((0, _classnames.default)('detailLine', {
182
184
  noDescription: !data.ao.displayDescription
183
185
  }) || "")
184
- }, data.ao.displayDescription ? data.ao.displayDescription : _d2I18n.default.t('No description')), /*#__PURE__*/_react.default.createElement("div", {
186
+ }, data.ao.displayDescription ? /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, data.ao.displayDescription) : _d2I18n.default.t('No description')), /*#__PURE__*/_react.default.createElement("div", {
185
187
  className: "jsx-".concat(_AboutAOUnitStyle.default.__hash)
186
188
  }, /*#__PURE__*/_react.default.createElement("p", {
187
189
  className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
@@ -633,6 +633,12 @@ Object.defineProperty(exports, "USER_ORG_UNIT_GRANDCHILDREN", {
633
633
  return _index3.USER_ORG_UNIT_GRANDCHILDREN;
634
634
  }
635
635
  });
636
+ Object.defineProperty(exports, "VALUE_TYPE_AGE", {
637
+ enumerable: true,
638
+ get: function () {
639
+ return _valueTypes.VALUE_TYPE_AGE;
640
+ }
641
+ });
636
642
  Object.defineProperty(exports, "VALUE_TYPE_BOOLEAN", {
637
643
  enumerable: true,
638
644
  get: function () {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.isNumericValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = void 0;
6
+ exports.isNumericValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = void 0;
7
7
 
8
8
  /* These types match the types in the backend
9
9
  https://github.com/dhis2/dhis2-core/blob/master/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java
@@ -48,6 +48,8 @@ const VALUE_TYPE_DATETIME = 'DATETIME';
48
48
  exports.VALUE_TYPE_DATETIME = VALUE_TYPE_DATETIME;
49
49
  const VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
50
50
  exports.VALUE_TYPE_ORGANISATION_UNIT = VALUE_TYPE_ORGANISATION_UNIT;
51
+ const VALUE_TYPE_AGE = 'AGE';
52
+ exports.VALUE_TYPE_AGE = VALUE_TYPE_AGE;
51
53
  const NUMERIC_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE];
52
54
 
53
55
  const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
@@ -1,6 +1,7 @@
1
1
  import _JSXStyle from "styled-jsx/style";
2
2
  import { useDataQuery, useDataMutation } from '@dhis2/app-runtime';
3
3
  import i18n from '@dhis2/d2-i18n';
4
+ import { Parser as RichTextParser } from '@dhis2/d2-ui-rich-text';
4
5
  import { Button, CircularLoader, IconChevronDown24, IconChevronUp24, IconClock16, IconShare16, IconSubscribe24, IconSubscribeOff24, IconUser16, IconView16, colors } from '@dhis2/ui';
5
6
  import cx from 'classnames';
6
7
  import moment from 'moment';
@@ -157,7 +158,7 @@ const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
157
158
  className: "jsx-".concat(styles.__hash) + " " + (cx('detailLine', {
158
159
  noDescription: !data.ao.displayDescription
159
160
  }) || "")
160
- }, data.ao.displayDescription ? data.ao.displayDescription : i18n.t('No description')), /*#__PURE__*/React.createElement("div", {
161
+ }, data.ao.displayDescription ? /*#__PURE__*/React.createElement(RichTextParser, null, data.ao.displayDescription) : i18n.t('No description')), /*#__PURE__*/React.createElement("div", {
161
162
  className: "jsx-".concat(styles.__hash)
162
163
  }, /*#__PURE__*/React.createElement("p", {
163
164
  className: "jsx-".concat(styles.__hash) + " " + "detailLine"
package/build/es/index.js CHANGED
@@ -51,7 +51,7 @@ export { layoutHasDimension } from './modules/layout/layoutHasDimension.js';
51
51
  export { layoutHasDynamicDimension } from './modules/layout/layoutHasDynamicDimension.js';
52
52
  export { layoutHasPeriodDimension } from './modules/layout/layoutHasPeriodDimension.js'; // Modules: valueTypes
53
53
 
54
- export { VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, VALUE_TYPE_TEXT, VALUE_TYPE_LONG_TEXT, VALUE_TYPE_LETTER, VALUE_TYPE_PHONE_NUMBER, VALUE_TYPE_EMAIL, VALUE_TYPE_USERNAME, VALUE_TYPE_URL, VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY, VALUE_TYPE_DATE, VALUE_TYPE_TIME, VALUE_TYPE_DATETIME, VALUE_TYPE_ORGANISATION_UNIT } from './modules/valueTypes.js';
54
+ export { VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, VALUE_TYPE_TEXT, VALUE_TYPE_LONG_TEXT, VALUE_TYPE_LETTER, VALUE_TYPE_PHONE_NUMBER, VALUE_TYPE_EMAIL, VALUE_TYPE_USERNAME, VALUE_TYPE_URL, VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY, VALUE_TYPE_DATE, VALUE_TYPE_TIME, VALUE_TYPE_DATETIME, VALUE_TYPE_ORGANISATION_UNIT, VALUE_TYPE_AGE } from './modules/valueTypes.js';
55
55
  export { AXIS, AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS, DEFAULT_AXIS_IDS } from './modules/layout/axis.js';
56
56
  export { axisGetAllItems } from './modules/layout/axisGetAllItems.js';
57
57
  export { axisGetDimension } from './modules/layout/axisGetDimension.js';
@@ -21,5 +21,6 @@ export const VALUE_TYPE_DATE = 'DATE';
21
21
  export const VALUE_TYPE_TIME = 'TIME';
22
22
  export const VALUE_TYPE_DATETIME = 'DATETIME';
23
23
  export const VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
24
+ export const VALUE_TYPE_AGE = 'AGE';
24
25
  const NUMERIC_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE];
25
26
  export const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "24.2.6",
3
+ "version": "24.3.0",
4
4
  "main": "./build/cjs/index.js",
5
5
  "module": "./build/es/index.js",
6
6
  "exports": {