@hisptz/dhis2-analytics 1.0.55 → 1.0.57

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 (13) hide show
  1. package/build/cjs/components/Visualization/components/DimensionsProvider/index.js +0 -1
  2. package/build/cjs/components/Visualization/components/VisualizationDimensionSelector/index.js +21 -17
  3. package/build/cjs/components/Visualization/components/VisualizationSelector/index.js +2 -1
  4. package/build/cjs/components/Visualization/index.js +7 -5
  5. package/build/cjs/locales/en/translations.json +1 -1
  6. package/build/es/components/Visualization/components/DimensionsProvider/index.js +0 -1
  7. package/build/es/components/Visualization/components/VisualizationDimensionSelector/index.js +21 -17
  8. package/build/es/components/Visualization/components/VisualizationSelector/index.js +2 -1
  9. package/build/es/components/Visualization/index.js +7 -5
  10. package/build/es/locales/en/translations.json +1 -1
  11. package/build/types/components/Visualization/components/VisualizationDimensionSelector/index.d.ts +4 -1
  12. package/build/types/components/Visualization/index.d.ts +3 -1
  13. package/package.json +4 -4
package/build/cjs/components/Visualization/components/DimensionsProvider/index.js CHANGED
@@ -42,7 +42,6 @@ function DimensionsProvider(_ref2) {
42
42
  (0, _usehooksTs.useUpdateEffect)(() => {
43
43
  Object.keys(dimensions).forEach(dimension => {
44
44
  var _dimensions$dimension;
45
- console.log("updating");
46
45
  dispatch({
47
46
  dimension: dimension,
48
47
  value: (_dimensions$dimension = dimensions[dimension]) !== null && _dimensions$dimension !== void 0 ? _dimensions$dimension : []
package/build/cjs/components/Visualization/components/VisualizationDimensionSelector/index.js CHANGED
@@ -14,7 +14,11 @@ var _map = require("../../../Map/utils/map");
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
  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); }
16
16
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
17
- function VisualizationDimensionSelector() {
17
+ function VisualizationDimensionSelector(_ref) {
18
+ let {
19
+ showPeriodSelector,
20
+ showOrgUnitSelector
21
+ } = _ref;
18
22
  const [dimensions, setDimensions] = (0, _DimensionsProvider.useDimensions)();
19
23
  const periods = (0, _react.useMemo)(() => dimensions.pe, [dimensions.pe]);
20
24
  const orgUnitSelection = (0, _react.useMemo)(() => {
@@ -39,14 +43,26 @@ function VisualizationDimensionSelector() {
39
43
  return;
40
44
  }
41
45
  }, [setDimensions]);
42
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dhis2Ui.PeriodSelectorModal, {
46
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
47
+ style: {
48
+ display: "flex",
49
+ gap: 8
50
+ }
51
+ }, showPeriodSelector && /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
52
+ content: _d2I18n.default.t("Period")
53
+ }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dhis2Ui.PeriodSelectorModal, {
43
54
  position: "middle",
44
55
  enablePeriodSelector: true,
45
56
  selectedPeriods: periods,
46
57
  onClose: () => setOpenFilter(undefined),
47
58
  hide: openFilter !== "pe",
48
59
  onUpdate: onFilterUpdate("pe")
49
- }), /*#__PURE__*/_react.default.createElement(_dhis2Ui.OrgUnitSelectorModal, {
60
+ }), /*#__PURE__*/_react.default.createElement(_ui.Button, {
61
+ onClick: () => setOpenFilter("pe"),
62
+ icon: /*#__PURE__*/_react.default.createElement(_ui.IconClock24, null)
63
+ }))), showOrgUnitSelector && /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
64
+ content: _d2I18n.default.t("Location")
65
+ }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dhis2Ui.OrgUnitSelectorModal, {
50
66
  showUserOptions: true,
51
67
  searchable: true,
52
68
  title: _d2I18n.default.t("Select location(s)"),
@@ -54,20 +70,8 @@ function VisualizationDimensionSelector() {
54
70
  onClose: () => setOpenFilter(undefined),
55
71
  hide: openFilter !== "ou",
56
72
  onUpdate: onFilterUpdate("ou")
57
- }), /*#__PURE__*/_react.default.createElement("div", {
58
- style: {
59
- display: "flex",
60
- gap: 8
61
- }
62
- }, /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
63
- content: _d2I18n.default.t("Period")
64
- }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
65
- onClick: () => setOpenFilter("pe"),
66
- icon: /*#__PURE__*/_react.default.createElement(_ui.IconClock24, null)
67
- })), /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
68
- content: _d2I18n.default.t("Location")
69
- }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
73
+ }), /*#__PURE__*/_react.default.createElement(_ui.Button, {
70
74
  onClick: () => setOpenFilter("ou"),
71
75
  icon: /*#__PURE__*/_react.default.createElement(_ui.IconLocation24, null)
72
- }))));
76
+ })))));
73
77
  }
package/build/cjs/components/Visualization/components/VisualizationSelector/index.js CHANGED
@@ -51,7 +51,8 @@ function getOrgUnitSelectionFromIds(ous) {
51
51
  const orgUnits = [...((_orgUnitSelection$org = orgUnitSelection.orgUnits) !== null && _orgUnitSelection$org !== void 0 ? _orgUnitSelection$org : [])];
52
52
  orgUnits.push({
53
53
  id: ou,
54
- children: []
54
+ children: [],
55
+ path: ""
55
56
  });
56
57
  (0, _lodash.set)(orgUnitSelection, ['orgUnits'], orgUnits);
57
58
  }
package/build/cjs/components/Visualization/index.js CHANGED
@@ -58,12 +58,11 @@ function Visualization(_ref2) {
58
58
  defaultVisualizationType,
59
59
  config,
60
60
  height,
61
- showToolbar
61
+ showToolbar,
62
+ showOrgUnitSelector,
63
+ showPeriodSelector
62
64
  } = _ref2;
63
65
  return /*#__PURE__*/_react.default.createElement(_reactErrorBoundary.ErrorBoundary, {
64
- onReset: () => {
65
- //TODO: reset the visualization
66
- },
67
66
  resetKeys: [dimensions, layout, defaultVisualizationType, config],
68
67
  fallbackRender: props => /*#__PURE__*/_react.default.createElement(ErrorFallback, _extends({
69
68
  height: height
@@ -88,7 +87,10 @@ function Visualization(_ref2) {
88
87
  gap: 16,
89
88
  justifyContent: "space-between"
90
89
  }
91
- }, /*#__PURE__*/_react.default.createElement(_VisualizationTypeSelector.VisualizationTypeSelector, null), /*#__PURE__*/_react.default.createElement(_VisualizationDimensionSelector.VisualizationDimensionSelector, null)), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_VisualizationSelector.VisualizationSelector, {
90
+ }, /*#__PURE__*/_react.default.createElement(_VisualizationTypeSelector.VisualizationTypeSelector, null), /*#__PURE__*/_react.default.createElement(_VisualizationDimensionSelector.VisualizationDimensionSelector, {
91
+ showPeriodSelector: showPeriodSelector,
92
+ showOrgUnitSelector: showOrgUnitSelector
93
+ })), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_VisualizationSelector.VisualizationSelector, {
92
94
  config: config
93
95
  })))));
94
96
  }
package/build/cjs/locales/en/translations.json CHANGED
@@ -125,8 +125,8 @@
125
125
  "Radius": "Radius",
126
126
  "Configure Thematic Layer": "Configure Thematic Layer",
127
127
  "Loading ...": "Loading ...",
128
- "Select location(s)": "Select location(s)",
129
128
  "Location": "Location",
129
+ "Select location(s)": "Select location(s)",
130
130
  "Organisation unit": "Organisation unit",
131
131
  "Data": "Data",
132
132
  "Pivot table": "Pivot table",
package/build/es/components/Visualization/components/DimensionsProvider/index.js CHANGED
@@ -30,7 +30,6 @@ export function DimensionsProvider(_ref2) {
30
30
  useUpdateEffect(() => {
31
31
  Object.keys(dimensions).forEach(dimension => {
32
32
  var _dimensions$dimension;
33
- console.log("updating");
34
33
  dispatch({
35
34
  dimension: dimension,
36
35
  value: (_dimensions$dimension = dimensions[dimension]) !== null && _dimensions$dimension !== void 0 ? _dimensions$dimension : []
package/build/es/components/Visualization/components/VisualizationDimensionSelector/index.js CHANGED
@@ -5,7 +5,11 @@ import { useDimensions } from "../DimensionsProvider";
5
5
  import { OrgUnitSelectorModal, PeriodSelectorModal } from "@hisptz/dhis2-ui";
6
6
  import { getOrgUnitSelectionFromIds } from "../VisualizationSelector";
7
7
  import { getOrgUnitsSelection } from "../../../Map/utils/map";
8
- export function VisualizationDimensionSelector() {
8
+ export function VisualizationDimensionSelector(_ref) {
9
+ let {
10
+ showPeriodSelector,
11
+ showOrgUnitSelector
12
+ } = _ref;
9
13
  const [dimensions, setDimensions] = useDimensions();
10
14
  const periods = useMemo(() => dimensions.pe, [dimensions.pe]);
11
15
  const orgUnitSelection = useMemo(() => {
@@ -30,14 +34,26 @@ export function VisualizationDimensionSelector() {
30
34
  return;
31
35
  }
32
36
  }, [setDimensions]);
33
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PeriodSelectorModal, {
37
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
38
+ style: {
39
+ display: "flex",
40
+ gap: 8
41
+ }
42
+ }, showPeriodSelector && /*#__PURE__*/React.createElement(Tooltip, {
43
+ content: i18n.t("Period")
44
+ }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PeriodSelectorModal, {
34
45
  position: "middle",
35
46
  enablePeriodSelector: true,
36
47
  selectedPeriods: periods,
37
48
  onClose: () => setOpenFilter(undefined),
38
49
  hide: openFilter !== "pe",
39
50
  onUpdate: onFilterUpdate("pe")
40
- }), /*#__PURE__*/React.createElement(OrgUnitSelectorModal, {
51
+ }), /*#__PURE__*/React.createElement(Button, {
52
+ onClick: () => setOpenFilter("pe"),
53
+ icon: /*#__PURE__*/React.createElement(IconClock24, null)
54
+ }))), showOrgUnitSelector && /*#__PURE__*/React.createElement(Tooltip, {
55
+ content: i18n.t("Location")
56
+ }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OrgUnitSelectorModal, {
41
57
  showUserOptions: true,
42
58
  searchable: true,
43
59
  title: i18n.t("Select location(s)"),
@@ -45,20 +61,8 @@ export function VisualizationDimensionSelector() {
45
61
  onClose: () => setOpenFilter(undefined),
46
62
  hide: openFilter !== "ou",
47
63
  onUpdate: onFilterUpdate("ou")
48
- }), /*#__PURE__*/React.createElement("div", {
49
- style: {
50
- display: "flex",
51
- gap: 8
52
- }
53
- }, /*#__PURE__*/React.createElement(Tooltip, {
54
- content: i18n.t("Period")
55
- }, /*#__PURE__*/React.createElement(Button, {
56
- onClick: () => setOpenFilter("pe"),
57
- icon: /*#__PURE__*/React.createElement(IconClock24, null)
58
- })), /*#__PURE__*/React.createElement(Tooltip, {
59
- content: i18n.t("Location")
60
- }, /*#__PURE__*/React.createElement(Button, {
64
+ }), /*#__PURE__*/React.createElement(Button, {
61
65
  onClick: () => setOpenFilter("ou"),
62
66
  icon: /*#__PURE__*/React.createElement(IconLocation24, null)
63
- }))));
67
+ })))));
64
68
  }
package/build/es/components/Visualization/components/VisualizationSelector/index.js CHANGED
@@ -37,7 +37,8 @@ export function getOrgUnitSelectionFromIds(ous) {
37
37
  const orgUnits = [...((_orgUnitSelection$org = orgUnitSelection.orgUnits) !== null && _orgUnitSelection$org !== void 0 ? _orgUnitSelection$org : [])];
38
38
  orgUnits.push({
39
39
  id: ou,
40
- children: []
40
+ children: [],
41
+ path: ""
41
42
  });
42
43
  set(orgUnitSelection, ['orgUnits'], orgUnits);
43
44
  }
package/build/es/components/Visualization/index.js CHANGED
@@ -51,12 +51,11 @@ export function Visualization(_ref2) {
51
51
  defaultVisualizationType,
52
52
  config,
53
53
  height,
54
- showToolbar
54
+ showToolbar,
55
+ showOrgUnitSelector,
56
+ showPeriodSelector
55
57
  } = _ref2;
56
58
  return /*#__PURE__*/React.createElement(ErrorBoundary, {
57
- onReset: () => {
58
- //TODO: reset the visualization
59
- },
60
59
  resetKeys: [dimensions, layout, defaultVisualizationType, config],
61
60
  fallbackRender: props => /*#__PURE__*/React.createElement(ErrorFallback, _extends({
62
61
  height: height
@@ -81,7 +80,10 @@ export function Visualization(_ref2) {
81
80
  gap: 16,
82
81
  justifyContent: "space-between"
83
82
  }
84
- }, /*#__PURE__*/React.createElement(VisualizationTypeSelector, null), /*#__PURE__*/React.createElement(VisualizationDimensionSelector, null)), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VisualizationSelector, {
83
+ }, /*#__PURE__*/React.createElement(VisualizationTypeSelector, null), /*#__PURE__*/React.createElement(VisualizationDimensionSelector, {
84
+ showPeriodSelector: showPeriodSelector,
85
+ showOrgUnitSelector: showOrgUnitSelector
86
+ })), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VisualizationSelector, {
85
87
  config: config
86
88
  })))));
87
89
  }
package/build/es/locales/en/translations.json CHANGED
@@ -125,8 +125,8 @@
125
125
  "Radius": "Radius",
126
126
  "Configure Thematic Layer": "Configure Thematic Layer",
127
127
  "Loading ...": "Loading ...",
128
- "Select location(s)": "Select location(s)",
129
128
  "Location": "Location",
129
+ "Select location(s)": "Select location(s)",
130
130
  "Organisation unit": "Organisation unit",
131
131
  "Data": "Data",
132
132
  "Pivot table": "Pivot table",
package/build/types/components/Visualization/components/VisualizationDimensionSelector/index.d.ts CHANGED
@@ -1,2 +1,5 @@
1
1
  /// <reference types="react" />
2
- export declare function VisualizationDimensionSelector(): JSX.Element;
2
+ export declare function VisualizationDimensionSelector({ showPeriodSelector, showOrgUnitSelector }: {
3
+ showPeriodSelector?: boolean;
4
+ showOrgUnitSelector?: boolean;
5
+ }): JSX.Element;
package/build/types/components/Visualization/index.d.ts CHANGED
@@ -17,5 +17,7 @@ export interface VisualizationProps {
17
17
  config: VisualizationConfig;
18
18
  height?: number;
19
19
  showToolbar?: boolean;
20
+ showPeriodSelector?: boolean;
21
+ showOrgUnitSelector?: boolean;
20
22
  }
21
- export declare function Visualization({ dimensions, layout, defaultVisualizationType, config, height, showToolbar }: VisualizationProps): JSX.Element;
23
+ export declare function Visualization({ dimensions, layout, defaultVisualizationType, config, height, showToolbar, showOrgUnitSelector, showPeriodSelector }: VisualizationProps): JSX.Element;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hisptz/dhis2-analytics",
3
- "version": "1.0.55",
3
+ "version": "1.0.57",
4
4
  "description": "A collection of reusable react components for visualizing analytics data from DHIS2",
5
5
  "license": "BSD-3-Clause",
6
6
  "scripts": {
@@ -31,8 +31,8 @@
31
31
  },
32
32
  "dependencies": {
33
33
  "@dhis2/app-runtime": "^3.7.0",
34
- "@hisptz/dhis2-ui": "^1.0.55",
35
- "@hisptz/dhis2-utils": "^1.0.52",
34
+ "@hisptz/dhis2-ui": "^1.0.57",
35
+ "@hisptz/dhis2-utils": "^1.0.57",
36
36
  "@react-leaflet/core": "^2.1.0",
37
37
  "async-es": "^3.2.4",
38
38
  "d3-color": "^3.1.0",
@@ -87,5 +87,5 @@
87
87
  "react-hook-form": "^7.43",
88
88
  "recoil": "*"
89
89
  },
90
- "gitHead": "2b135b67b1a23fc6cce83972d4197cc5718adbfe"
90
+ "gitHead": "d48977fa3256a97cd2ed24a86ffefdbea5bde10c"
91
91
  }