@dhis2/analytics 26.8.6 → 26.9.0

package/build/es/visualizations/config/adapters/dhis_highcharts/title/index.js

@@ -1,9 +1,10 @@
 import isString from 'd2-utilizr/lib/isString';
-import { FONT_STYLE_OPTION_ITALIC, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_TEXT_ALIGN, FONT_STYLE_VISUALIZATION_TITLE, mergeFontStyleWithDefault } from '../../../../../modules/fontStyle.js';
-import { VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_GAUGE, isVerticalType, VIS_TYPE_SCATTER } from '../../../../../modules/visTypes.js';
+import { FONT_STYLE_OPTION_ITALIC, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_TEXT_ALIGN, FONT_STYLE_VISUALIZATION_TITLE, mergeFontStyleWithDefault, defaultFontStyle } from '../../../../../modules/fontStyle.js';
+import { VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_GAUGE, isVerticalType, VIS_TYPE_SCATTER, VIS_TYPE_SINGLE_VALUE } from '../../../../../modules/visTypes.js';
 import getFilterText from '../../../../util/getFilterText.js';
 import { getTextAlignOption } from '../getTextAlignOption.js';
 import getScatterTitle from './scatter.js';
+import { getSingleValueTitleColor, getSingleValueTitleText } from './singleValue.js';
 import getYearOverYearTitle from './yearOverYear.js';
 const DASHBOARD_TITLE_STYLE = {
   margin: 15,
@@ -23,19 +24,41 @@ function getDefault(layout, metaData, dashboard) {
   }
   return null;
 }
-export default function (layout, metaData, dashboard) {
-  const fontStyle = mergeFontStyleWithDefault(layout.fontStyle && layout.fontStyle[FONT_STYLE_VISUALIZATION_TITLE], FONT_STYLE_VISUALIZATION_TITLE);
-  const title = {
-    text: undefined
-  };
+export default function (layout, metaData, extraOptions, series) {
   if (layout.hideTitle) {
-    return title;
+    return {
+      text: undefined
+    };
   }
-  const customTitle = layout.title && layout.displayTitle || layout.title;
-  if (isString(customTitle) && customTitle.length) {
-    title.text = customTitle;
+  const {
+    dashboard,
+    legendSets
+  } = extraOptions;
+  const legendOptions = layout.legend;
+  const fontStyle = mergeFontStyleWithDefault(layout.fontStyle && layout.fontStyle[FONT_STYLE_VISUALIZATION_TITLE], FONT_STYLE_VISUALIZATION_TITLE);
+  const title = Object.assign({
+    text: undefined
+  }, dashboard ? DASHBOARD_TITLE_STYLE : {
+    margin: 30,
+    align: getTextAlignOption(fontStyle[FONT_STYLE_OPTION_TEXT_ALIGN], FONT_STYLE_VISUALIZATION_TITLE, isVerticalType(layout.type)),
+    style: {
+      color: undefined,
+      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontWeight: fontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
+      fontStyle: fontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal',
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis'
+    }
+  });
+  const customTitleText = layout.title && layout.displayTitle || layout.title;
+  if (isString(customTitleText) && customTitleText.length) {
+    title.text = customTitleText;
   } else {
     switch (layout.type) {
+      case VIS_TYPE_SINGLE_VALUE:
+        title.text = getSingleValueTitleText(layout, metaData, dashboard);
+        break;
       case VIS_TYPE_GAUGE:
       case VIS_TYPE_YEAR_OVER_YEAR_LINE:
       case VIS_TYPE_YEAR_OVER_YEAR_COLUMN:
@@ -49,17 +72,22 @@ export default function (layout, metaData, dashboard) {
         break;
     }
   }
-  return Object.assign({}, dashboard ? DASHBOARD_TITLE_STYLE : {
-    margin: 30,
-    align: getTextAlignOption(fontStyle[FONT_STYLE_OPTION_TEXT_ALIGN], FONT_STYLE_VISUALIZATION_TITLE, isVerticalType(layout.type)),
-    style: {
-      color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
-      fontWeight: fontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
-      fontStyle: fontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal',
-      whiteSpace: 'nowrap',
-      overflow: 'hidden',
-      textOverflow: 'ellipsis'
-    }
-  }, title);
+  switch (layout.type) {
+    case VIS_TYPE_SINGLE_VALUE:
+      {
+        var _defaultFontStyle$FON, _layout$fontStyle, _layout$fontStyle$FON;
+        const defaultColor = defaultFontStyle === null || defaultFontStyle === void 0 ? void 0 : (_defaultFontStyle$FON = defaultFontStyle[FONT_STYLE_VISUALIZATION_TITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[FONT_STYLE_OPTION_TEXT_COLOR];
+        const customColor = layout === null || layout === void 0 ? void 0 : (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 ? void 0 : (_layout$fontStyle$FON = _layout$fontStyle[FONT_STYLE_VISUALIZATION_TITLE]) === null || _layout$fontStyle$FON === void 0 ? void 0 : _layout$fontStyle$FON[FONT_STYLE_OPTION_TEXT_COLOR];
+        title.style.color = getSingleValueTitleColor(customColor, defaultColor, series[0], legendOptions, legendSets);
+        if (dashboard) {
+          // TODO: is this always what we want?
+          title.style.fontWeight = 'normal';
+        }
+      }
+      break;
+    default:
+      title.style.color = fontStyle[FONT_STYLE_OPTION_TEXT_COLOR];
+      break;
+  }
+  return title;
 }

package/build/es/visualizations/config/adapters/dhis_highcharts/title/singleValue.js

@@ -0,0 +1,18 @@
+import getFilterText from '../../../../util/getFilterText.js';
+export { getSingleValueTitleColor } from '../customSVGOptions/singleValue/getSingleValueTitleColor.js';
+export function getSingleValueTitleText(layout, metaData) {
+  if (layout.hideTitle) {
+    return '';
+  }
+  if (typeof layout.title === 'string' && layout.title.length) {
+    return layout.title;
+  }
+  if (layout.columns) {
+    const firstItem = layout.columns[0].items[0];
+    const column = Object.assign({}, layout.columns[0], {
+      items: [firstItem]
+    });
+    return getFilterText([column], metaData);
+  }
+  return '';
+}

package/build/es/visualizations/config/adapters/dhis_highcharts/type.js

@@ -1,4 +1,4 @@
-import { VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SCATTER } from '../../../../modules/visTypes.js';
+import { VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SCATTER, VIS_TYPE_SINGLE_VALUE } from '../../../../modules/visTypes.js';
 export default function (type) {
   switch (type) {
     case VIS_TYPE_BAR:
@@ -34,6 +34,8 @@ export default function (type) {
         type: 'scatter',
         zoomType: 'xy'
       };
+    case VIS_TYPE_SINGLE_VALUE:
+      return {};
     case VIS_TYPE_COLUMN:
     case VIS_TYPE_STACKED_COLUMN:
     case VIS_TYPE_YEAR_OVER_YEAR_COLUMN:

package/build/es/visualizations/config/adapters/dhis_highcharts/xAxis/index.js

@@ -1,6 +1,6 @@
 import objectClean from 'd2-utilizr/lib/objectClean';
 import { FONT_STYLE_HORIZONTAL_AXIS_TITLE, FONT_STYLE_AXIS_LABELS, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_ITALIC, mergeFontStyleWithDefault } from '../../../../../modules/fontStyle.js';
-import { VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_SCATTER, isTwoCategoryChartType } from '../../../../../modules/visTypes.js';
+import { VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_SCATTER, isTwoCategoryChartType, VIS_TYPE_SINGLE_VALUE } from '../../../../../modules/visTypes.js';
 import { getAxis } from '../../../../util/axes.js';
 import getAxisTitle from '../getAxisTitle.js';
 import getCategories from '../getCategories.js';
@@ -44,6 +44,7 @@ export default function (store, layout, extraOptions, series) {
     switch (layout.type) {
       case VIS_TYPE_PIE:
       case VIS_TYPE_GAUGE:
+      case VIS_TYPE_SINGLE_VALUE:
         xAxis = noAxis();
         break;
       case VIS_TYPE_YEAR_OVER_YEAR_LINE:

package/build/es/visualizations/config/adapters/dhis_highcharts/yAxis/index.js

@@ -2,7 +2,7 @@ import arrayClean from 'd2-utilizr/lib/arrayClean';
 import objectClean from 'd2-utilizr/lib/objectClean';
 import i18n from '../../../../../locales/index.js';
 import { FONT_STYLE_VERTICAL_AXIS_TITLE, mergeFontStyleWithDefault, TEXT_ALIGN_RIGHT } from '../../../../../modules/fontStyle.js';
-import { isDualAxisType, isStacked, VIS_TYPE_GAUGE, VIS_TYPE_SCATTER } from '../../../../../modules/visTypes.js';
+import { isDualAxisType, isStacked, VIS_TYPE_GAUGE, VIS_TYPE_SCATTER, VIS_TYPE_SINGLE_VALUE } from '../../../../../modules/visTypes.js';
 import { getAxis } from '../../../../util/axes.js';
 import { getAxisStringFromId } from '../../../../util/axisId.js';
 import { getGridLineColor, getLabels, getMaxValue, getMinValue, getRegressionLine } from '../axis.js';
@@ -100,13 +100,12 @@ function getDefault(layout, series, extraOptions) {
   return axes;
 }
 export default function (layout, series, extraOptions) {
-  let yAxis;
   switch (layout.type) {
+    case VIS_TYPE_SINGLE_VALUE:
+      return null;
     case VIS_TYPE_GAUGE:
-      yAxis = getGauge(layout, series, extraOptions.legendSets[0]);
-      break;
+      return getGauge(layout, series, extraOptions.legendSets[0]);
     default:
-      yAxis = getDefault(layout, series, extraOptions);
+      return getDefault(layout, series, extraOptions);
   }
-  return yAxis;
 }

package/build/es/visualizations/config/adapters/index.js

@@ -1,6 +1,4 @@
-import dhis_dhis from './dhis_dhis/index.js';
 import dhis_highcharts from './dhis_highcharts/index.js';
 export default {
-  dhis_highcharts,
-  dhis_dhis
+  dhis_highcharts
 };

package/build/es/visualizations/config/generators/highcharts/index.js

@@ -3,16 +3,24 @@ import HM from 'highcharts/highcharts-more';
 import HB from 'highcharts/modules/boost';
 import HE from 'highcharts/modules/exporting';
 import HNDTD from 'highcharts/modules/no-data-to-display';
+import HOE from 'highcharts/modules/offline-exporting';
 import HPF from 'highcharts/modules/pattern-fill';
 import HSG from 'highcharts/modules/solid-gauge';
+import PEBFP from './pdfExportBugFixPlugin/index.js';
 
 // apply
 HM(H);
 HSG(H);
 HNDTD(H);
 HE(H);
+HOE(H);
 HPF(H);
 HB(H);
+PEBFP(H);
+
+/* Whitelist some additional SVG attributes here. Without this,
+ * the PDF export for the SingleValue visualization breaks. */
+H.AST.allowedAttributes.push('fill-rule', 'clip-rule');
 function drawLegendSymbolWrap() {
   const pick = H.pick;
   H.wrap(H.seriesTypes.column.prototype, 'drawLegendSymbol', function (proceed, legend, item) {

package/build/es/visualizations/config/generators/highcharts/pdfExportBugFixPlugin/index.js

@@ -0,0 +1,6 @@
+import nonASCIIFontBugfix from './nonASCIIFont.js';
+import textShadowBugFix from './textShadow.js';
+export default function (H) {
+  textShadowBugFix(H);
+  nonASCIIFontBugfix(H);
+}

package/build/es/visualizations/config/generators/highcharts/pdfExportBugFixPlugin/nonASCIIFont.js

@@ -0,0 +1,11 @@
+/* This is a workaround for https://github.com/highcharts/highcharts/issues/22008
+ * We add some transparent text in a non-ASCII script to the chart to prevent
+ * the chart from being exported in a serif font */
+
+export default function (H) {
+  H.addEvent(H.Chart, 'load', function () {
+    this.renderer.text('모', 20, 20).attr({
+      opacity: 0
+    }).add();
+  });
+}

package/build/es/visualizations/config/generators/highcharts/pdfExportBugFixPlugin/textShadow.js

@@ -0,0 +1,283 @@
+/* This plugin was provided by HighCharts support and resolves an issue with label
+ * text that has a white outline, such as the one we use for stacked bar charts.
+ * For example: "ANC: 1-4 visits by districts this year (stacked)"
+ * This issue has actually been resolved in HighCharts v11, so once we have upgraded
+ * to that version, this plugin can be removed. */
+
+export default function (H) {
+  const {
+      AST,
+      defaultOptions,
+      downloadURL
+    } = H,
+    {
+      ajax
+    } = H.HttpUtilities,
+    doc = document,
+    win = window,
+    OfflineExporting = H._modules['Extensions/OfflineExporting/OfflineExporting.js'],
+    {
+      getScript,
+      svgToPdf,
+      imageToDataUrl,
+      svgToDataUrl
+    } = OfflineExporting;
+  H.wrap(OfflineExporting, 'downloadSVGLocal', function (proceed, svg, options, failCallback, successCallback) {
+    var dummySVGContainer = doc.createElement('div'),
+      imageType = options.type || 'image/png',
+      filename = (options.filename || 'chart') + '.' + (imageType === 'image/svg+xml' ? 'svg' : imageType.split('/')[1]),
+      scale = options.scale || 1;
+    var svgurl,
+      blob,
+      finallyHandler,
+      libURL = options.libURL || defaultOptions.exporting.libURL,
+      objectURLRevoke = true,
+      pdfFont = options.pdfFont;
+    // Allow libURL to end with or without fordward slash
+    libURL = libURL.slice(-1) !== '/' ? libURL + '/' : libURL;
+    /*
+     * Detect if we need to load TTF fonts for the PDF, then load them and
+     * proceed.
+     *
+     * @private
+     */
+    var loadPdfFonts = function (svgElement, callback) {
+      var hasNonASCII = function (s) {
+        return (
+          // eslint-disable-next-line no-control-regex
+          /[^\u0000-\u007F\u200B]+/.test(s)
+        );
+      };
+      // Register an event in order to add the font once jsPDF is
+      // initialized
+      var addFont = function (variant, base64) {
+        win.jspdf.jsPDF.API.events.push(['initialized', function () {
+          this.addFileToVFS(variant, base64);
+          this.addFont(variant, 'HighchartsFont', variant);
+          if (!this.getFontList().HighchartsFont) {
+            this.setFont('HighchartsFont');
+          }
+        }]);
+      };
+      // If there are no non-ASCII characters in the SVG, do not use
+      // bother downloading the font files
+      if (pdfFont && !hasNonASCII(svgElement.textContent || '')) {
+        pdfFont = void 0;
+      }
+      // Add new font if the URL is declared, #6417.
+      var variants = ['normal', 'italic', 'bold', 'bolditalic'];
+      // Shift the first element off the variants and add as a font.
+      // Then asynchronously trigger the next variant until calling the
+      // callback when the variants are empty.
+      var normalBase64;
+      var shiftAndLoadVariant = function () {
+        var variant = variants.shift();
+        // All variants shifted and possibly loaded, proceed
+        if (!variant) {
+          return callback();
+        }
+        var url = pdfFont && pdfFont[variant];
+        if (url) {
+          ajax({
+            url: url,
+            responseType: 'blob',
+            success: function (data, xhr) {
+              var reader = new FileReader();
+              reader.onloadend = function () {
+                if (typeof this.result === 'string') {
+                  var base64 = this.result.split(',')[1];
+                  addFont(variant, base64);
+                  if (variant === 'normal') {
+                    normalBase64 = base64;
+                  }
+                }
+                shiftAndLoadVariant();
+              };
+              reader.readAsDataURL(xhr.response);
+            },
+            error: shiftAndLoadVariant
+          });
+        } else {
+          // For other variants, fall back to normal text weight/style
+          if (normalBase64) {
+            addFont(variant, normalBase64);
+          }
+          shiftAndLoadVariant();
+        }
+      };
+      shiftAndLoadVariant();
+    };
+    /*
+     * @private
+     */
+    var downloadPDF = function () {
+      AST.setElementHTML(dummySVGContainer, svg);
+      var textElements = dummySVGContainer.getElementsByTagName('text'),
+        // Copy style property to element from parents if it's not
+        // there. Searches up hierarchy until it finds prop, or hits the
+        // chart container.
+        setStylePropertyFromParents = function (el, propName) {
+          var curParent = el;
+          while (curParent && curParent !== dummySVGContainer) {
+            if (curParent.style[propName]) {
+              el.style[propName] = curParent.style[propName];
+              break;
+            }
+            curParent = curParent.parentNode;
+          }
+        };
+      var titleElements, outlineElements
+        // Workaround for the text styling. Making sure it does pick up
+        // settings for parent elements.
+      ;
+      [].forEach.call(textElements, function (el) {
+        // Workaround for the text styling. making sure it does pick up
+        // the root element
+        ;
+        ['font-family', 'font-size'].forEach(function (property) {
+          setStylePropertyFromParents(el, property);
+        });
+        el.style.fontFamily = pdfFont && pdfFont.normal ?
+        // Custom PDF font
+        'HighchartsFont' :
+        // Generic font (serif, sans-serif etc)
+        String(el.style.fontFamily && el.style.fontFamily.split(' ').splice(-1));
+        // Workaround for plotband with width, removing title from text
+        // nodes
+        titleElements = el.getElementsByTagName('title');
+        [].forEach.call(titleElements, function (titleElement) {
+          el.removeChild(titleElement);
+        });
+
+        // Remove all .highcharts-text-outline elements, #17170
+        outlineElements = el.getElementsByClassName('highcharts-text-outline');
+        while (outlineElements.length > 0) {
+          const outline = outlineElements[0];
+          if (outline.parentNode) {
+            outline.parentNode.removeChild(outline);
+          }
+        }
+      });
+      var svgNode = dummySVGContainer.querySelector('svg');
+      if (svgNode) {
+        loadPdfFonts(svgNode, function () {
+          svgToPdf(svgNode, 0, function (pdfData) {
+            try {
+              downloadURL(pdfData, filename);
+              if (successCallback) {
+                successCallback();
+              }
+            } catch (e) {
+              failCallback(e);
+            }
+          });
+        });
+      }
+    };
+    // Initiate download depending on file type
+    if (imageType === 'image/svg+xml') {
+      // SVG download. In this case, we want to use Microsoft specific
+      // Blob if available
+      try {
+        if (typeof win.navigator.msSaveOrOpenBlob !== 'undefined') {
+          // eslint-disable-next-line no-undef
+          blob = new MSBlobBuilder();
+          blob.append(svg);
+          svgurl = blob.getBlob('image/svg+xml');
+        } else {
+          svgurl = svgToDataUrl(svg);
+        }
+        downloadURL(svgurl, filename);
+        if (successCallback) {
+          successCallback();
+        }
+      } catch (e) {
+        failCallback(e);
+      }
+    } else if (imageType === 'application/pdf') {
+      if (win.jspdf && win.jspdf.jsPDF) {
+        downloadPDF();
+      } else {
+        // Must load pdf libraries first. // Don't destroy the object
+        // URL yet since we are doing things asynchronously. A cleaner
+        // solution would be nice, but this will do for now.
+        objectURLRevoke = true;
+        getScript(libURL + 'jspdf.js', function () {
+          getScript(libURL + 'svg2pdf.js', downloadPDF);
+        });
+      }
+    } else {
+      // PNG/JPEG download - create bitmap from SVG
+      svgurl = svgToDataUrl(svg);
+      finallyHandler = function () {
+        try {
+          OfflineExporting.domurl.revokeObjectURL(svgurl);
+        } catch (e) {
+          // Ignore
+        }
+      };
+      // First, try to get PNG by rendering on canvas
+      imageToDataUrl(svgurl, imageType, {}, scale, function (imageURL) {
+        // Success
+        try {
+          downloadURL(imageURL, filename);
+          if (successCallback) {
+            successCallback();
+          }
+        } catch (e) {
+          failCallback(e);
+        }
+      }, function () {
+        // Failed due to tainted canvas
+        // Create new and untainted canvas
+        var canvas = doc.createElement('canvas'),
+          ctx = canvas.getContext('2d'),
+          imageWidth = svg.match(
+          // eslint-disable-next-line no-useless-escape
+          /^<svg[^>]*width\s*=\s*\"?(\d+)\"?[^>]*>/)[1] * scale,
+          imageHeight = svg.match(
+          // eslint-disable-next-line no-useless-escape
+          /^<svg[^>]*height\s*=\s*\"?(\d+)\"?[^>]*>/)[1] * scale,
+          downloadWithCanVG = function () {
+            var v = win.canvg.Canvg.fromString(ctx, svg);
+            v.start();
+            try {
+              downloadURL(win.navigator.msSaveOrOpenBlob ? canvas.msToBlob() : canvas.toDataURL(imageType), filename);
+              if (successCallback) {
+                successCallback();
+              }
+            } catch (e) {
+              failCallback(e);
+            } finally {
+              finallyHandler();
+            }
+          };
+        canvas.width = imageWidth;
+        canvas.height = imageHeight;
+        if (win.canvg) {
+          // Use preloaded canvg
+          downloadWithCanVG();
+        } else {
+          // Must load canVG first. // Don't destroy the object
+          // URL yet since we are doing things asynchronously. A
+          // cleaner solution would be nice, but this will do for
+          // now.
+          objectURLRevoke = true;
+          getScript(libURL + 'canvg.js', function () {
+            downloadWithCanVG();
+          });
+        }
+      },
+      // No canvas support
+      failCallback,
+      // Failed to load image
+      failCallback,
+      // Finally
+      function () {
+        if (objectURLRevoke) {
+          finallyHandler();
+        }
+      });
+    }
+  });
+}

package/build/es/visualizations/config/generators/index.js

@@ -1,6 +1,4 @@
-import dhis from './dhis/index.js';
 import highcharts from './highcharts/index.js';
 export default {
-  highcharts,
-  dhis
+  highcharts
 };

package/build/es/visualizations/store/adapters/dhis_highcharts/index.js

@@ -1,8 +1,9 @@
 import arrayContains from 'd2-utilizr/lib/arrayContains';
 import arrayUnique from 'd2-utilizr/lib/arrayUnique';
-import { VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_PIE, VIS_TYPE_GAUGE, isTwoCategoryChartType } from '../../../../modules/visTypes.js';
+import { VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_PIE, VIS_TYPE_GAUGE, isTwoCategoryChartType, VIS_TYPE_SINGLE_VALUE } from '../../../../modules/visTypes.js';
 import getGauge from './gauge.js';
 import getPie from './pie.js';
+import getSingleValue from './singleValue.js';
 import getTwoCategory from './twoCategory.js';
 import getYearOnYear from './yearOnYear.js';
 const VALUE_ID = 'value';
@@ -63,6 +64,8 @@ function getSeriesFunction(type, categoryIds) {
     return getTwoCategory;
   }
   switch (type) {
+    case VIS_TYPE_SINGLE_VALUE:
+      return getSingleValue;
     case VIS_TYPE_PIE:
       return getPie;
     case VIS_TYPE_GAUGE:

package/build/es/visualizations/store/adapters/dhis_highcharts/singleValue.js

@@ -0,0 +1,4 @@
+export default function getSingleValue(acc, seriesIds, categoryIds, idValueMap) {
+  const seriesId = seriesIds[0][0];
+  acc.push(idValueMap.get(seriesId));
+}

package/build/es/visualizations/store/adapters/index.js

@@ -1,6 +1,4 @@
-import dhis_dhis from './dhis_dhis/index.js';
 import dhis_highcharts from './dhis_highcharts/index.js';
 export default {
-  dhis_highcharts,
-  dhis_dhis
+  dhis_highcharts
 };

package/build/es/visualizations/util/shouldUseContrastColor.js

@@ -0,0 +1,17 @@
+export const shouldUseContrastColor = function () {
+  let inputColor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  // based on https://stackoverflow.com/questions/3942878/how-to-decide-font-color-in-white-or-black-depending-on-background-color
+  var color = inputColor.charAt(0) === '#' ? inputColor.substring(1, 7) : inputColor;
+  var r = parseInt(color.substring(0, 2), 16); // hexToR
+  var g = parseInt(color.substring(2, 4), 16); // hexToG
+  var b = parseInt(color.substring(4, 6), 16); // hexToB
+  var uicolors = [r / 255, g / 255, b / 255];
+  var c = uicolors.map(col => {
+    if (col <= 0.03928) {
+      return col / 12.92;
+    }
+    return Math.pow((col + 0.055) / 1.055, 2.4);
+  });
+  var L = 0.2126 * c[0] + 0.7152 * c[1] + 0.0722 * c[2];
+  return L <= 0.179;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.8.6",
+    "version": "26.9.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -20,7 +20,6 @@
     },
     "scripts": {
         "build": "d2-app-scripts build",
-        "postbuild": "yarn build-storybook",
         "build-storybook": "build-storybook",
         "start-storybook": "start-storybook --port 5000",
         "start": "yarn start-storybook",

package/build/cjs/visualizations/config/adapters/dhis_dhis/index.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.INDICATOR_FACTOR_100 = void 0;
-exports.default = _default;
-var _index = _interopRequireDefault(require("./subtitle/index.js"));
-var _index2 = _interopRequireDefault(require("./title/index.js"));
-var _index3 = _interopRequireDefault(require("./value/index.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const INDICATOR_FACTOR_100 = 100;
-exports.INDICATOR_FACTOR_100 = INDICATOR_FACTOR_100;
-function _default(_ref) {
-  let {
-    store,
-    layout,
-    extraOptions
-  } = _ref;
-  const data = store.generateData({
-    type: layout.type,
-    seriesId: layout.columns && layout.columns.length ? layout.columns[0].dimension : null,
-    categoryId: layout.rows && layout.rows.length ? layout.rows[0].dimension : null
-  });
-  const metaData = store.data[0].metaData;
-  const config = {
-    value: data[0],
-    formattedValue: data[0] === undefined ? extraOptions.noData.text : (0, _index3.default)(data[0], layout, metaData),
-    title: (0, _index2.default)(layout, metaData, extraOptions.dashboard),
-    subtitle: (0, _index.default)(layout, metaData, extraOptions.dashboard)
-  };
-  const indicatorType = metaData.items[metaData.dimensions.dx[0]].indicatorType;
-
-  // Use % symbol for factor 100 and the full string for others
-  if ((indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.factor) !== INDICATOR_FACTOR_100) {
-    config.subText = indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.displayName;
-  }
-  return config;
-}