@hisptz/dhis2-analytics 1.0.49 → 1.0.52

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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "1.0.49",
+  "version": "1.0.52",
   "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.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": "ccddc3de38554d0dbfa00a379cc8bfb6f15af36b"
+  "gitHead": "4212ece071c05d22b32b49fecae2a26a431ebb4c"
 }