@hisptz/dhis2-analytics 1.0.44 → 1.0.46

package/build/es/components/Map/components/MapLayer/components/GoogleEngineLayer/services/engine.js

@@ -11,8 +11,8 @@ import { find, head, isEmpty } from "lodash";
 //     }
 //     return await import("./api");
 // }
-//
 // const EE = await importEEModule();
+//@ts-ignore
 import EE from "./api";
 // @ts-ignore
 const ee = EE;

package/build/es/components/SingleValueContainer/index.js

@@ -4,6 +4,7 @@ import { CssReset } from "@dhis2/ui";
 import React, { Suspense } from "react";
 import SingleValueItem from "./components/SingleValueItem/SingleValueItem";
 import styles from "./styles/SingleValueContainer.module.css";
+export * from "./types/props";
 export function SingleValueContainer(_ref) {
   let {
     title,

package/build/es/components/Visualization/components/VisualizationSelector/index.js

@@ -77,8 +77,7 @@ export function PivotTableRenderer(_ref) {
 }
 export function ChartRenderer(_ref2) {
   let {
-    options,
-    height
+    options
   } = _ref2;
   const {
     analytics
@@ -89,8 +88,7 @@ export function ChartRenderer(_ref2) {
   return /*#__PURE__*/React.createElement(ChartAnalytics, {
     analytics: analytics,
     config: {
-      ...options,
-      height
+      ...options
     }
   });
 }
@@ -134,8 +132,7 @@ export function MapRenderer(_ref3) {
 }
 export function VisualizationSelector(_ref4) {
   let {
-    config,
-    height
+    config
   } = _ref4;
   const [type] = useVisualizationType();
   const {
@@ -158,15 +155,9 @@ export function VisualizationSelector(_ref4) {
   if (!analytics) {
     return null;
   }
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: "100%",
-      height: "100%"
-    }
-  }, type === "pivotTable" && /*#__PURE__*/React.createElement(PivotTableRenderer, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, type === "pivotTable" && /*#__PURE__*/React.createElement(PivotTableRenderer, {
     options: config === null || config === void 0 ? void 0 : config.pivotTable
   }), type === "chart" && /*#__PURE__*/React.createElement(ChartRenderer, {
-    height: height,
     options: config === null || config === void 0 ? void 0 : config.chart
   }), type === "map" && /*#__PURE__*/React.createElement(MapRenderer, {
     options: config === null || config === void 0 ? void 0 : config.map

package/build/es/components/Visualization/index.js

@@ -72,7 +72,6 @@ export function Visualization(_ref2) {
       flexDirection: "column",
       width: "100%",
       height: "100%",
-      padding: 16,
       gap: 16
     }
   }, showToolbar && /*#__PURE__*/React.createElement("div", {
@@ -82,16 +81,7 @@ export function Visualization(_ref2) {
       gap: 16,
       justifyContent: "space-between"
     }
-  }, /*#__PURE__*/React.createElement(VisualizationTypeSelector, null), /*#__PURE__*/React.createElement(VisualizationDimensionSelector, null)), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexDirection: "column",
-      alignItems: "center",
-      justifyContent: "center",
-      height: height !== null && height !== void 0 ? height : 500
-    }
-  }, /*#__PURE__*/React.createElement(VisualizationSelector, {
-    height: height !== null && height !== void 0 ? height : 500,
+  }, /*#__PURE__*/React.createElement(VisualizationTypeSelector, null), /*#__PURE__*/React.createElement(VisualizationDimensionSelector, null)), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VisualizationSelector, {
     config: config
   })))));
 }

package/build/types/components/CircularProgressDashboard/index.d.ts

@@ -1,3 +1,4 @@
 import React from "react";
 import { CircularDashboardProps } from "./types/props";
+export * from "./types/props";
 export declare function CircularProgressDashboard({ numerator, size, denominator, value, textStyle, strokeStyle }: CircularDashboardProps): React.ReactElement;

package/build/types/components/SingleValueContainer/index.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
 import SingleValueItem from "./components/SingleValueItem/SingleValueItem";
 import { SingleValueContainerProps } from "./types/props";
+export * from "./types/props";
 export declare function SingleValueContainer({ title, singleValueItems, animationDuration, animationDelay }: SingleValueContainerProps): React.ReactElement;
 export { SingleValueItem };

package/build/types/components/Visualization/components/VisualizationSelector/index.d.ts

@@ -8,18 +8,16 @@ import { OrgUnitSelection } from "@hisptz/dhis2-utils";
 import { PivotTableLayoutProps } from "../../../CustomPivotTable/components/Table";
 export interface VisualizationSelectorProps {
     config: VisualizationConfig;
-    height: number;
 }
 export declare function getDimensionLabel(dimension: Dimension): any;
 export declare function getOrgUnitSelectionFromIds(ous: string[]): OrgUnitSelection;
 export declare function PivotTableRenderer({ options }: {
     options: CustomPivotTableOptions & PivotTableLayoutProps;
 }): JSX.Element | null;
-export declare function ChartRenderer({ options, height }: {
+export declare function ChartRenderer({ options }: {
     options: ChartConfig;
-    height: number;
 }): JSX.Element | null;
 export declare function MapRenderer({ options }: {
     options: Omit<MapProps, "orgUnitSelection" | "periodSelection">;
 }): JSX.Element;
-export declare function VisualizationSelector({ config, height }: VisualizationSelectorProps): JSX.Element | null;
+export declare function VisualizationSelector({ config }: VisualizationSelectorProps): JSX.Element | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "A collection of reusable react components for visualizing analytics data from DHIS2",
   "license": "BSD-3-Clause",
   "scripts": {
@@ -17,6 +17,7 @@
     "@dhis2/cli-app-scripts": "^10.2.0",
     "@dhis2/cypress-commands": "^9.0.2",
     "@dhis2/cypress-plugins": "^9.0.2",
+    "@dhis2/ui": "^8.13.0",
     "@google/earthengine": "^0.1.336",
     "@types/d3-color": "^3.1.0",
     "@types/d3-scale": "^4.0.3",
@@ -25,14 +26,13 @@
     "@types/react-helmet": "^6.1.6",
     "cypress": "^12.3.0",
     "lodash": "^4.17.21",
-    "react-hook-form": "^7.42.1",
+    "react-hook-form": "^7.43.9",
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@dhis2/analytics": "^24.4.2",
     "@dhis2/app-runtime": "^3.7.0",
-    "@hisptz/dhis2-ui": "^1.0.42",
-    "@hisptz/dhis2-utils": "^1.0.42",
+    "@hisptz/dhis2-ui": "^1.0.45",
+    "@hisptz/dhis2-utils": "*",
     "@react-leaflet/core": "^2.1.0",
     "async-es": "^3.2.4",
     "d3-color": "^3.1.0",
@@ -45,7 +45,6 @@
     "react-circular-progressbar": "^2.1.0",
     "react-error-boundary": "^4.0.4",
     "react-helmet": "^6.1.0",
-    "react-hook-form": "^7.43.9",
     "react-leaflet": "^4.2.0",
     "react-leaflet-custom-control": "^1.3.1",
     "react-spring": "^9.6.1",
@@ -81,7 +80,12 @@
     "url": "https://github.com/hisptz/dhis2-utils/issues"
   },
   "peerDependencies": {
-    "lodash": "^4"
+    "@dhis2/d2-i18n": "^1.1",
+    "@dhis2/ui": "^8.13",
+    "lodash": "^4",
+    "react": "*",
+    "react-hook-form": "^7.43",
+    "recoil": "*"
   },
-  "gitHead": "6f9f77d73df7acac380db5ded5cac234494b21f3"
+  "gitHead": "7bd2883e4e4ebad6f2d45b81adbde2c41cf452d5"
 }

package/build/cjs/components/ChartAnalytics/ChartAnalytics.stories.js

@@ -1,253 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.StackedColumn = exports.PieChart = exports.MultipleLines = exports.MultipleColumns = exports.MultiSeries = exports.Line = exports.ComplexMultiSeries = exports.Column = void 0;
-var _ui = require("@dhis2/ui");
-var _highcharts = _interopRequireDefault(require("highcharts"));
-var _react = _interopRequireWildcard(require("react"));
-var _DownloadMenu = require("./components/DownloadMenu");
-var _columnData = _interopRequireDefault(require("./data/column-data.json"));
-var _complexMultiSeriesData = _interopRequireDefault(require("./data/complex-multi-series-data.json"));
-var _multiSeriesData = _interopRequireDefault(require("./data/multi-series-data.json"));
-var _pieData = _interopRequireDefault(require("./data/pie-data.json"));
-var _stackedChartData = _interopRequireDefault(require("./data/stacked-chart-data.json"));
-var _export = require("./services/export");
-var _ = require(".");
-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); }
-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; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const Template = args => /*#__PURE__*/_react.default.createElement(_.ChartAnalytics, args);
-(0, _export.setupHighchartsModules)(_highcharts.default);
-const Column = Template.bind({});
-exports.Column = Column;
-Column.args = {
-  analytics: _columnData.default,
-  config: {
-    layout: {
-      series: ["dx"],
-      category: ["ou"],
-      filter: ["pe"]
-    },
-    type: "column",
-    height: 500,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"]
-  }
-};
-const MultipleColumns = Template.bind({});
-exports.MultipleColumns = MultipleColumns;
-MultipleColumns.args = {
-  analytics: _multiSeriesData.default,
-  config: {
-    layout: {
-      series: ["ou"],
-      category: ["pe"],
-      filter: ["dx"]
-    },
-    type: "column",
-    height: 1000,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"]
-  }
-};
-const StackedColumn = Template.bind({});
-exports.StackedColumn = StackedColumn;
-StackedColumn.args = {
-  analytics: _stackedChartData.default,
-  config: {
-    layout: {
-      series: ["ou"],
-      category: ["pe"],
-      filter: ["dx"]
-    },
-    type: "stacked-column",
-    height: 1000,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"]
-  }
-};
-const Line = Template.bind({});
-exports.Line = Line;
-Line.args = {
-  analytics: _columnData.default,
-  config: {
-    layout: {
-      series: ["dx"],
-      category: ["ou"],
-      filter: ["pe"]
-    },
-    type: "line",
-    height: 1000,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"]
-  }
-};
-const MultipleLines = Template.bind({});
-exports.MultipleLines = MultipleLines;
-MultipleLines.args = {
-  analytics: _multiSeriesData.default,
-  config: {
-    layout: {
-      series: ["ou"],
-      category: ["pe"],
-      filter: ["dx"]
-    },
-    type: "line",
-    height: 500,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"]
-  }
-};
-const PieChart = Template.bind({});
-exports.PieChart = PieChart;
-PieChart.args = {
-  analytics: _pieData.default,
-  config: {
-    layout: {
-      series: ["dx"],
-      category: [],
-      filter: ["dx", "pe"]
-    },
-    type: "pie",
-    height: 500,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c4255", "#a6c96a"]
-  }
-};
-const MultiSeries = Template.bind({});
-exports.MultiSeries = MultiSeries;
-MultiSeries.args = {
-  analytics: _multiSeriesData.default,
-  config: {
-    layout: {
-      series: ["ou"],
-      category: ["pe"],
-      filter: ["dx"]
-    },
-    type: "multi-series",
-    height: 500,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"],
-    multiSeries: {
-      series: [{
-        id: "qhqAxPSTUXp",
-        as: "column",
-        yAxis: 0
-      }, {
-        id: "Vth0fbpFcsO",
-        as: "line",
-        cumulative: true,
-        yAxis: 1
-      }],
-      yAxes: [{
-        id: "yAxis1",
-        title: {
-          text: "Koinandugu"
-        },
-        labels: {
-          format: "{value}"
-        }
-      }, {
-        id: "yAxis2",
-        title: {
-          text: "Kono"
-        },
-        labels: {
-          format: "{value}"
-        },
-        opposite: true
-      }],
-      target: {
-        id: "",
-        styles: {
-          color: "blue"
-        },
-        value: 45,
-        label: {
-          text: "Target",
-          textAlign: "center",
-          verticalAlign: "middle"
-        }
-      }
-    }
-  }
-};
-const ComplexMultiSeries = Template.bind({});
-exports.ComplexMultiSeries = ComplexMultiSeries;
-ComplexMultiSeries.args = {
-  analytics: _complexMultiSeriesData.default,
-  config: {
-    layout: {
-      series: ["dx"],
-      category: ["pe"],
-      filter: ["ou"]
-    },
-    type: "multi-series",
-    height: 500,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"],
-    multiSeries: {
-      series: [{
-        id: "QQkOAJFukyY",
-        as: "column",
-        yAxis: 0
-      }, {
-        id: "QQkOAJFukyY",
-        as: "line",
-        cumulative: true,
-        yAxis: 1
-      }],
-      yAxes: [{
-        id: "yAxis1",
-        title: {
-          text: "Koinandugu"
-        },
-        labels: {
-          format: "{value}"
-        }
-      }, {
-        id: "yAxis2",
-        title: {
-          text: "Kono"
-        },
-        labels: {
-          format: "{value}"
-        },
-        opposite: true
-      }],
-      target: {
-        id: "",
-        styles: {
-          color: "blue"
-        },
-        value: 45,
-        label: {
-          text: "Target",
-          textAlign: "center",
-          verticalAlign: "middle"
-        }
-      }
-    }
-  }
-};
-var _default = {
-  title: "Analytics/Chart Analytics",
-  component: _.ChartAnalytics,
-  decorators: [ChartStory => {
-    const [chartRef, setChartRef] = (0, _react.useState)(null);
-    return /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        width: 1000,
-        height: "100%",
-        display: "flex",
-        gap: 8,
-        flexDirection: "column"
-      }
-    }, /*#__PURE__*/_react.default.createElement(_ui.CssReset, null), /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        width: "100%",
-        display: "flex",
-        justifyContent: "end"
-      }
-    }, /*#__PURE__*/_react.default.createElement(_DownloadMenu.ChartDownloadMenu, {
-      chartRef: chartRef
-    })), /*#__PURE__*/_react.default.createElement(ChartStory, {
-      ref: setChartRef
-    }));
-  }]
-};
-exports.default = _default;

package/build/cjs/components/ChartAnalytics/data/column-data.json

@@ -1,210 +0,0 @@
-{
-  "headers": [
-    {
-      "name": "dx",
-      "column": "Data",
-      "valueType": "TEXT",
-      "type": "java.lang.String",
-      "hidden": false,
-      "meta": true
-    },
-    {
-      "name": "ou",
-      "column": "Organisation unit",
-      "valueType": "TEXT",
-      "type": "java.lang.String",
-      "hidden": false,
-      "meta": true
-    },
-    {
-      "name": "value",
-      "column": "Value",
-      "valueType": "NUMBER",
-      "type": "java.lang.Double",
-      "hidden": false,
-      "meta": false
-    }
-  ],
-  "metaData": {
-    "items": {
-      "2022": {
-        "name": "2022"
-      },
-      "KctpIIucige": {
-        "name": "Selenga"
-      },
-      "YmmeuGbqOwR": {
-        "name": "Gbo"
-      },
-      "daJPPxtIrQn": {
-        "name": "Jaiama Bongor"
-      },
-      "tTUf91fCytl": {
-        "uid": "tTUf91fCytl",
-        "name": "Chiefdom"
-      },
-      "ou": {
-        "name": "Organisation unit"
-      },
-      "sxRd2XOzFbz": {
-        "name": "Tikonko"
-      },
-      "THIS_YEAR": {
-        "name": "This year"
-      },
-      "O6uvpzGd5pu": {
-        "uid": "O6uvpzGd5pu",
-        "code": "OU_264",
-        "name": "Bo"
-      },
-      "U6Kr7Gtpidn": {
-        "name": "Kakua"
-      },
-      "YuQRtpLP10I": {
-        "name": "Badjia"
-      },
-      "zFDYIgyGmXG": {
-        "name": "Bargbo"
-      },
-      "I4jWcnFmgEC": {
-        "name": "Niawa Lenga"
-      },
-      "dx": {
-        "name": "Data"
-      },
-      "BGGmAwx33dj": {
-        "name": "Bumpe Ngao"
-      },
-      "pe": {
-        "name": "Period"
-      },
-      "Uvn6LCg7dVU": {
-        "name": "ANC 1 Coverage"
-      },
-      "ARZ4y5i4reU": {
-        "name": "Wonde"
-      },
-      "JdhagCUEMbj": {
-        "name": "Komboya"
-      },
-      "vWbkYPRmKyS": {
-        "name": "Baoma"
-      },
-      "dGheVylzol6": {
-        "name": "Bargbe"
-      },
-      "kU8vhUkAGaT": {
-        "name": "Lugbu"
-      },
-      "npWGUj37qDe": {
-        "name": "Valunia"
-      }
-    },
-    "dimensions": {
-      "dx": [
-        "Uvn6LCg7dVU"
-      ],
-      "pe": [
-        "2022"
-      ],
-      "ou": [
-        "YuQRtpLP10I",
-        "vWbkYPRmKyS",
-        "dGheVylzol6",
-        "zFDYIgyGmXG",
-        "BGGmAwx33dj",
-        "YmmeuGbqOwR",
-        "daJPPxtIrQn",
-        "U6Kr7Gtpidn",
-        "JdhagCUEMbj",
-        "kU8vhUkAGaT",
-        "I4jWcnFmgEC",
-        "KctpIIucige",
-        "sxRd2XOzFbz",
-        "npWGUj37qDe",
-        "ARZ4y5i4reU"
-      ],
-      "co": []
-    }
-  },
-  "rows": [
-    [
-      "Uvn6LCg7dVU",
-      "YuQRtpLP10I",
-      "304.1"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "vWbkYPRmKyS",
-      "213.7"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "dGheVylzol6",
-      "126.5"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "zFDYIgyGmXG",
-      "206.4"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "BGGmAwx33dj",
-      "120.9"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "YmmeuGbqOwR",
-      "203.1"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "daJPPxtIrQn",
-      "89.3"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "U6Kr7Gtpidn",
-      "104.4"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "JdhagCUEMbj",
-      "187.1"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "kU8vhUkAGaT",
-      "96.1"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "I4jWcnFmgEC",
-      "147.9"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "KctpIIucige",
-      "91.1"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "sxRd2XOzFbz",
-      "203.2"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "npWGUj37qDe",
-      "95.7"
-    ],
-    [
-      "Uvn6LCg7dVU",
-      "ARZ4y5i4reU",
-      "84.3"
-    ]
-  ],
-  "height": 15,
-  "width": 3,
-  "headerWidth": 3
-}