@hisptz/dhis2-analytics 2.1.33 → 2.1.35

package/dist/components/Map/components/EarthEngineLayerConfiguration/hooks/data.js

@@ -2,11 +2,11 @@
 
 var hooks = require('../../MapLayer/components/GoogleEngineLayer/hooks');
 var engine_js = require('../../MapLayer/components/GoogleEngineLayer/services/engine.js');
-var reactQuery = require('react-query');
 var react = require('react');
 var reactHookForm = require('react-hook-form');
 var lodash = require('lodash');
 var constants = require('../../MapLayer/components/GoogleEngineLayer/constants');
+var reactQuery = require('@tanstack/react-query');
 
 function useDatasetInfo(shouldRun, config) {
   const { refresh } = hooks.useGoogleEngineToken();
@@ -20,7 +20,11 @@ function useDatasetInfo(shouldRun, config) {
       return engine.getPeriod();
     }
   }
-  const { data, error, isLoading } = reactQuery.useQuery([config], getInfo);
+  const { data, error, isLoading } = reactQuery.useQuery({
+    queryKey: [config],
+    enabled: shouldRun,
+    queryFn: getInfo
+  });
   const periods = react.useMemo(() => {
     const features = data?.features;
     return features?.map((feature) => {

package/dist/components/Map/components/EarthEngineLayerConfiguration/hooks/data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/components/Map/components/EarthEngineLayerConfiguration/hooks/data.ts"],"names":["useGoogleEngineToken","EarthEngine","useQuery","useMemo","useWatch","find","EARTH_ENGINE_LAYERS"],"mappings":";;;;;;;;;;AASO,SAAS,cAAA,CACf,WACA,MAAA,EACC;AACD,EAAA,MAAM,EAAE,OAAA,EAAQ,GAAIA,0BAAA,EAAqB;AAEzC,EAAA,eAAe,OAAA,GAAU;AACxB,IAAA,IAAI,MAAA,EAAQ;AACX,MAAA,MAAM,SAAA,GAAY,MAAM,OAAA,EAAQ;AAChC,MAAA,MAAMC,qBAAA,CAAY,QAAA,CAAS,SAAA,CAAU,KAAA,EAAO,OAAO,CAAA;AACnD,MAAA,MAAM,MAAA,GAAS,IAAIA,qBAAA,CAAY;AAAA,QAC9B,OAAA,EAAS;AAAA,OACT,CAAA;AACD,MAAA,OAAO,OAAO,SAAA,EAAU;AAAA,IACzB;AAAA,EACD;AAEA,EAAA,MAAM,EAAE,MAAM,KAAA,EAAO,SAAA,KAAcC,mBAAA,CAAS,CAAC,MAAM,CAAA,EAAG,OAAO,CAAA;AAE7D,EAAA,MAAM,OAAA,GAAUC,cAAQ,MAAM;AAC7B,IAAA,MAAM,WAAY,IAAA,EAAc,QAAA;AAChC,IAAA,OAAO,QAAA,EAAU,GAAA,CAAI,CAAC,OAAA,KAAiB;AACtC,MAAA,OAAO,IAAI,IAAA;AAAA,QACV,OAAA,EAAS,WAAW,mBAAmB;AAAA,SACrC,WAAA,EAAY;AAAA,IAChB,CAAC,CAAA;AAAA,EACF,CAAA,EAAG,CAAC,IAAI,CAAC,CAAA;AAET,EAAA,OAAO;AAAA,IACN,OAAA,EAAS,SAAA;AAAA,IACT,KAAA;AAAA,IACA;AAAA,GACD;AACD;AAEO,SAAS,OAAA,GAAU;AACzB,EAAA,MAAM,OAAOC,sBAAA,CAAS;AAAA,IACrB,IAAA,EAAM;AAAA,GACN,CAAA;AACD,EAAA,OAAOC,WAAA,CAAKC,6BAAA,EAAqB,CAAC,IAAA,EAAM,IAAI,CAAC,CAAA;AAC9C","file":"data.js","sourcesContent":["import { EarthEngineOptions } from \"../../MapLayer/components/GoogleEngineLayer/interfaces\";\nimport { useGoogleEngineToken } from \"../../MapLayer/components/GoogleEngineLayer/hooks\";\nimport { EarthEngine } from \"../../MapLayer/components/GoogleEngineLayer/services/engine.js\";\nimport { useQuery } from \"react-query\";\nimport { useMemo } from \"react\";\nimport { useWatch } from \"react-hook-form\";\nimport { find } from \"lodash\";\nimport { EARTH_ENGINE_LAYERS } from \"../../MapLayer/components/GoogleEngineLayer/constants\";\n\nexport function useDatasetInfo(\n\tshouldRun: boolean,\n\tconfig?: EarthEngineOptions,\n) {\n\tconst { refresh } = useGoogleEngineToken();\n\n\tasync function getInfo() {\n\t\tif (config) {\n\t\t\tconst tokenData = await refresh();\n\t\t\tawait EarthEngine.setToken(tokenData.token, refresh);\n\t\t\tconst engine = new EarthEngine({\n\t\t\t\toptions: config,\n\t\t\t});\n\t\t\treturn engine.getPeriod();\n\t\t}\n\t}\n\n\tconst { data, error, isLoading } = useQuery([config], getInfo);\n\n\tconst periods = useMemo(() => {\n\t\tconst features = (data as any)?.features;\n\t\treturn features?.map((feature: any) => {\n\t\t\treturn new Date(\n\t\t\t\tfeature?.properties[\"system:time_start\"],\n\t\t\t)?.getFullYear();\n\t\t});\n\t}, [data]);\n\n\treturn {\n\t\tloading: isLoading,\n\t\terror: error as any,\n\t\tperiods,\n\t};\n}\n\nexport function useType() {\n\tconst type = useWatch({\n\t\tname: \"type\",\n\t});\n\treturn find(EARTH_ENGINE_LAYERS, [\"id\", type]);\n}\n"]}
+{"version":3,"sources":["../../../../../../src/components/Map/components/EarthEngineLayerConfiguration/hooks/data.ts"],"names":["useGoogleEngineToken","EarthEngine","useQuery","useMemo","useWatch","find","EARTH_ENGINE_LAYERS"],"mappings":";;;;;;;;;;AASO,SAAS,cAAA,CACf,WACA,MAAA,EACC;AACD,EAAA,MAAM,EAAE,OAAA,EAAQ,GAAIA,0BAAA,EAAqB;AAEzC,EAAA,eAAe,OAAA,GAAU;AACxB,IAAA,IAAI,MAAA,EAAQ;AACX,MAAA,MAAM,SAAA,GAAY,MAAM,OAAA,EAAQ;AAChC,MAAA,MAAMC,qBAAA,CAAY,QAAA,CAAS,SAAA,CAAU,KAAA,EAAO,OAAO,CAAA;AACnD,MAAA,MAAM,MAAA,GAAS,IAAIA,qBAAA,CAAY;AAAA,QAC9B,OAAA,EAAS;AAAA,OACT,CAAA;AACD,MAAA,OAAO,OAAO,SAAA,EAAU;AAAA,IACzB;AAAA,EACD;AAEA,EAAA,MAAM,EAAE,IAAA,EAAM,KAAA,EAAO,SAAA,KAAcC,mBAAA,CAAS;AAAA,IAC3C,QAAA,EAAU,CAAC,MAAM,CAAA;AAAA,IACjB,OAAA,EAAS,SAAA;AAAA,IACT,OAAA,EAAS;AAAA,GACT,CAAA;AAED,EAAA,MAAM,OAAA,GAAUC,cAAQ,MAAM;AAC7B,IAAA,MAAM,WAAY,IAAA,EAAc,QAAA;AAChC,IAAA,OAAO,QAAA,EAAU,GAAA,CAAI,CAAC,OAAA,KAAiB;AACtC,MAAA,OAAO,IAAI,IAAA;AAAA,QACV,OAAA,EAAS,WAAW,mBAAmB;AAAA,SACrC,WAAA,EAAY;AAAA,IAChB,CAAC,CAAA;AAAA,EACF,CAAA,EAAG,CAAC,IAAI,CAAC,CAAA;AAET,EAAA,OAAO;AAAA,IACN,OAAA,EAAS,SAAA;AAAA,IACT,KAAA;AAAA,IACA;AAAA,GACD;AACD;AAEO,SAAS,OAAA,GAAU;AACzB,EAAA,MAAM,OAAOC,sBAAA,CAAS;AAAA,IACrB,IAAA,EAAM;AAAA,GACN,CAAA;AACD,EAAA,OAAOC,WAAA,CAAKC,6BAAA,EAAqB,CAAC,IAAA,EAAM,IAAI,CAAC,CAAA;AAC9C","file":"data.js","sourcesContent":["import { EarthEngineOptions } from \"../../MapLayer/components/GoogleEngineLayer/interfaces\";\nimport { useGoogleEngineToken } from \"../../MapLayer/components/GoogleEngineLayer/hooks\";\nimport { EarthEngine } from \"../../MapLayer/components/GoogleEngineLayer/services/engine.js\";\nimport { useMemo } from \"react\";\nimport { useWatch } from \"react-hook-form\";\nimport { find } from \"lodash\";\nimport { EARTH_ENGINE_LAYERS } from \"../../MapLayer/components/GoogleEngineLayer/constants\";\nimport { useQuery } from \"@tanstack/react-query\";\n\nexport function useDatasetInfo(\n\tshouldRun: boolean,\n\tconfig?: EarthEngineOptions,\n) {\n\tconst { refresh } = useGoogleEngineToken();\n\n\tasync function getInfo() {\n\t\tif (config) {\n\t\t\tconst tokenData = await refresh();\n\t\t\tawait EarthEngine.setToken(tokenData.token, refresh);\n\t\t\tconst engine = new EarthEngine({\n\t\t\t\toptions: config,\n\t\t\t});\n\t\t\treturn engine.getPeriod();\n\t\t}\n\t}\n\n\tconst { data, error, isLoading } = useQuery({\n\t\tqueryKey: [config],\n\t\tenabled: shouldRun,\n\t\tqueryFn: getInfo,\n\t});\n\n\tconst periods = useMemo(() => {\n\t\tconst features = (data as any)?.features;\n\t\treturn features?.map((feature: any) => {\n\t\t\treturn new Date(\n\t\t\t\tfeature?.properties[\"system:time_start\"],\n\t\t\t)?.getFullYear();\n\t\t});\n\t}, [data]);\n\n\treturn {\n\t\tloading: isLoading,\n\t\terror: error as any,\n\t\tperiods,\n\t};\n}\n\nexport function useType() {\n\tconst type = useWatch({\n\t\tname: \"type\",\n\t});\n\treturn find(EARTH_ENGINE_LAYERS, [\"id\", type]);\n}\n"]}

package/dist/esm/components/Map/components/EarthEngineLayerConfiguration/hooks/data.js

@@ -1,10 +1,10 @@
 import { useGoogleEngineToken } from '../../MapLayer/components/GoogleEngineLayer/hooks';
 import { EarthEngine } from '../../MapLayer/components/GoogleEngineLayer/services/engine.js';
-import { useQuery } from 'react-query';
 import { useMemo } from 'react';
 import { useWatch } from 'react-hook-form';
 import { find } from 'lodash';
 import { EARTH_ENGINE_LAYERS } from '../../MapLayer/components/GoogleEngineLayer/constants';
+import { useQuery } from '@tanstack/react-query';
 
 function useDatasetInfo(shouldRun, config) {
   const { refresh } = useGoogleEngineToken();
@@ -18,7 +18,11 @@ function useDatasetInfo(shouldRun, config) {
       return engine.getPeriod();
     }
   }
-  const { data, error, isLoading } = useQuery([config], getInfo);
+  const { data, error, isLoading } = useQuery({
+    queryKey: [config],
+    enabled: shouldRun,
+    queryFn: getInfo
+  });
   const periods = useMemo(() => {
     const features = data?.features;
     return features?.map((feature) => {

package/dist/esm/components/Map/components/EarthEngineLayerConfiguration/hooks/data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/components/Map/components/EarthEngineLayerConfiguration/hooks/data.ts"],"names":[],"mappings":";;;;;;;;AASO,SAAS,cAAA,CACf,WACA,MAAA,EACC;AACD,EAAA,MAAM,EAAE,OAAA,EAAQ,GAAI,oBAAA,EAAqB;AAEzC,EAAA,eAAe,OAAA,GAAU;AACxB,IAAA,IAAI,MAAA,EAAQ;AACX,MAAA,MAAM,SAAA,GAAY,MAAM,OAAA,EAAQ;AAChC,MAAA,MAAM,WAAA,CAAY,QAAA,CAAS,SAAA,CAAU,KAAA,EAAO,OAAO,CAAA;AACnD,MAAA,MAAM,MAAA,GAAS,IAAI,WAAA,CAAY;AAAA,QAC9B,OAAA,EAAS;AAAA,OACT,CAAA;AACD,MAAA,OAAO,OAAO,SAAA,EAAU;AAAA,IACzB;AAAA,EACD;AAEA,EAAA,MAAM,EAAE,MAAM,KAAA,EAAO,SAAA,KAAc,QAAA,CAAS,CAAC,MAAM,CAAA,EAAG,OAAO,CAAA;AAE7D,EAAA,MAAM,OAAA,GAAU,QAAQ,MAAM;AAC7B,IAAA,MAAM,WAAY,IAAA,EAAc,QAAA;AAChC,IAAA,OAAO,QAAA,EAAU,GAAA,CAAI,CAAC,OAAA,KAAiB;AACtC,MAAA,OAAO,IAAI,IAAA;AAAA,QACV,OAAA,EAAS,WAAW,mBAAmB;AAAA,SACrC,WAAA,EAAY;AAAA,IAChB,CAAC,CAAA;AAAA,EACF,CAAA,EAAG,CAAC,IAAI,CAAC,CAAA;AAET,EAAA,OAAO;AAAA,IACN,OAAA,EAAS,SAAA;AAAA,IACT,KAAA;AAAA,IACA;AAAA,GACD;AACD;AAEO,SAAS,OAAA,GAAU;AACzB,EAAA,MAAM,OAAO,QAAA,CAAS;AAAA,IACrB,IAAA,EAAM;AAAA,GACN,CAAA;AACD,EAAA,OAAO,IAAA,CAAK,mBAAA,EAAqB,CAAC,IAAA,EAAM,IAAI,CAAC,CAAA;AAC9C","file":"data.js","sourcesContent":["import { EarthEngineOptions } from \"../../MapLayer/components/GoogleEngineLayer/interfaces\";\nimport { useGoogleEngineToken } from \"../../MapLayer/components/GoogleEngineLayer/hooks\";\nimport { EarthEngine } from \"../../MapLayer/components/GoogleEngineLayer/services/engine.js\";\nimport { useQuery } from \"react-query\";\nimport { useMemo } from \"react\";\nimport { useWatch } from \"react-hook-form\";\nimport { find } from \"lodash\";\nimport { EARTH_ENGINE_LAYERS } from \"../../MapLayer/components/GoogleEngineLayer/constants\";\n\nexport function useDatasetInfo(\n\tshouldRun: boolean,\n\tconfig?: EarthEngineOptions,\n) {\n\tconst { refresh } = useGoogleEngineToken();\n\n\tasync function getInfo() {\n\t\tif (config) {\n\t\t\tconst tokenData = await refresh();\n\t\t\tawait EarthEngine.setToken(tokenData.token, refresh);\n\t\t\tconst engine = new EarthEngine({\n\t\t\t\toptions: config,\n\t\t\t});\n\t\t\treturn engine.getPeriod();\n\t\t}\n\t}\n\n\tconst { data, error, isLoading } = useQuery([config], getInfo);\n\n\tconst periods = useMemo(() => {\n\t\tconst features = (data as any)?.features;\n\t\treturn features?.map((feature: any) => {\n\t\t\treturn new Date(\n\t\t\t\tfeature?.properties[\"system:time_start\"],\n\t\t\t)?.getFullYear();\n\t\t});\n\t}, [data]);\n\n\treturn {\n\t\tloading: isLoading,\n\t\terror: error as any,\n\t\tperiods,\n\t};\n}\n\nexport function useType() {\n\tconst type = useWatch({\n\t\tname: \"type\",\n\t});\n\treturn find(EARTH_ENGINE_LAYERS, [\"id\", type]);\n}\n"]}
+{"version":3,"sources":["../../../../../../../src/components/Map/components/EarthEngineLayerConfiguration/hooks/data.ts"],"names":[],"mappings":";;;;;;;;AASO,SAAS,cAAA,CACf,WACA,MAAA,EACC;AACD,EAAA,MAAM,EAAE,OAAA,EAAQ,GAAI,oBAAA,EAAqB;AAEzC,EAAA,eAAe,OAAA,GAAU;AACxB,IAAA,IAAI,MAAA,EAAQ;AACX,MAAA,MAAM,SAAA,GAAY,MAAM,OAAA,EAAQ;AAChC,MAAA,MAAM,WAAA,CAAY,QAAA,CAAS,SAAA,CAAU,KAAA,EAAO,OAAO,CAAA;AACnD,MAAA,MAAM,MAAA,GAAS,IAAI,WAAA,CAAY;AAAA,QAC9B,OAAA,EAAS;AAAA,OACT,CAAA;AACD,MAAA,OAAO,OAAO,SAAA,EAAU;AAAA,IACzB;AAAA,EACD;AAEA,EAAA,MAAM,EAAE,IAAA,EAAM,KAAA,EAAO,SAAA,KAAc,QAAA,CAAS;AAAA,IAC3C,QAAA,EAAU,CAAC,MAAM,CAAA;AAAA,IACjB,OAAA,EAAS,SAAA;AAAA,IACT,OAAA,EAAS;AAAA,GACT,CAAA;AAED,EAAA,MAAM,OAAA,GAAU,QAAQ,MAAM;AAC7B,IAAA,MAAM,WAAY,IAAA,EAAc,QAAA;AAChC,IAAA,OAAO,QAAA,EAAU,GAAA,CAAI,CAAC,OAAA,KAAiB;AACtC,MAAA,OAAO,IAAI,IAAA;AAAA,QACV,OAAA,EAAS,WAAW,mBAAmB;AAAA,SACrC,WAAA,EAAY;AAAA,IAChB,CAAC,CAAA;AAAA,EACF,CAAA,EAAG,CAAC,IAAI,CAAC,CAAA;AAET,EAAA,OAAO;AAAA,IACN,OAAA,EAAS,SAAA;AAAA,IACT,KAAA;AAAA,IACA;AAAA,GACD;AACD;AAEO,SAAS,OAAA,GAAU;AACzB,EAAA,MAAM,OAAO,QAAA,CAAS;AAAA,IACrB,IAAA,EAAM;AAAA,GACN,CAAA;AACD,EAAA,OAAO,IAAA,CAAK,mBAAA,EAAqB,CAAC,IAAA,EAAM,IAAI,CAAC,CAAA;AAC9C","file":"data.js","sourcesContent":["import { EarthEngineOptions } from \"../../MapLayer/components/GoogleEngineLayer/interfaces\";\nimport { useGoogleEngineToken } from \"../../MapLayer/components/GoogleEngineLayer/hooks\";\nimport { EarthEngine } from \"../../MapLayer/components/GoogleEngineLayer/services/engine.js\";\nimport { useMemo } from \"react\";\nimport { useWatch } from \"react-hook-form\";\nimport { find } from \"lodash\";\nimport { EARTH_ENGINE_LAYERS } from \"../../MapLayer/components/GoogleEngineLayer/constants\";\nimport { useQuery } from \"@tanstack/react-query\";\n\nexport function useDatasetInfo(\n\tshouldRun: boolean,\n\tconfig?: EarthEngineOptions,\n) {\n\tconst { refresh } = useGoogleEngineToken();\n\n\tasync function getInfo() {\n\t\tif (config) {\n\t\t\tconst tokenData = await refresh();\n\t\t\tawait EarthEngine.setToken(tokenData.token, refresh);\n\t\t\tconst engine = new EarthEngine({\n\t\t\t\toptions: config,\n\t\t\t});\n\t\t\treturn engine.getPeriod();\n\t\t}\n\t}\n\n\tconst { data, error, isLoading } = useQuery({\n\t\tqueryKey: [config],\n\t\tenabled: shouldRun,\n\t\tqueryFn: getInfo,\n\t});\n\n\tconst periods = useMemo(() => {\n\t\tconst features = (data as any)?.features;\n\t\treturn features?.map((feature: any) => {\n\t\t\treturn new Date(\n\t\t\t\tfeature?.properties[\"system:time_start\"],\n\t\t\t)?.getFullYear();\n\t\t});\n\t}, [data]);\n\n\treturn {\n\t\tloading: isLoading,\n\t\terror: error as any,\n\t\tperiods,\n\t};\n}\n\nexport function useType() {\n\tconst type = useWatch({\n\t\tname: \"type\",\n\t});\n\treturn find(EARTH_ENGINE_LAYERS, [\"id\", type]);\n}\n"]}

package/dist/types/components/Map/components/EarthEngineLayerConfiguration/hooks/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/Map/components/EarthEngineLayerConfiguration/hooks/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAS5F,wBAAgB,cAAc,CAC7B,SAAS,EAAE,OAAO,EAClB,MAAM,CAAC,EAAE,kBAAkB;;WA4BV,GAAG;;EAGpB;AAED,wBAAgB,OAAO,mCAKtB"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/Map/components/EarthEngineLayerConfiguration/hooks/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAS5F,wBAAgB,cAAc,CAC7B,SAAS,EAAE,OAAO,EAClB,MAAM,CAAC,EAAE,kBAAkB;;WAgCV,GAAG;;EAGpB;AAED,wBAAgB,OAAO,mCAKtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "2.1.33",
+  "version": "2.1.35",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -17,7 +17,7 @@
     "package.json"
   ],
   "devDependencies": {
-    "@dhis2/app-runtime": "^3.14.5",
+    "@dhis2/app-runtime": "^3.16.0",
     "@dhis2/d2-i18n": "^1.1.3",
     "@dhis2/ui": "^10.9.1",
     "@google/earthengine": "^1.5.21",
@@ -44,7 +44,6 @@
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.12",
     "react-hook-form": "^7.43.9",
-    "react-query": "^3.39.3",
     "styled-jsx": "^5.1.2",
     "tsup": "^8.4.0",
     "typescript": "^5.3.3",
@@ -77,10 +76,11 @@
     "react-to-print": "^3.0.1",
     "screenfull": "^6.0.2",
     "xlsx": "^0.18.5",
-    "@hisptz/dhis2-utils": "2.0.19",
-    "@hisptz/dhis2-ui": "2.0.51"
+    "@hisptz/dhis2-ui": "2.0.52",
+    "@hisptz/dhis2-utils": "2.0.19"
   },
   "peerDependencies": {
+    "@dhis2/app-runtime": "^3",
     "classnames": "^2",
     "highcharts": "^12",
     "highcharts-react-official": "^3",
@@ -88,7 +88,11 @@
     "zod": "^3"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "url": "https://github.com/hisptz/dhis2-utils"
   },
   "scripts": {
     "build": "tsup && tsc",