tideline 1.25.0 → 1.26.0-rc.2

package/.babelrc

@@ -1,8 +1,7 @@
 {
   "presets": [
-    "es2015",
-    "stage-0",
-    "stage-2",
-    "react"
+    "@babel/preset-env",
+    "@babel/preset-react",
+    "babel-preset-react-app"
   ]
-}
+}

package/.nvmrc

@@ -0,0 +1 @@
+10.14.2

package/js/plot/suspend.js

@@ -44,7 +44,8 @@ module.exports = function(pool, opts) {
       var filteredData = _.filter(currentData, {
         subType: 'status',
         status: 'suspended',
-        reason: { suspended: 'automatic' }
+        reason: { suspended: 'automatic' },
+        payload: { suspended: { reason: 'Auto suspend by PLGS' } },
       });
 
       filteredData = _.filter(filteredData, (data) => {

package/js/twoweek.js

@@ -43,7 +43,6 @@ module.exports = function(emitter, timePrefs) {
       currentTranslation: 0
     },
     axisGutter = 52, dataGutter, dayTickSize = 0,
-    statsHeight = 80,
     pools = [], poolGroup, days, daysGroup,
     xScale = d3.scale.linear(), xAxis, yScale = d3.time.scale.utc(), yAxis,
     data, viewEndpoints, dataStartNoon, dataEndNoon, poolScaleHeight,
@@ -74,10 +73,10 @@ module.exports = function(emitter, timePrefs) {
     log('Jumped forward two weeks.');
     var n = 0;
     if (sortReverse) {
-      nav.currentTranslation += height - nav.axisHeight - statsHeight;
+      nav.currentTranslation += height - nav.axisHeight;
       emitter.emit('inTransition', true);
       mainGroup.transition().duration(500).tween('zoom', function() {
-        var iy = d3.interpolate(nav.currentTranslation - height + nav.axisHeight + statsHeight, nav.currentTranslation);
+        var iy = d3.interpolate(nav.currentTranslation - height + nav.axisHeight, nav.currentTranslation);
         return function(t) {
           nav.scroll.translate([0, iy(t)]);
           nav.scroll.event(mainGroup);
@@ -92,10 +91,10 @@ module.exports = function(emitter, timePrefs) {
       });
     }
     else {
-      nav.currentTranslation -= height - nav.axisHeight - statsHeight;
+      nav.currentTranslation -= height - nav.axisHeight;
       emitter.emit('inTransition', true);
       mainGroup.transition().duration(500).tween('zoom', function() {
-        var iy = d3.interpolate(nav.currentTranslation + height - nav.axisHeight - statsHeight, nav.currentTranslation);
+        var iy = d3.interpolate(nav.currentTranslation + height - nav.axisHeight, nav.currentTranslation);
         return function(t) {
           nav.scroll.translate([0, iy(t)]);
           nav.scroll.event(mainGroup);
@@ -115,10 +114,10 @@ module.exports = function(emitter, timePrefs) {
     log('Jumped back two weeks.');
     var n = 0;
     if (sortReverse) {
-      nav.currentTranslation -= height - nav.axisHeight - statsHeight;
+      nav.currentTranslation -= height - nav.axisHeight;
       emitter.emit('inTransition', true);
       mainGroup.transition().duration(500).tween('zoom', function() {
-        var iy = d3.interpolate(nav.currentTranslation + height - nav.axisHeight - statsHeight, nav.currentTranslation);
+        var iy = d3.interpolate(nav.currentTranslation + height - nav.axisHeight, nav.currentTranslation);
         return function(t) {
           nav.scroll.translate([0, iy(t)]);
           nav.scroll.event(mainGroup);
@@ -133,10 +132,10 @@ module.exports = function(emitter, timePrefs) {
       });
     }
     else {
-      nav.currentTranslation += height - nav.axisHeight - statsHeight;
+      nav.currentTranslation += height - nav.axisHeight;
       emitter.emit('inTransition', true);
       mainGroup.transition().duration(500).tween('zoom', function() {
-        var iy = d3.interpolate(nav.currentTranslation - height + nav.axisHeight + statsHeight, nav.currentTranslation);
+        var iy = d3.interpolate(nav.currentTranslation - height + nav.axisHeight, nav.currentTranslation);
         return function(t) {
           nav.scroll.translate([0, iy(t)]);
           nav.scroll.event(mainGroup);
@@ -165,7 +164,7 @@ module.exports = function(emitter, timePrefs) {
     var weight = 1.0;
     var cumWeight = weight * numPools;
     var totalPoolsHeight =
-      container.height() - nav.axisHeight - statsHeight;
+      container.height() - nav.axisHeight;
     poolScaleHeight = totalPoolsHeight/cumWeight;
     var actualPoolsHeight = 0;
     pools.forEach(function(pool) {
@@ -192,7 +191,7 @@ module.exports = function(emitter, timePrefs) {
       }
     }
     else {
-      currentYPosition = container.height() - statsHeight - poolScaleHeight;
+      currentYPosition = container.height() - poolScaleHeight;
       nextBatchYPosition = currentYPosition + poolScaleHeight;
       for (var k = viewIndex; k < pools.length; k++) {
         pool = pools[k];
@@ -208,13 +207,6 @@ module.exports = function(emitter, timePrefs) {
         pool.group().attr('transform', 'translate(0,' + pool.yPosition() + ')');
       }
     }
-
-    // setup stats group
-    container.poolStats = new Pool(container);
-    container.poolStats.id('poolStats', poolGroup).heightRatio(1.05).height(statsHeight * (4/5));
-    container.poolStats.group().attr({
-      transform: 'translate(' + axisGutter + ',' + (height - statsHeight) + ')'
-    });
   };
 
   container.clear = function() {
@@ -364,7 +356,7 @@ module.exports = function(emitter, timePrefs) {
       .attr({
         x: 0,
         y: 0,
-        height: height - nav.axisHeight - statsHeight,
+        height: height - nav.axisHeight,
         width: width,
         transform: 'translate(0,' + nav.axisHeight + ')'
       });
@@ -427,7 +419,7 @@ module.exports = function(emitter, timePrefs) {
 
     // set the domain and range for the main two-week y-scale
     yScale.domain(viewEndpoints)
-      .range([nav.axisHeight, height - statsHeight])
+      .range([nav.axisHeight, height])
       .ticks(d3.time.day.utc, 1);
 
     yAxis = d3.svg.axis().scale(yScale)
@@ -450,13 +442,13 @@ module.exports = function(emitter, timePrefs) {
       start.setUTCDate(start.getUTCDate() - 1);
       nav.scrollScale = d3.time.scale.utc()
           .domain([dataEndNoon, start])
-          .range([nav.axisHeight + nav.scrollThumbRadius, height - statsHeight - nav.scrollThumbRadius]);
+          .range([nav.axisHeight + nav.scrollThumbRadius, height - nav.scrollThumbRadius]);
 
     }
     else {
       nav.scrollScale = d3.time.scale.utc()
         .domain([dataStartNoon, dataEndNoon])
-        .range([nav.axisHeight + nav.scrollThumbRadius, height - statsHeight - nav.scrollThumbRadius]);
+        .range([nav.axisHeight + nav.scrollThumbRadius, height - nav.scrollThumbRadius]);
     }
 
     pools.forEach(function(pool) {
@@ -571,7 +563,7 @@ module.exports = function(emitter, timePrefs) {
       var translationAdjustment, yStart, xPos;
       if (sortReverse) {
         yStart = nav.scrollScale(viewEndpoints[1]);
-        translationAdjustment = height - statsHeight;
+        translationAdjustment = height;
 
         xPos = 2 * nav.navGutter / 3;
 
@@ -581,7 +573,7 @@ module.exports = function(emitter, timePrefs) {
             x1: xPos,
             x2: xPos,
             y1: nav.axisHeight + nav.scrollGutterWidth/2,
-            y2: height - statsHeight - nav.scrollGutterWidth/2,
+            y2: height - nav.scrollGutterWidth/2,
             'stroke-width': nav.scrollGutterWidth,
             'class': 'scroll'
           });
@@ -598,7 +590,7 @@ module.exports = function(emitter, timePrefs) {
             x1: xPos,
             x2: xPos,
             y1: nav.axisHeight + nav.scrollGutterWidth/2,
-            y2: height - statsHeight - nav.scrollGutterWidth/2,
+            y2: height - nav.scrollGutterWidth/2,
             'stroke-width': nav.scrollGutterWidth,
             'class': 'scroll'
           });
@@ -657,7 +649,6 @@ module.exports = function(emitter, timePrefs) {
     pools.forEach(function(pool) {
       pool.annotations(annotations);
     });
-    container.poolStats.annotations(annotations);
     return container;
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tideline",
-  "version": "1.25.0",
+  "version": "1.26.0-rc.2",
   "description": "Tidepool's timeline data visualization",
   "repository": {
     "type": "git",
@@ -33,14 +33,16 @@
     "sundial": "1.6.0"
   },
   "devDependencies": {
+    "@babel/core": "7.11.4",
+    "@babel/preset-env": "7.11.0",
+    "@babel/preset-react": "7.10.4",
     "@hot-loader/react-dom": "16.11.0",
     "autoprefixer-loader": "3.2.0",
-    "babel-core": "6.13.2",
+    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.3",
-    "babel-loader": "6.2.5",
-    "babel-plugin-rewire": "1.0.0-rc-6",
-    "babel-preset-es2015": "6.13.2",
-    "babel-preset-react": "6.11.1",
+    "babel-loader": "8.0.2",
+    "babel-plugin-rewire": "1.2.0",
+    "babel-preset-react-app": "4.0.0-next.2150693d",
     "babel-preset-stage-0": "6.5.0",
     "babel-preset-stage-2": "6.13.0",
     "chai": "3.5.0",
@@ -86,6 +88,9 @@
     "url-loader": "0.5.7",
     "webpack": "1.13.2"
   },
+  "peerDependencies": {
+    "babel-core": "6.x || 7.0.0-bridge.0"
+  },
   "resolutions": {
     "sundial/moment-timezone": "0.5.21"
   }

package/plugins/blip/basics/chartbasicsfactory.js

@@ -180,6 +180,14 @@ class BasicsChart extends React.Component {
       } else {
         selectorOptions = _.groupBy(section.dimensions, dimension => dimension.primary ? 'primary' : 'rows');
         if (_.isArray(selectorOptions.primary)) selectorOptions.primary = selectorOptions.primary[0] || {};
+
+        if (section.type === 'basals') {
+          const basalAggregationData = this.props.data?.data?.aggregationsByDate?.basals;
+          const hasAutomatedSuspends = basalAggregationData?.automatedSuspend?.summary?.subtotals?.automatedSuspend?.count > 0;
+          const hasAutomatedStops = basalAggregationData?.basal?.summary?.subtotals?.automatedStop?.count > 0;
+          if (hasAutomatedSuspends && hasAutomatedStops) section.perRow = 2;
+        }
+
         if (_.isArray(selectorOptions.rows)) selectorOptions.rows = _.chunk(_.orderBy(selectorOptions.rows, 'selectorIndex'), section.perRow || 3);
       }
 

package/plugins/blip/basics/less/DashboardSection.less

@@ -77,3 +77,7 @@
     padding: 0px 0px 10px 10px;
   }
 }
+
+.DashboardSection:nth-child(4) .DashboardSection-container .DashboardSection-content {
+  padding-bottom: 0px;
+}