d2-charts-api - npm Package Compare versions

Comparing version 32.0.1 to 32.0.2

lib/config/adapters/dhis_highcharts/series/index.js

@@ -68,30 +68,7 @@ 'use strict';
 
-// returns:
-// {
-//     id1: 'color1',
-//     id2: 'color2',
-//     id3: 'color3',
-// };
 function getIdColorMap(seriesItems, series, layout, extraOptions) {
-    if ((0, _seriesItems.hasExtraAxis)(seriesItems) && (0, _type.isDualAxis)(layout.type)) {
-        // {
-        //     0: ['id1', 'id2', 'id3'],
-        //     1: ['id4', 'id5'],
-        // };
+    if ((0, _seriesItems.hasExtraAxisItems)(seriesItems, layout.columns) && (0, _type.isDualAxis)(layout.type)) {
         var axisIdsMap = (0, _seriesItems.getAxisIdsMap)(seriesItems, series);
-        // {
-        //     0: {
-        //         startColor: '#3f6a92',
-        //         endColor: '#6cb8ff'
-        //     },
-        //     1: {
-        //         startColor: '#9e3640',
-        //         endColor: '#ff5666',
-        //     },
-        // };
         var theme = extraOptions.multiAxisTheme;
-        // {
-        //     0: ['color1', 'color2', 'color3'],
-        //     1: ['color4', 'color5'],
-        // };
+
         var colorsByAxis = Object.keys(axisIdsMap).reduce(function (map, axis) {
@@ -98,0 +75,0 @@ var numberOfIds = axisIdsMap[axis].length;

lib/config/adapters/dhis_highcharts/yAxis/index.js

@@ -116,3 +116,3 @@ 'use strict';
 
-    if ((0, _type.isDualAxis)(layout.type) && (0, _seriesItems.hasExtraAxis)(layout.seriesItems) && (0, _seriesItems.hasExtraAxisItems)(layout.seriesItems, layout.columns)) {
+    if ((0, _type.isDualAxis)(layout.type) && (0, _seriesItems.hasExtraAxisItems)(layout.seriesItems, layout.columns)) {
         axes.push({
@@ -119,0 +119,0 @@ title: {

package.json

 {
   "name": "d2-charts-api",
-  "version": "32.0.1",
+  "version": "32.0.2",
   "description": "DHIS2 charts api",
@@ -5,0 +5,0 @@ "main": "index.js",

src/config/adapters/dhis_highcharts/series/index.js

@@ -6,3 +6,3 @@ import getCumulativeData from './../getCumulativeData';
 import { CHART_TYPE_PIE, CHART_TYPE_GAUGE } from '../type';
-import { getFullIdAxisMap, getAxisIdsMap, hasExtraAxis } from '../seriesItems';
+import { getFullIdAxisMap, getAxisIdsMap, hasExtraAxisItems } from '../seriesItems';
 import { generateColors } from '../../../../util/colors/gradientColorGenerator';
@@ -27,30 +27,7 @@
 
-// returns:
-// {
-//     id1: 'color1',
-//     id2: 'color2',
-//     id3: 'color3',
-// };
 function getIdColorMap(seriesItems, series, layout, extraOptions) {
-    if (hasExtraAxis(seriesItems) && isDualAxis(layout.type)) {
-        // {
-        //     0: ['id1', 'id2', 'id3'],
-        //     1: ['id4', 'id5'],
-        // };
+    if (hasExtraAxisItems(seriesItems, layout.columns) && isDualAxis(layout.type)) {
         const axisIdsMap = getAxisIdsMap(seriesItems, series);
-        // {
-        //     0: {
-        //         startColor: '#3f6a92',
-        //         endColor: '#6cb8ff'
-        //     },
-        //     1: {
-        //         startColor: '#9e3640',
-        //         endColor: '#ff5666',
-        //     },
-        // };
         const theme = extraOptions.multiAxisTheme;
-        // {
-        //     0: ['color1', 'color2', 'color3'],
-        //     1: ['color4', 'color5'],
-        // };
+
         const colorsByAxis = Object.keys(axisIdsMap).reduce((map, axis) => {
@@ -57,0 +34,0 @@ const numberOfIds = axisIdsMap[axis].length;

src/config/adapters/dhis_highcharts/yAxis/index.js

@@ -9,3 +9,3 @@ import arrayClean from 'd2-utilizr/lib/arrayClean';
 import { getIsStacked } from '../type';
-import { hasExtraAxis, hasExtraAxisItems } from '../seriesItems';
+import { hasExtraAxisItems } from '../seriesItems';
 
@@ -92,3 +92,2 @@ const DEFAULT_MIN_VALUE = 0;
     if (isDualAxis(layout.type) &&
-        hasExtraAxis(layout.seriesItems) &&
         hasExtraAxisItems(layout.seriesItems, layout.columns)) {
@@ -95,0 +94,0 @@ axes.push({

No alert changes

Worsened metrics

Total package byte prevSize

334902

decreased by-0.58%

Lines of code

3884

decreased by-1.25%

No dependency changes