@dhis2/analytics 26.8.6 → 26.9.0

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/index.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = loadCustomSVG;
+var _visTypes = require("../../../../../../modules/visTypes.js");
+var _index = _interopRequireDefault(require("./singleValue/index.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function loadCustomSVG(visType) {
+  switch (visType) {
+    case _visTypes.VIS_TYPE_SINGLE_VALUE:
+      _index.default.call(this);
+      break;
+    default:
+      break;
+  }
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/addIconElement.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addIconElement = addIconElement;
+const parser = new DOMParser();
+function addIconElement(svgString, color) {
+  const svgIconDocument = parser.parseFromString(svgString, 'image/svg+xml');
+  const iconElHeight = svgIconDocument.documentElement.getAttribute('height');
+  const iconElWidth = svgIconDocument.documentElement.getAttribute('width');
+  const iconGroup = this.renderer.g('icon').attr({
+    color,
+    'data-test': 'visualization-icon'
+  }).css({
+    visibility: 'hidden'
+  });
+
+  /* Force the group element to have the same dimensions as the original
+   * SVG image by adding this rect. This ensures the icon has the intended
+   * whitespace around it and makes scaling and translating easier. */
+  this.renderer.rect(0, 0, iconElWidth, iconElHeight).add(iconGroup);
+  Array.from(svgIconDocument.documentElement.children).forEach(pathNode => {
+    /* It is also possible to use the SVGRenderer to draw the icon but that
+     * approach is more error prone, so during review it was decided to just
+     * append the SVG children to the iconGroup using native the native DOM
+     * API. For reference see this commit, for an implementation using the
+     * SVVGRenderer:
+     * https://github.com/dhis2/analytics/pull/1698/commits/f95bee838e07f4cdfc3cab6e92f28f49a386a0ad */
+    iconGroup.element.appendChild(pathNode);
+  });
+  iconGroup.add();
+  return iconGroup;
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/checkIfFitsWithinContainer.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkIfFitsWithinContainer = checkIfFitsWithinContainer;
+var _constants = require("./constants.js");
+function checkIfFitsWithinContainer(availableSpace, valueElement, subTextElement, icon, subText, spacing) {
+  const valueRect = valueElement.getBBox(true);
+  const subTextRect = subText ? subTextElement.getBBox(true) : {
+    width: 0,
+    height: 0
+  };
+  const requiredValueWidth = icon ? valueRect.width + spacing.iconGap + spacing.iconSize : valueRect.width;
+  const requiredHeight = subText ? valueRect.height * _constants.ACTUAL_NUMBER_HEIGHT_FACTOR + spacing.subTextTop + subTextRect.height : valueRect.height * _constants.ACTUAL_NUMBER_HEIGHT_FACTOR;
+  const fitsHorizontally = availableSpace.width > requiredValueWidth && availableSpace.width > subTextRect.width;
+  const fitsVertically = availableSpace.height > requiredHeight;
+  return fitsHorizontally && fitsVertically;
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/computeLayoutRect.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeLayoutRect = computeLayoutRect;
+var _computeSpacingTop = require("./computeSpacingTop.js");
+var _constants = require("./constants.js");
+function computeLayoutRect(valueElement, subTextElement, iconElement, spacing) {
+  const valueRect = valueElement.getBBox();
+  const containerCenterY = this.chartHeight / 2;
+  const containerCenterX = this.chartWidth / 2;
+  const minY = _computeSpacingTop.computeSpacingTop.call(this, spacing.valueTop);
+  let width = valueRect.width;
+  let height = valueRect.height * _constants.ACTUAL_NUMBER_HEIGHT_FACTOR;
+  let sideMarginTop = 0;
+  let sideMarginBottom = 0;
+  if (iconElement) {
+    width += spacing.iconGap + spacing.iconSize;
+  }
+  if (subTextElement) {
+    const subTextRect = subTextElement.getBBox();
+    if (subTextRect.width > width) {
+      sideMarginTop = (subTextRect.width - width) / 2;
+      width = subTextRect.width;
+    } else {
+      sideMarginBottom = (width - subTextRect.width) / 2;
+    }
+    height += spacing.subTextTop + subTextRect.height;
+  }
+  return {
+    x: containerCenterX - width / 2,
+    y: Math.max(containerCenterY - height / 2, minY),
+    width,
+    height,
+    sideMarginTop,
+    sideMarginBottom
+  };
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/computeSpacingTop.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeSpacingTop = computeSpacingTop;
+function computeSpacingTop(valueSpacingTop) {
+  if (this.subtitle.textStr) {
+    /* If a subtitle is present this will be below the title so base
+     * the value X position on this */
+    const subTitleRect = this.subtitle.element.getBBox();
+    return subTitleRect.y + subTitleRect.height + valueSpacingTop;
+  } else if (this.title.textStr) {
+    // Otherwise base on title
+    const titleRect = this.title.element.getBBox();
+    return titleRect.y + titleRect.height + valueSpacingTop;
+  } else {
+    // If neither are present only adjust for valueSpacingTop
+    return valueSpacingTop;
+  }
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/constants.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ACTUAL_NUMBER_HEIGHT_FACTOR = void 0;
+// multiply value text size with this factor
+// to get very close to the actual number height
+// as numbers don't go below the baseline like e.g. "j" and "g"
+const ACTUAL_NUMBER_HEIGHT_FACTOR = 2 / 3;
+exports.ACTUAL_NUMBER_HEIGHT_FACTOR = ACTUAL_NUMBER_HEIGHT_FACTOR;

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/getAvailableSpace.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAvailableSpace = getAvailableSpace;
+var _computeSpacingTop = require("./computeSpacingTop.js");
+var _styles = require("./styles.js");
+function getAvailableSpace(valueSpacingTop) {
+  return {
+    height: this.chartHeight - _computeSpacingTop.computeSpacingTop.call(this, valueSpacingTop),
+    width: this.chartWidth - _styles.MIN_SIDE_WHITESPACE * 2
+  };
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/index.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = loadSingleValueSVG;
+var _addIconElement = require("./addIconElement.js");
+var _checkIfFitsWithinContainer = require("./checkIfFitsWithinContainer.js");
+var _getAvailableSpace = require("./getAvailableSpace.js");
+var _positionElements = require("./positionElements.js");
+var _styles = require("./styles.js");
+function loadSingleValueSVG() {
+  var _this$userOptions;
+  const {
+    formattedValue,
+    icon,
+    subText,
+    fontColor
+  } = this.userOptions.customSVGOptions;
+  const dynamicStyles = new _styles.DynamicStyles((_this$userOptions = this.userOptions) === null || _this$userOptions === void 0 ? void 0 : _this$userOptions.isPdfExport);
+  const valueElement = this.renderer.text(formattedValue).attr('data-test', 'visualization-primary-value').css({
+    color: fontColor,
+    visibility: 'hidden'
+  }).add();
+  const subTextElement = subText ? this.renderer.text(subText).attr('data-test', 'visualization-subtext').css({
+    color: fontColor,
+    visibility: 'hidden'
+  }).add() : null;
+  const iconElement = icon ? _addIconElement.addIconElement.call(this, icon, fontColor) : null;
+  let fitsWithinContainer = false;
+  let styles = {};
+  while (!fitsWithinContainer && dynamicStyles.hasNext()) {
+    styles = dynamicStyles.next();
+    valueElement.css(styles.value);
+    subTextElement === null || subTextElement === void 0 ? void 0 : subTextElement.css(styles.subText);
+    fitsWithinContainer = (0, _checkIfFitsWithinContainer.checkIfFitsWithinContainer)(_getAvailableSpace.getAvailableSpace.call(this, styles.spacing.valueTop), valueElement, subTextElement, icon, subText, styles.spacing);
+  }
+  _positionElements.positionElements.call(this, valueElement, subTextElement, iconElement, styles.spacing);
+  valueElement.css({
+    visibility: 'visible'
+  });
+  iconElement === null || iconElement === void 0 ? void 0 : iconElement.css({
+    visibility: 'visible'
+  });
+  subTextElement === null || subTextElement === void 0 ? void 0 : subTextElement.css({
+    visibility: 'visible'
+  });
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/positionElements.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.positionElements = positionElements;
+var _computeLayoutRect = require("./computeLayoutRect.js");
+var _constants = require("./constants.js");
+function positionElements(valueElement, subTextElement, iconElement, spacing) {
+  const valueElementBox = valueElement.getBBox();
+  /* Layout here refers to a virtual rect that wraps
+   * all indiviual parts of the single value visualization
+   * (value, subtext and icon) */
+  const layoutRect = _computeLayoutRect.computeLayoutRect.call(this, valueElement, subTextElement, iconElement, spacing);
+  valueElement.align({
+    align: 'right',
+    verticalAlign: 'top',
+    alignByTranslate: false,
+    x: (valueElementBox.width + layoutRect.sideMarginTop) * -1,
+    y: valueElementBox.height * _constants.ACTUAL_NUMBER_HEIGHT_FACTOR
+  }, false, layoutRect);
+  if (iconElement) {
+    const {
+      height
+    } = iconElement.getBBox();
+    const scale = spacing.iconSize / height;
+    const translateX = layoutRect.x + layoutRect.sideMarginTop;
+    const iconHeight = height * scale;
+    const valueElementHeight = valueElementBox.height * _constants.ACTUAL_NUMBER_HEIGHT_FACTOR;
+    const translateY = layoutRect.y + (valueElementHeight - iconHeight) / 2;
+
+    /* The icon is a <g> with <path> elements that contain coordinates.
+     * These path-coordinates only scale correctly when using CSS translate */
+    iconElement.css({
+      transform: `translate(${translateX}px, ${translateY}px) scale(${scale})`
+    });
+  }
+  if (subTextElement) {
+    subTextElement.align({
+      align: 'left',
+      verticalAlign: 'bottom',
+      alignByTranslate: false,
+      x: layoutRect.sideMarginBottom
+    }, false, layoutRect);
+  }
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/styles.js

@@ -0,0 +1,109 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MIN_SIDE_WHITESPACE = exports.DynamicStyles = void 0;
+const valueStyles = [{
+  'font-size': '164px',
+  'letter-spacing': '-5px'
+}, {
+  'font-size': '128px',
+  'letter-spacing': '-4px'
+}, {
+  'font-size': '96px',
+  'letter-spacing': '-3px'
+}, {
+  'font-size': '64px',
+  'letter-spacing': '-2.5px'
+}, {
+  'font-size': '40px',
+  'letter-spacing': '-1.5px'
+}, {
+  'font-size': '20px',
+  'letter-spacing': '-1px'
+}];
+const subTextStyles = [{
+  'font-size': '36px',
+  'letter-spacing': '-1.4px'
+}, {
+  'font-size': '32px',
+  'letter-spacing': '-1.2px'
+}, {
+  'font-size': '26px',
+  'letter-spacing': '-0.8px'
+}, {
+  'font-size': '20px',
+  'letter-spacing': '-0.6px'
+}, {
+  'font-size': '14px',
+  'letter-spacing': '0.2px'
+}, {
+  'font-size': '9px',
+  'letter-spacing': '0px'
+}];
+const spacings = [{
+  valueTop: 8,
+  subTextTop: 12,
+  iconGap: 8,
+  iconSize: 164
+}, {
+  valueTop: 8,
+  subTextTop: 12,
+  iconGap: 6,
+  iconSize: 128
+}, {
+  valueTop: 8,
+  subTextTop: 8,
+  iconGap: 4,
+  iconSize: 96
+}, {
+  valueTop: 8,
+  subTextTop: 8,
+  iconGap: 4,
+  iconSize: 64
+}, {
+  valueTop: 8,
+  subTextTop: 8,
+  iconGap: 4,
+  iconSize: 40
+}, {
+  valueTop: 8,
+  subTextTop: 4,
+  iconGap: 2,
+  iconSize: 20
+}];
+const MIN_SIDE_WHITESPACE = 4;
+exports.MIN_SIDE_WHITESPACE = MIN_SIDE_WHITESPACE;
+class DynamicStyles {
+  constructor(isPdfExport) {
+    this.currentIndex = 0;
+    this.isPdfExport = isPdfExport;
+  }
+  getStyle() {
+    return {
+      value: {
+        ...valueStyles[this.currentIndex],
+        'font-weight': this.isPdfExport ? 'normal' : '300'
+      },
+      subText: subTextStyles[this.currentIndex],
+      spacing: spacings[this.currentIndex]
+    };
+  }
+  next() {
+    if (this.currentIndex === valueStyles.length - 1) {
+      throw new Error('No next available, already on the smallest style');
+    } else {
+      ++this.currentIndex;
+    }
+    return this.getStyle();
+  }
+  first() {
+    this.currentIndex = 0;
+    return this.getStyle();
+  }
+  hasNext() {
+    return this.currentIndex < valueStyles.length - 1;
+  }
+}
+exports.DynamicStyles = DynamicStyles;

package/build/cjs/visualizations/config/adapters/dhis_highcharts/exporting.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getExporting;
+var _visTypes = require("../../../../modules/visTypes.js");
+var _index = _interopRequireDefault(require("./events/loadCustomSVG/singleValue/index.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function getExporting(visType) {
+  const exporting = {
+    // disable exporting context menu
+    enabled: false
+  };
+  switch (visType) {
+    case _visTypes.VIS_TYPE_SINGLE_VALUE:
+      return {
+        ...exporting,
+        chartOptions: {
+          chart: {
+            events: {
+              load: _index.default
+            }
+          }
+        }
+      };
+    default:
+      return exporting;
+  }
+}

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

@@ -11,20 +11,23 @@ var _index = require("../../../../modules/outliers/index.js");
 var _visTypes = require("../../../../modules/visTypes.js");
 var _themes = require("../../../util/colors/themes.js");
 var _addTrendLines = _interopRequireWildcard(require("./addTrendLines.js"));
-var _chart = _interopRequireDefault(require("./chart.js"));
+var _index2 = _interopRequireDefault(require("./chart/index.js"));
+var _index3 = _interopRequireDefault(require("./customSVGOptions/index.js"));
+var _exporting = _interopRequireDefault(require("./exporting.js"));
 var _getScatterData = _interopRequireDefault(require("./getScatterData.js"));
 var _getSortedConfig = _interopRequireDefault(require("./getSortedConfig.js"));
 var _getTrimmedConfig = _interopRequireDefault(require("./getTrimmedConfig.js"));
+var _lang = _interopRequireDefault(require("./lang.js"));
 var _legend = _interopRequireDefault(require("./legend.js"));
 var _legendSet = require("./legendSet.js");
 var _noData = _interopRequireDefault(require("./noData.js"));
-var _index2 = _interopRequireDefault(require("./pane/index.js"));
+var _index4 = _interopRequireDefault(require("./pane/index.js"));
 var _plotOptions = _interopRequireDefault(require("./plotOptions.js"));
-var _index3 = _interopRequireDefault(require("./series/index.js"));
-var _index4 = _interopRequireDefault(require("./subtitle/index.js"));
-var _index5 = _interopRequireDefault(require("./title/index.js"));
-var _index6 = _interopRequireDefault(require("./xAxis/index.js"));
-var _index7 = _interopRequireDefault(require("./yAxis/index.js"));
+var _index5 = _interopRequireDefault(require("./series/index.js"));
+var _index6 = _interopRequireDefault(require("./subtitle/index.js"));
+var _index7 = _interopRequireDefault(require("./title/index.js"));
+var _index8 = _interopRequireDefault(require("./xAxis/index.js"));
+var _index9 = _interopRequireDefault(require("./yAxis/index.js"));
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -67,17 +70,17 @@ function _default(_ref) {
   }
   let config = {
     // type etc
-    chart: (0, _chart.default)(_layout, el, _extraOptions.dashboard),
+    chart: (0, _index2.default)(_layout, el, _extraOptions, series),
     // title
-    title: (0, _index5.default)(_layout, store.data[0].metaData, _extraOptions.dashboard),
+    title: (0, _index7.default)(_layout, store.data[0].metaData, _extraOptions, series),
     // subtitle
-    subtitle: (0, _index4.default)(series, _layout, store.data[0].metaData, _extraOptions.dashboard),
+    subtitle: (0, _index6.default)(series, _layout, store.data[0].metaData, _extraOptions),
     // x-axis
-    xAxis: (0, _index6.default)(store, _layout, _extraOptions, series),
+    xAxis: (0, _index8.default)(store, _layout, _extraOptions, series),
     // y-axis
-    yAxis: (0, _index7.default)(_layout, series, _extraOptions),
+    yAxis: (0, _index9.default)(_layout, series, _extraOptions),
     // series
-    series: (0, _index3.default)({
+    series: (0, _index5.default)({
       series: series.slice(),
       metaData: store.data[0].metaData.items,
       layout: _layout,
@@ -94,22 +97,28 @@ function _default(_ref) {
       dashboard: _extraOptions.dashboard
     }),
     // pane
-    pane: (0, _index2.default)(_layout.type),
+    pane: (0, _index4.default)(_layout.type),
     // no data + zoom
-    lang: {
-      noData: _extraOptions.noData.text,
-      resetZoom: _extraOptions.resetZoom.text
-    },
-    noData: (0, _noData.default)(),
+    lang: (0, _lang.default)(_layout.type, _extraOptions),
+    noData: (0, _noData.default)(_layout.type),
     // credits
     credits: {
       enabled: false
     },
     // exporting
-    exporting: {
-      // disable exporting context menu
-      enabled: false
-    }
+    exporting: (0, _exporting.default)(_layout.type),
+    /* The config object passed to the Highcharts Chart constructor
+     * can contain arbitrary properties, which are made accessible
+     * under the Chart instance's `userOptions` member. This means
+     * that in event callback functions the custom SVG options are
+     * accessible as `this.userOptions.customSVGOptions` */
+    customSVGOptions: (0, _index3.default)({
+      extraConfig,
+      layout: _layout,
+      extraOptions: _extraOptions,
+      metaData: store.data[0].metaData,
+      series
+    })
   };
 
   // get plot options for scatter
@@ -185,5 +194,6 @@ function _default(_ref) {
 
   // force apply extra config
   Object.assign(config, extraConfig);
+  console.log((0, _objectClean.default)(config));
   return (0, _objectClean.default)(config);
 }

package/build/cjs/visualizations/config/adapters/dhis_highcharts/lang.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getLang;
+var _visTypes = require("../../../../modules/visTypes.js");
+function getLang(visType, extraOptions) {
+  return {
+    /* The SingleValue visualization consists of some custom SVG elements
+     * rendered on an empty chart. Since the chart is empty, there is never
+     * any data and Highcharts will show the noData text. To avoid this we
+     * clear the text here. */
+    noData: visType === _visTypes.VIS_TYPE_SINGLE_VALUE ? undefined : extraOptions.noData.text,
+    resetZoom: extraOptions.resetZoom.text
+  };
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/plotOptions.js

@@ -71,7 +71,7 @@ var _default = _ref => {
         }
       } : {};
     default:
-      return {};
+      return null;
   }
 };
 exports.default = _default;

package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/index.js

@@ -160,6 +160,7 @@ function getDefault(_ref) {
   return series;
 }
 function _default(_ref2) {
+  var _series;
   let {
     series,
     metaData,
@@ -170,6 +171,9 @@ function _default(_ref2) {
     displayStrategy
   } = _ref2;
   switch (layout.type) {
+    case _visTypes.VIS_TYPE_SINGLE_VALUE:
+      series = [];
+      break;
     case _visTypes.VIS_TYPE_PIE:
       series = (0, _pie.default)(series, Object.values(getIdColorMap(series, layout, extraOptions)));
       break;
@@ -190,7 +194,7 @@ function _default(_ref2) {
         displayStrategy
       });
   }
-  series.forEach(seriesObj => {
+  (_series = series) === null || _series === void 0 ? void 0 : _series.forEach(seriesObj => {
     // animation
     seriesObj.animation = {
       duration: getAnimation(extraOptions.animation, DEFAULT_ANIMATION_DURATION)

package/build/cjs/visualizations/config/adapters/dhis_highcharts/subtitle/__tests__/singleValue.spec.js

@@ -0,0 +1,62 @@
+"use strict";
+
+var _singleValue = _interopRequireDefault(require("../singleValue.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+jest.mock('../../../../../util/getFilterText', () => () => 'The default filter text');
+describe('getSingleValueSubtitle', () => {
+  it('returns empty subtitle when flag hideSubtitle exists', () => {
+    expect((0, _singleValue.default)({
+      hideSubtitle: true
+    })).toEqual('');
+  });
+  it('returns the subtitle provided in the layout', () => {
+    const subtitle = 'The subtitle was already set';
+    expect((0, _singleValue.default)({
+      subtitle
+    })).toEqual(subtitle);
+  });
+  it('returns an empty string when layout does not have filters', () => {
+    expect((0, _singleValue.default)({})).toEqual('');
+  });
+  it('returns the filter text', () => {
+    expect((0, _singleValue.default)({
+      filters: []
+    })).toEqual('The default filter text');
+  });
+  describe('not dashboard', () => {
+    describe('layout does not include title', () => {
+      it('returns empty subtitle', () => {
+        expect((0, _singleValue.default)({
+          filters: undefined
+        }, {}, false)).toEqual('');
+      });
+    });
+
+    /* All these tests have been moved and adjusted from here:
+     * src/visualizations/config/adapters/dhis_dhis/title/__tests__`
+     * The test below asserted the default subtitle behaviour, for
+     * visualization types other than SingleValue. It expected that
+     * the title was being used as subtitle. It fails now, and I
+     * believe that this behaviour does not make sense. So instead
+     * of fixing it, I disabled it. */
+    // describe('layout includes title', () => {
+    //     it('returns filter title as subtitle', () => {
+    //         expect(
+    //             getSingleValueSubtitle(
+    //                 { filters: undefined, title: 'Chart title' },
+    //                 {},
+    //                 false
+    //             )
+    //         ).toEqual('The default filter text')
+    //     })
+    // })
+  });
+
+  describe('dashboard', () => {
+    it('returns filter title as subtitle', () => {
+      expect((0, _singleValue.default)({
+        filters: {}
+      }, {}, true)).toEqual('The default filter text');
+    });
+  });
+});