@hisptz/dhis2-analytics 1.0.49 → 1.0.51

package/.gitignore

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

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

@@ -4,7 +4,7 @@ var _react = require("@cypress/react");
 var _highcharts = _interopRequireDefault(require("highcharts"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _DownloadMenu = require("./components/DownloadMenu");
-var _columnData = _interopRequireDefault(require("./data/column-data.json"));
+var _columnData = _interopRequireDefault(require("../../../../../resources/analytics/column-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); }

package/build/cjs/components/ChartAnalytics/models/bar.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DHIS2StackedBarChart = exports.DHIS2BarChart = void 0;
+var _column = require("./column");
+class DHIS2BarChart extends _column.DHIS2ColumnChart {
+  getHighchartsType() {
+    return "bar";
+  }
+}
+exports.DHIS2BarChart = DHIS2BarChart;
+class DHIS2StackedBarChart extends DHIS2BarChart {
+  getPlotOptions() {
+    return {
+      column: {
+        stacking: "normal",
+        ...super.getPlotOptions().column
+      }
+    };
+  }
+}
+exports.DHIS2StackedBarChart = DHIS2StackedBarChart;

package/build/cjs/components/ChartAnalytics/utils/chart.js

@@ -14,6 +14,7 @@ var _column = require("../models/column");
 var _line = require("../models/line");
 var _multiSeries = require("../models/multi-series");
 var _pie = require("../models/pie");
+var _bar = require("../models/bar");
 function getDimensionHeaderIndex(headers, name) {
   return (0, _lodash.findIndex)(headers, {
     name
@@ -119,6 +120,10 @@ function getChartInstance(id, analytics, config) {
   switch (config.type) {
     case "column":
       return new _column.DHIS2ColumnChart(id, analytics, config);
+    case "bar":
+      return new _bar.DHIS2BarChart(id, analytics, config);
+    case "stacked-bar":
+      return new _bar.DHIS2StackedBarChart(id, analytics, config);
     case "stacked-column":
       return new _column.DHIS2StackedColumnChart(id, analytics, config);
     case "pie":

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

@@ -3,7 +3,7 @@ import { mount } from "@cypress/react";
 import HighCharts from "highcharts";
 import React, { useState } from "react";
 import { ChartDownloadMenu } from "./components/DownloadMenu";
-import columnData from "./data/column-data.json";
+import columnData from "../../../../../resources/analytics/column-data.json";
 import { setupHighchartsModules } from "./services/export";
 import { ChartAnalytics } from ".";
 const props = {

package/build/es/components/ChartAnalytics/models/bar.js

@@ -0,0 +1,16 @@
+import { DHIS2ColumnChart } from "./column";
+export class DHIS2BarChart extends DHIS2ColumnChart {
+  getHighchartsType() {
+    return "bar";
+  }
+}
+export class DHIS2StackedBarChart extends DHIS2BarChart {
+  getPlotOptions() {
+    return {
+      column: {
+        stacking: "normal",
+        ...super.getPlotOptions().column
+      }
+    };
+  }
+}

package/build/es/components/ChartAnalytics/utils/chart.js

@@ -3,6 +3,7 @@ import { DHIS2ColumnChart, DHIS2StackedColumnChart } from "../models/column";
 import { DHIS2LineChart } from "../models/line";
 import { DHIS2MultiSeriesChart } from "../models/multi-series";
 import { DHIS2PieChart } from "../models/pie";
+import { DHIS2BarChart, DHIS2StackedBarChart } from "../models/bar";
 export function getDimensionHeaderIndex(headers, name) {
   return findIndex(headers, {
     name
@@ -108,6 +109,10 @@ export function getChartInstance(id, analytics, config) {
   switch (config.type) {
     case "column":
       return new DHIS2ColumnChart(id, analytics, config);
+    case "bar":
+      return new DHIS2BarChart(id, analytics, config);
+    case "stacked-bar":
+      return new DHIS2StackedBarChart(id, analytics, config);
     case "stacked-column":
       return new DHIS2StackedColumnChart(id, analytics, config);
     case "pie":

package/build/types/components/ChartAnalytics/models/bar.d.ts

@@ -0,0 +1,8 @@
+import { PlotOptions } from "highcharts";
+import { DHIS2ColumnChart } from "./column";
+export declare class DHIS2BarChart extends DHIS2ColumnChart {
+    getHighchartsType(): string;
+}
+export declare class DHIS2StackedBarChart extends DHIS2BarChart {
+    getPlotOptions(): PlotOptions;
+}

package/build/types/components/ChartAnalytics/types/props.d.ts

@@ -1,6 +1,6 @@
 import type { Analytics } from "@hisptz/dhis2-utils";
 import HighCharts, { DashStyleValue, YAxisOptions, YAxisPlotLinesLabelOptions } from "highcharts";
-export type ChartType = "column" | "pie" | "stacked-column" | "line" | "multi-series";
+export type ChartType = "column" | "pie" | "stacked-column" | "line" | "multi-series" | "bar" | "stacked-bar";
 export interface MultiSeriesConfig {
     series?: Array<{
         id: string;

package/d2.config.js

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

package/i18n/en.pot

@@ -0,0 +1,439 @@
+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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "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 --mode production",
+    "start": "d2-app-scripts build --no-verify --mode development --watch",
     "build:types": "tsc --project tsconfig.build.json",
     "postbuild": "yarn build:types",
-    "start": "d2-app-scripts start",
     "test": "d2-app-scripts test --passWithNoTests",
     "deploy": "d2-app-scripts deploy",
     "publish:analytics": "yarn publish --access public"
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@dhis2/app-runtime": "^3.7.0",
-    "@hisptz/dhis2-ui": "^1.0.49",
-    "@hisptz/dhis2-utils": "*",
+    "@hisptz/dhis2-ui": "^1.0.51",
+    "@hisptz/dhis2-utils": "^1.0.51",
     "@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": "ccddc3de38554d0dbfa00a379cc8bfb6f15af36b"
+  "gitHead": "c11c14562cbb2228c2d3f9a917bf0cdbb4d25b29"
 }

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

@@ -0,0 +1,51 @@
+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 />);
+  });
+});