@hisptz/dhis2-analytics 1.0.30 → 1.0.32

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

@@ -3,10 +3,10 @@
 var _react = require("@cypress/react");
 var _highcharts = _interopRequireDefault(require("highcharts"));
 var _react2 = _interopRequireWildcard(require("react"));
-var _DownloadMenu = _interopRequireDefault(require("./components/DownloadMenu"));
+var _DownloadMenu = require("./components/DownloadMenu");
 var _columnData = _interopRequireDefault(require("./data/column-data.json"));
 var _export = require("./services/export");
-var _ = _interopRequireDefault(require("."));
+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 }; }
@@ -25,7 +25,7 @@ const props = {
   }
 };
 function TestComponent() {
-  return /*#__PURE__*/_react2.default.createElement(_.default, props);
+  return /*#__PURE__*/_react2.default.createElement(_.ChartAnalytics, props);
 }
 function ExportTestComponent() {
   const [chartRef, setChartRef] = (0, _react2.useState)(null);
@@ -34,9 +34,9 @@ function ExportTestComponent() {
       display: "flex",
       flexDirection: "column"
     }
-  }, /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_DownloadMenu.default, {
+  }, /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_DownloadMenu.ChartDownloadMenu, {
     chartRef: chartRef
-  })), /*#__PURE__*/_react2.default.createElement(_.default, _extends({}, props, {
+  })), /*#__PURE__*/_react2.default.createElement(_.ChartAnalytics, _extends({}, props, {
     ref: setChartRef
   })));
 }

package/build/cjs/components/Map/components/MapLayer/components/GoogleEngineLayer/components/EarthEngineLegend.js

@@ -37,13 +37,11 @@ function getLegendsFromParams(params) {
     min,
     max
   } = params;
-  console.log(params);
   const sanitizedPalette = Array.isArray(palette) ? palette : palette.split(",");
   const classes = sanitizedPalette.length;
   const difference = max - min;
   const interval = Math.round(difference / classes);
   const legends = [];
-  console.log(10 / 9);
   for (let i = 0; i < classes; i++) {
     const min = i * interval;
     const max = min + interval;

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

@@ -6,13 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.EarthEngine = void 0;
 var _utils = require("../utils");
 var _lodash = require("lodash");
-var _api = _interopRequireDefault(require("./api"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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; }
+async function importEEModule() {
+  // @ts-ignore
+  if (import.meta.env.STORYBOOK_BUILD === "true") {
+    return await Promise.resolve().then(() => _interopRequireWildcard(require("@google/earthengine")));
+  }
+  return await Promise.resolve().then(() => _interopRequireWildcard(require("./api")));
+}
+const EE = await importEEModule();
+// import EE from "./api"
 // @ts-ignore
-const ee = _api.default;
+const ee = EE;
 // @ts-ignore
 window.ee = ee;
 const FEATURE_STYLE = {

package/build/cjs/components/Map/components/MapLayer/components/LegendArea/index.js

@@ -149,7 +149,6 @@ function Legend(_ref3) {
   };
   const name = (_head3 = (0, _lodash.head)(_react.default.Children.toArray(children))) === null || _head3 === void 0 ? void 0 : _head3.props.name;
   const shouldCollapse = collapsed && !inPrintMode;
-  console.log(inPrintMode);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "w-100"
   }, shouldCollapse ? /*#__PURE__*/_react.default.createElement(CollapsedLegendIcon, {

package/build/es/components/ChartAnalytics/ChartAnalytics.test.js

@@ -2,10 +2,10 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 import { mount } from "@cypress/react";
 import HighCharts from "highcharts";
 import React, { useState } from "react";
-import ChartDownloadMenu from "./components/DownloadMenu";
+import { ChartDownloadMenu } from "./components/DownloadMenu";
 import columnData from "./data/column-data.json";
 import { setupHighchartsModules } from "./services/export";
-import ChartAnalytics from ".";
+import { ChartAnalytics } from ".";
 const props = {
   analytics: columnData,
   config: {

package/build/es/components/Map/components/MapLayer/components/GoogleEngineLayer/components/EarthEngineLegend.js

@@ -27,13 +27,11 @@ function getLegendsFromParams(params) {
     min,
     max
   } = params;
-  console.log(params);
   const sanitizedPalette = Array.isArray(palette) ? palette : palette.split(",");
   const classes = sanitizedPalette.length;
   const difference = max - min;
   const interval = Math.round(difference / classes);
   const legends = [];
-  console.log(10 / 9);
   for (let i = 0; i < classes; i++) {
     const min = i * interval;
     const max = min + interval;

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

@@ -3,16 +3,15 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { combineReducers, getFeatureCollectionProperties, getHistogramStatistics, getInfo, getScale, hasClasses } from "../utils";
 import { find, head, isEmpty } from "lodash";
-
-// async function importEEModule(): Promise<any> {
-//     // @ts-ignore
-//     if (import.meta.env.STORYBOOK_BUILD === "true") {
-//         return await import("@google/earthengine")
-//     }
-//     return await import("./api")
-// }
-// const EE = await importEEModule();
-import EE from "./api";
+async function importEEModule() {
+  // @ts-ignore
+  if (import.meta.env.STORYBOOK_BUILD === "true") {
+    return await import("@google/earthengine");
+  }
+  return await import("./api");
+}
+const EE = await importEEModule();
+// import EE from "./api"
 // @ts-ignore
 const ee = EE;
 // @ts-ignore

package/build/es/components/Map/components/MapLayer/components/LegendArea/index.js

@@ -140,7 +140,6 @@ function Legend(_ref3) {
   };
   const name = (_head3 = head(React.Children.toArray(children))) === null || _head3 === void 0 ? void 0 : _head3.props.name;
   const shouldCollapse = collapsed && !inPrintMode;
-  console.log(inPrintMode);
   return /*#__PURE__*/React.createElement("div", {
     className: "w-100"
   }, shouldCollapse ? /*#__PURE__*/React.createElement(CollapsedLegendIcon, {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "A collection of reusable react components for visualizing analytics data from DHIS2",
   "license": "BSD-3-Clause",
   "scripts": {
-    "build": "d2-app-scripts build --no-verify",
+    "build": "d2-app-scripts build --no-verify --mode production",
     "build:types": "tsc --project tsconfig.build.json",
     "postbuild": "yarn build:types",
     "start": "d2-app-scripts start",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@dhis2/analytics": "^24.4.2",
     "@dhis2/app-runtime": "^3.7.0",
-    "@hisptz/dhis2-ui": "^1.0.30",
-    "@hisptz/dhis2-utils": "^1.0.28",
+    "@hisptz/dhis2-ui": "^1.0.32",
+    "@hisptz/dhis2-utils": "^1.0.32",
     "async-es": "^3.2.4",
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
@@ -75,8 +75,7 @@
     "url": "https://github.com/hisptz/dhis2-utils/issues"
   },
   "peerDependencies": {
-    "lodash": "^4",
-    "react-hook-form": "^7"
+    "lodash": "^4"
   },
-  "gitHead": "895b0edd1d9577a35d73c3b4dd5e8cfb7781ebcf"
+  "gitHead": "d2f7eb0193c2733efbfda7855aa4c7257a832529"
 }

package/build/types/src/dataProviders/map.d.ts

@@ -1,4 +0,0 @@
-import React from "react";
-export default function MapDataProvider({ children }: {
-    children: React.ReactNode;
-}): React.ReactElement;