Merge pull request #446 from tidepool-org/WEB-3474-hide-twiist-wizard-bolus-filters

[WEB-3474] Hide twiist wizard bolus filters when empty

Author: clintonium-119

package.json

@@ -4,7 +4,7 @@
     "node": "20.8.0"
   },
   "packageManager": "[email protected]",
-  "version": "1.44.1-web-3428-twiist-update.5",
+  "version": "1.44.1-rc.3",
   "description": "Tidepool data visualization for diabetes device data.",
   "keywords": [
     "data visualization"

src/utils/basics/data.js

@@ -19,7 +19,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import i18next from 'i18next';
 
-import { getPumpVocabulary, getUppercasedManufacturer, isLoop } from '../device';
+import { getPumpVocabulary, getUppercasedManufacturer, isLoop, isTwiistLoop } from '../device';
 import {
   generateBgRangeLabels,
   reshapeBgClassesToBgBounds,
@@ -87,6 +87,9 @@ export function defineBasicsAggregations(bgPrefs, manufacturer, pumpUpload = {})
     let summaryTitle;
     let perRow = 3;
 
+    // TODO: Remove this once we have twiist bolus and wizards linked
+    const hideEmptyWizardDimensions = isTwiistLoop(pumpUpload.settings);
+
     switch (section) {
       case 'basals':
         title = 'Basals';
@@ -119,12 +122,12 @@ export function defineBasicsAggregations(bgPrefs, manufacturer, pumpUpload = {})
         summaryTitle = t('Avg boluses / day');
         dimensions = [
           { path: 'summary', key: 'total', label: t('Avg per day'), average: true, primary: true },
-          { path: 'summary.subtotals', key: 'wizard', label: t('Calculator'), percentage: true, selectorIndex: 0 },
-          { path: 'summary.subtotals', key: 'correction', label: t('Correction'), percentage: true, selectorIndex: 1 },
+          { path: 'summary.subtotals', key: 'wizard', label: t('Calculator'), percentage: true, selectorIndex: 0, hideEmpty: hideEmptyWizardDimensions },
+          { path: 'summary.subtotals', key: 'correction', label: t('Correction'), percentage: true, selectorIndex: 1, hideEmpty: hideEmptyWizardDimensions },
           { path: 'summary.subtotals', key: 'extended', label: t('Extended'), percentage: true, selectorIndex: 4 },
           { path: 'summary.subtotals', key: 'interrupted', label: t('Interrupted'), percentage: true, selectorIndex: 5 },
-          { path: 'summary.subtotals', key: 'override', label: t('Override'), percentage: true, selectorIndex: 2 },
-          { path: 'summary.subtotals', key: 'underride', label: t('Underride'), percentage: true, selectorIndex: 6 },
+          { path: 'summary.subtotals', key: 'override', label: t('Override'), percentage: true, selectorIndex: 2, hideEmpty: hideEmptyWizardDimensions },
+          { path: 'summary.subtotals', key: 'underride', label: t('Underride'), percentage: true, selectorIndex: 6, hideEmpty: hideEmptyWizardDimensions },
         ];
 
         if (isLoop(pumpUpload.settings)) {