@hisptz/dhis2-analytics 1.0.51 → 1.0.52

package/LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2022, HISP Tanzania
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "A collection of reusable react components for visualizing analytics data from DHIS2",
   "license": "BSD-3-Clause",
   "scripts": {
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@dhis2/app-runtime": "^3.7.0",
-    "@hisptz/dhis2-ui": "^1.0.51",
-    "@hisptz/dhis2-utils": "^1.0.51",
+    "@hisptz/dhis2-ui": "^1.0.52",
+    "@hisptz/dhis2-utils": "^1.0.52",
     "@react-leaflet/core": "^2.1.0",
     "async-es": "^3.2.4",
     "d3-color": "^3.1.0",
@@ -87,5 +87,5 @@
     "react-hook-form": "^7.43",
     "recoil": "*"
   },
-  "gitHead": "c11c14562cbb2228c2d3f9a917bf0cdbb4d25b29"
+  "gitHead": "4212ece071c05d22b32b49fecae2a26a431ebb4c"
 }

package/.gitignore

@@ -1,5 +0,0 @@
-# DHIS2 Platform
-node_modules
-.d2
-src/locales
-build

package/d2.config.js

@@ -1,8 +0,0 @@
-const config = {
-    type: 'lib',
-    entryPoints: {
-        lib: './src/index.ts',
-    },
-}
-
-module.exports = config

package/i18n/en.pot

@@ -1,439 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: i18next-conv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-05-05T07:58:47.325Z\n"
-"PO-Revision-Date: 2023-05-05T07:58:47.325Z\n"
-
-msgid "Download PNG"
-msgstr "Download PNG"
-
-msgid "Download JPEG"
-msgstr "Download JPEG"
-
-msgid "Download SVG"
-msgstr "Download SVG"
-
-msgid "Download PDF"
-msgstr "Download PDF"
-
-msgid "View as table"
-msgstr "View as table"
-
-msgid "View full screen"
-msgstr "View full screen"
-
-msgid "Submit"
-msgstr "Submit"
-
-msgid "Aggregation"
-msgstr "Aggregation"
-
-msgid "Aggregations"
-msgstr "Aggregations"
-
-msgid "Period is required"
-msgstr "Period is required"
-
-msgid "Available periods are set by the source data"
-msgstr "Available periods are set by the source data"
-
-msgid "Period"
-msgstr "Period"
-
-msgid "Min"
-msgstr "Min"
-
-msgid "Max"
-msgstr "Max"
-
-msgid "Steps"
-msgstr "Steps"
-
-msgid "Colors"
-msgstr "Colors"
-
-msgid "Unit"
-msgstr "Unit"
-
-msgid "Name is required"
-msgstr "Name is required"
-
-msgid "Layer name"
-msgstr "Layer name"
-
-msgid "Type is required"
-msgstr "Type is required"
-
-msgid "Layer type"
-msgstr "Layer type"
-
-msgid "Configure Earth Engine Layer"
-msgstr "Configure Earth Engine Layer"
-
-msgid "Cancel"
-msgstr "Cancel"
-
-msgid "Save"
-msgstr "Save"
-
-msgid "Boundaries"
-msgstr "Boundaries"
-
-msgid "Source"
-msgstr "Source"
-
-msgid "Population"
-msgstr "Population"
-
-msgid "people per hectare"
-msgstr "people per hectare"
-
-msgid "Estimated number of people living in an area."
-msgstr "Estimated number of people living in an area."
-
-msgid "Population age groups"
-msgstr "Population age groups"
-
-msgid "Estimated number of people living in an area, grouped by age and gender."
-msgstr "Estimated number of people living in an area, grouped by age and gender."
-
-msgid "Male 0 - 1 years"
-msgstr "Male 0 - 1 years"
-
-msgid "Male 1 - 4 years"
-msgstr "Male 1 - 4 years"
-
-msgid "Male 5 - 9 years"
-msgstr "Male 5 - 9 years"
-
-msgid "Male 10 - 14 years"
-msgstr "Male 10 - 14 years"
-
-msgid "Male 15 - 19 years"
-msgstr "Male 15 - 19 years"
-
-msgid "Male 20 - 24 years"
-msgstr "Male 20 - 24 years"
-
-msgid "Male 25 - 29 years"
-msgstr "Male 25 - 29 years"
-
-msgid "Male 30 - 34 years"
-msgstr "Male 30 - 34 years"
-
-msgid "Male 35 - 39 years"
-msgstr "Male 35 - 39 years"
-
-msgid "Male 40 - 44 years"
-msgstr "Male 40 - 44 years"
-
-msgid "Male 45 - 49 years"
-msgstr "Male 45 - 49 years"
-
-msgid "Male 50 - 54 years"
-msgstr "Male 50 - 54 years"
-
-msgid "Male 55 - 59 years"
-msgstr "Male 55 - 59 years"
-
-msgid "Male 60 - 64 years"
-msgstr "Male 60 - 64 years"
-
-msgid "Male 65 - 69 years"
-msgstr "Male 65 - 69 years"
-
-msgid "Male 70 - 74 years"
-msgstr "Male 70 - 74 years"
-
-msgid "Male 75 - 79 years"
-msgstr "Male 75 - 79 years"
-
-msgid "Male 80 years and above"
-msgstr "Male 80 years and above"
-
-msgid "Female 0 - 1 years"
-msgstr "Female 0 - 1 years"
-
-msgid "Female 1 - 4 years"
-msgstr "Female 1 - 4 years"
-
-msgid "Female 5 - 9 years"
-msgstr "Female 5 - 9 years"
-
-msgid "Female 10 - 14 years"
-msgstr "Female 10 - 14 years"
-
-msgid "Female 15 - 19 years"
-msgstr "Female 15 - 19 years"
-
-msgid "Female 20 - 24 years"
-msgstr "Female 20 - 24 years"
-
-msgid "Female 25 - 29 years"
-msgstr "Female 25 - 29 years"
-
-msgid "Female 30 - 34 years"
-msgstr "Female 30 - 34 years"
-
-msgid "Female 35 - 39 years"
-msgstr "Female 35 - 39 years"
-
-msgid "Female 40 - 44 years"
-msgstr "Female 40 - 44 years"
-
-msgid "Female 45 - 49 years"
-msgstr "Female 45 - 49 years"
-
-msgid "Female 50 - 54 years"
-msgstr "Female 50 - 54 years"
-
-msgid "Female 55 - 59 years"
-msgstr "Female 55 - 59 years"
-
-msgid "Female 60 - 64 years"
-msgstr "Female 60 - 64 years"
-
-msgid "Female 65 - 69 years"
-msgstr "Female 65 - 69 years"
-
-msgid "Female 70 - 74 years"
-msgstr "Female 70 - 74 years"
-
-msgid "Female 75 - 79 years"
-msgstr "Female 75 - 79 years"
-
-msgid "Female 80 years and above"
-msgstr "Female 80 years and above"
-
-msgid "Building footprints"
-msgstr "Building footprints"
-
-msgid "Number of buildings"
-msgstr "Number of buildings"
-
-msgid ""
-"The outlines of buildings derived from high-resolution satellite imagery. "
-"Only for the continent of Africa."
-msgstr ""
-"The outlines of buildings derived from high-resolution satellite imagery. "
-"Only for the continent of Africa."
-
-msgid "Building counts are only available for smaller organisation unit areas."
-msgstr "Building counts are only available for smaller organisation unit areas."
-
-msgid ""
-"Select a smaller area or single organization unit to see the count of "
-"buildings."
-msgstr ""
-"Select a smaller area or single organization unit to see the count of "
-"buildings."
-
-msgid "Elevation"
-msgstr "Elevation"
-
-msgid "meters"
-msgstr "meters"
-
-msgid "Elevation above sea-level."
-msgstr "Elevation above sea-level."
-
-msgid "Precipitation"
-msgstr "Precipitation"
-
-msgid "millimeter"
-msgstr "millimeter"
-
-msgid ""
-"Precipitation collected from satellite and weather stations on the ground. "
-"The values are in millimeters within 5 days periods. Updated monthly, "
-"during the 3rd week of the following month."
-msgstr ""
-"Precipitation collected from satellite and weather stations on the ground. "
-"The values are in millimeters within 5 days periods. Updated monthly, "
-"during the 3rd week of the following month."
-
-msgid "Temperature"
-msgstr "Temperature"
-
-msgid "°C during daytime"
-msgstr "°C during daytime"
-
-msgid ""
-"Land surface temperatures collected from satellite. Blank spots will appear "
-"in areas with a persistent cloud cover."
-msgstr ""
-"Land surface temperatures collected from satellite. Blank spots will appear "
-"in areas with a persistent cloud cover."
-
-msgid "Landcover"
-msgstr "Landcover"
-
-msgid "Distinct landcover types collected from satellites."
-msgstr "Distinct landcover types collected from satellites."
-
-msgid "Evergreen Needleleaf forest"
-msgstr "Evergreen Needleleaf forest"
-
-msgid "Evergreen Broadleaf forest"
-msgstr "Evergreen Broadleaf forest"
-
-msgid "Deciduous Needleleaf forest"
-msgstr "Deciduous Needleleaf forest"
-
-msgid "Deciduous Broadleaf forest"
-msgstr "Deciduous Broadleaf forest"
-
-msgid "Mixed forest"
-msgstr "Mixed forest"
-
-msgid "Closed shrublands"
-msgstr "Closed shrublands"
-
-msgid "Open shrublands"
-msgstr "Open shrublands"
-
-msgid "Woody savannas"
-msgstr "Woody savannas"
-
-msgid "Savannas"
-msgstr "Savannas"
-
-msgid "Grasslands"
-msgstr "Grasslands"
-
-msgid "Permanent wetlands"
-msgstr "Permanent wetlands"
-
-msgid "Croplands"
-msgstr "Croplands"
-
-msgid "Urban and built-up"
-msgstr "Urban and built-up"
-
-msgid "Cropland/Natural vegetation mosaic"
-msgstr "Cropland/Natural vegetation mosaic"
-
-msgid "Snow and ice"
-msgstr "Snow and ice"
-
-msgid "Barren or sparsely vegetated"
-msgstr "Barren or sparsely vegetated"
-
-msgid "Water"
-msgstr "Water"
-
-msgid "Nighttime lights"
-msgstr "Nighttime lights"
-
-msgid "light intensity"
-msgstr "light intensity"
-
-msgid ""
-"Light intensity from cities, towns, and other sites with persistent "
-"lighting, including gas flares."
-msgstr ""
-"Light intensity from cities, towns, and other sites with persistent "
-"lighting, including gas flares."
-
-msgid "Could not get aggregate data"
-msgstr "Could not get aggregate data"
-
-msgid "Points"
-msgstr "Points"
-
-msgid "Mid"
-msgstr "Mid"
-
-msgid "Value"
-msgstr "Value"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "Classes"
-msgstr "Classes"
-
-msgid "Select Data Item"
-msgstr "Select Data Item"
-
-msgid "Update"
-msgstr "Update"
-
-msgid "Legend set"
-msgstr "Legend set"
-
-msgid "Please wait..."
-msgstr "Please wait..."
-
-msgid "Layer type is required"
-msgstr "Layer type is required"
-
-msgid "Choropleth"
-msgstr "Choropleth"
-
-msgid "Bubble"
-msgstr "Bubble"
-
-msgid "A data item is required"
-msgstr "A data item is required"
-
-msgid "Data Item"
-msgstr "Data Item"
-
-msgid "Change"
-msgstr "Change"
-
-msgid "Select"
-msgstr "Select"
-
-msgid "Legend"
-msgstr "Legend"
-
-msgid "Custom legend"
-msgstr "Custom legend"
-
-msgid "Legend set is required"
-msgstr "Legend set is required"
-
-msgid "Radius"
-msgstr "Radius"
-
-msgid "Configure Thematic Layer"
-msgstr "Configure Thematic Layer"
-
-msgid "Loading ..."
-msgstr "Loading ..."
-
-msgid "Select location(s)"
-msgstr "Select location(s)"
-
-msgid "Location"
-msgstr "Location"
-
-msgid "Organisation unit"
-msgstr "Organisation unit"
-
-msgid "Data"
-msgstr "Data"
-
-msgid "Pivot table"
-msgstr "Pivot table"
-
-msgid "Chart"
-msgstr "Chart"
-
-msgid "Map"
-msgstr "Map"
-
-msgid "View as {{type}}"
-msgstr "View as {{type}}"
-
-msgid "Could not load visualization"
-msgstr "Could not load visualization"
-
-msgid "Try again"
-msgstr "Try again"

package/src/components/ChartAnalytics/ChartAnalytics.test.tsx

@@ -1,51 +0,0 @@
-import {mount} from "@cypress/react";
-import HighCharts from "highcharts";
-import HighchartsReact from "highcharts-react-official";
-import React, {useState} from "react";
-import {ChartDownloadMenu} from "./components/DownloadMenu";
-import columnData from "../../../../../resources/analytics/column-data.json";
-import {setupHighchartsModules} from "./services/export";
-import {ChartAnalytics} from ".";
-
-const props: any = {
-  analytics: columnData as any,
-  config: {
-    layout: {
-      series: ["dx"],
-      category: ["ou"],
-      filter: ["pe"],
-    },
-    type: "column",
-    height: 500,
-    colors: ["#2f7ed8", "#0d233a", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"],
-  },
-};
-
-function TestComponent() {
-  return <ChartAnalytics {...props} />;
-}
-
-function ExportTestComponent() {
-  const [chartRef, setChartRef] = useState<HighchartsReact.RefObject | null>(null);
-
-  return (
-    <div style={{ display: "flex", flexDirection: "column" }}>
-      <div>
-        <ChartDownloadMenu chartRef={chartRef} />
-      </div>
-      <ChartAnalytics {...props} ref={setChartRef} />
-    </div>
-  );
-}
-
-describe("Chart Component Tests", () => {
-  setupHighchartsModules(HighCharts);
-
-  it("Mounts without errors", () => {
-    mount(<TestComponent />);
-  });
-
-  it("Can be exported as PDF", () => {
-    mount(<ExportTestComponent />);
-  });
-});

package/src/components/ChartAnalytics/components/DownloadMenu/components/Menu.tsx

@@ -1,48 +0,0 @@
-import {FlyoutMenu, Menu, MenuDivider, MenuItem, Popover} from "@dhis2/ui";
-import {isEmpty, map} from "lodash";
-import React from "react";
-import {chartMenuSections} from "../constants/menu";
-import {ChartExportMenuItem} from "../interfaces/menu";
-
-export function ChartMenu({
-  menuRef,
-  onClick,
-  onClose,
-  exclude = [],
-}: {
-  menuRef: HTMLDivElement;
-  onClick: (action: string) => void;
-  onClose: () => void;
-  exclude?: ChartExportMenuItem[];
-}) {
-  const onMenuClick = (action: string) => () => {
-    onClick(action);
-    onClose();
-  };
-
-  const menuSections = map(chartMenuSections, (section) => {
-    return {
-      ...section,
-      menuItems: section.menuItems.filter((item: any) => !exclude.includes(item.name)),
-    };
-  }).filter((section) => !isEmpty(section.menuItems));
-
-  return (
-    <Popover onClickOutside={onClose} onClose={onClose} reference={menuRef}>
-      <FlyoutMenu>
-        <Menu>
-          {menuSections?.map((section, index) => {
-            return (
-              <>
-                {section.menuItems?.map(({ name, label }) => {
-                  return <MenuItem key={`${name}-menu-item`} dataTest={`download-${name}`} label={label} onClick={onMenuClick(name)} />;
-                })}
-                {index !== menuSections.length - 1 && <MenuDivider />}
-              </>
-            );
-          })}
-        </Menu>
-      </FlyoutMenu>
-    </Popover>
-  );
-}

package/src/components/ChartAnalytics/components/DownloadMenu/constants/menu.ts

@@ -1,38 +0,0 @@
-import i18n from "@dhis2/d2-i18n";
-
-export const chartMenuSections = [
-  {
-    name: "download",
-    menuItems: [
-      {
-        name: "png",
-        label: i18n.t("Download PNG"),
-      },
-      {
-        name: "jpeg",
-        label: i18n.t("Download JPEG"),
-      },
-      {
-        name: "svg",
-        label: i18n.t("Download SVG"),
-      },
-      {
-        name: "pdf",
-        label: i18n.t("Download PDF"),
-      },
-    ],
-  },
-  {
-    name: "view",
-    menuItems: [
-      {
-        name: "table",
-        label: i18n.t("View as table"),
-      },
-      {
-        name: "full-screen",
-        label: i18n.t("View full screen"),
-      },
-    ],
-  },
-];