Refactor moment to be loaded from ctx (#7331)

* Experimental branch that replaces momentjs with dayjs in the client

* Revert unintentional change

* feat

* Turns out dayjs is a no-go, but this has some good restructuring so submitting that

bundle/bundle.source.js

@@ -18,14 +18,20 @@ require('../node_modules/flot/jquery.flot.time');
 require('../node_modules/flot/jquery.flot.pie');
 require('../node_modules/flot/jquery.flot.fillbetween');
 
-window.moment = require('moment-timezone');
+const moment = require('moment-timezone');
+
+window.moment = moment;
 
 window.Nightscout = window.Nightscout || {};
 
+var ctx = {
+    moment: moment
+};
+
 window.Nightscout = {
     client: require('../lib/client'),
     units: require('../lib/units')(),
-    admin_plugins: require('../lib/admin_plugins/')()
+    admin_plugins: require('../lib/admin_plugins/')(ctx)
 };
 
 window.Nightscout.report_plugins_preinit = require('../lib/report_plugins/');

lib/admin_plugins/cleanentriesdb.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var moment = require('moment');
+var moment;
 
 var cleanentriesdb = {
   name: 'cleanentriesdb'
   , label: 'Clean Mongo entries (glucose entries) database'
   , pluginType: 'admin'
 };
 
-function init() {
+function init(ctx) {
+  moment = ctx.moment;
   return cleanentriesdb;
 }
 

lib/admin_plugins/cleanstatusdb.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var moment = require('moment');
+var moment;
 
 var cleanstatusdb = {
   name: 'cleanstatusdb'
   , label: 'Clean Mongo status database'
   , pluginType: 'admin'
 };
 
-function init () {
+function init (ctx) {
+  moment = ctx.moment;
   return cleanstatusdb;
 }
 

lib/admin_plugins/cleantreatmentsdb.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var moment = require('moment');
+var moment;
 
 var cleantreatmentsdb = {
   name: 'cleantreatmentsdb'
   , label: 'Clean Mongo treatments database'
   , pluginType: 'admin'
 };
 
-function init() {
+function init(ctx) {
+  moment = ctx.moment;
   return cleantreatmentsdb;
 }
 

lib/admin_plugins/index.js

@@ -3,14 +3,14 @@
 var _find = require('lodash/find');
 var _each = require('lodash/each');
 
-function init() {
+function init(ctx) {
     var allPlugins = [
-        require('./subjects')()
-      , require('./roles')()
-      , require('./cleanstatusdb')()
-      , require('./cleantreatmentsdb')()
-      , require('./cleanentriesdb')()
-      , require('./futureitems')()
+        require('./subjects')(ctx)
+      , require('./roles')(ctx)
+      , require('./cleanstatusdb')(ctx)
+      , require('./cleantreatmentsdb')(ctx)
+      , require('./cleanentriesdb')(ctx)
+      , require('./futureitems')(ctx)
     ];
 
   function plugins(name) {

lib/client/boluscalc.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment-timezone');
 var times = require('../times');
 var Storages = require('js-storage');
 
@@ -46,9 +45,9 @@ function init (client, $) {
   }
 
   function setDateAndTime (time) {
-    time = time || moment();
-    eventTime.val(time.format('HH:mm'));
-    eventDate.val(time.format('YYYY-MM-DD'));
+    time = time || new Date();
+    eventTime.val(time.getHours() + ":" + time.getMinutes());
+    eventDate.val(time.toISOString().split('T')[0]);
   }
 
   function mergeDateAndTime () {
@@ -125,16 +124,15 @@ function init (client, $) {
 
     boluscalc.calculateInsulin();
     maybePrevent(event);
-    //    Nightscout.utils.updateBrushToTime(moment.toDate());
   };
 
   boluscalc.eventTimeTypeChange = function eventTimeTypeChange (event) {
     if ($('#bc_othertime').is(':checked')) {
       $('#bc_eventTimeValue').focus();
       $('#bc_retro').css('display', '');
-      if (mergeDateAndTime() < moment()) {
+      if (mergeDateAndTime() < Date.now()) {
         $('#bc_retro').css('background-color', 'red').text(translate('RETRO MODE'));
-      } else if (mergeDateAndTime() > moment()) {
+      } else if (mergeDateAndTime() > Date.now()) {
         $('#bc_retro').css('background-color', 'blue').text(translate('IN THE FUTURE'));
       } else {
         $('#bc_retro').css('display', 'none');

lib/client/careportal.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var moment = require('moment-timezone');
 var _ = require('lodash');
 var parse_duration = require('parse-duration'); // https://www.npmjs.com/package/parse-duration
 var times = require('../times');
@@ -18,9 +17,9 @@ function init (client, $) {
   var eventDate = $('#eventDateValue');
 
   function setDateAndTime (time) {
-    time = time || moment();
-    eventTime.val(time.format('HH:mm'));
-    eventDate.val(time.format('YYYY-MM-DD'));
+    time = time || client.ctx.moment();
+    eventTime.val(time.hours() + ":" + time.minutes());
+    eventDate.val(time.toISOString().split('T')[0]);
   }
 
   function mergeDateAndTime () {

lib/client/index.js

@@ -9,7 +9,6 @@ var Storages = require('js-storage');
 
 var language = require('../language')();
 var sandbox = require('../sandbox')();
-var profile = require('../profilefunctions')();
 var units = require('../units')();
 var levels = require('../levels');
 var times = require('../times');
@@ -18,6 +17,8 @@ var receiveDData = require('./receiveddata');
 var brushing = false;
 
 var browserSettings;
+var moment = window.moment;
+var timezones = moment.tz.names();
 
 var client = {};
 
@@ -203,13 +204,15 @@ client.load = function load (serverSettings, callback) {
     , extendedSettings: client.settings.extendedSettings
     , language: language
     , levels: levels
+    , moment: moment
   }).registerClientDefaults();
 
   browserSettings.loadPluginSettings(client);
 
   client.utils = require('../utils')({
     settings: client.settings
     , language: language
+    , moment: moment
   });
 
   client.rawbg = client.plugins('rawbg');
@@ -223,6 +226,8 @@ client.load = function load (serverSettings, callback) {
     , bus: require('../bus')(client.settings, client.ctx)
     , settings: client.settings
     , pluginBase: client.plugins.base(majorPills, minorPills, statusPills, bgStatus, client.tooltip, Storages.localStorage)
+    , moment: moment
+    , timezones: timezones
   };
 
   client.ctx.language = language;
@@ -298,6 +303,8 @@ client.load = function load (serverSettings, callback) {
   client.careportal = require('./careportal')(client, $);
   client.boluscalc = require('./boluscalc')(client, $);
 
+  var profile = require('../profilefunctions')(null, client.ctx);
+
   client.profilefunctions = profile;
 
   client.editMode = false;

lib/data/dataloader.js

@@ -139,7 +139,6 @@ function init(env, ctx) {
             });
 
             console.info('Load Complete:\n\t', counts.join(', '));
-
             done(err, result);
         }
 

lib/plugins/ar2.js

@@ -2,7 +2,6 @@
 
 var _ = require('lodash');
 var times = require('../times');
-var moment = require('moment');
 
 var BG_REF = 140; //Central tendency
 var BG_MIN = 36; //Not 39, but why?
@@ -17,6 +16,7 @@ var AR2_COLOR = 'cyan';
 
 function init (ctx) {
   var translate = ctx.language.translate;
+  var moment = ctx.moment;
 
   var ar2 = {
     name: 'ar2'

lib/plugins/basalprofile.js

@@ -1,10 +1,10 @@
 'use strict';
 var times = require('../times');
-var moment = require('moment');
 var consts = require('../constants');
 var _ = require('lodash');
 
 function init (ctx) {
+  var moment = ctx.moment;
 
   var translate = ctx.language.translate;
 

lib/plugins/batteryage.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 
 function init(ctx) {
+    var moment = ctx.moment;
     var translate = ctx.language.translate;
     var levels = ctx.levels;
 

lib/plugins/bgnow.js

@@ -1,14 +1,14 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 var times = require('../times');
 
 var offset = times.mins(2.5).msecs;
 var bucketFields = ['index', 'fromMills', 'toMills'];
 
 function init (ctx) {
 
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var utils = require('../utils')(ctx);
 

lib/plugins/cannulaage.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 
 function init(ctx) {
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var levels = ctx.levels;
 

lib/plugins/cob.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var _ = require('lodash')
-  , moment = require('moment')
   , times = require('../times');
 
 function init (ctx) {
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var iob = require('./iob')(ctx);
 

lib/plugins/insulinage.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 
 function init(ctx) {
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var levels = ctx.levels;
 

lib/plugins/iob.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var _ = require('lodash')
-  , moment = require('moment')
-  , times = require('../times');
+const _ = require('lodash')
+const times = require('../times');
 
 function init(ctx) {
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var utils = require('../utils')(ctx);
 

lib/plugins/loop.js

@@ -1,12 +1,13 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 var times = require('../times');
 
 // var ALL_STATUS_FIELDS = ['status-symbol', 'status-label', 'iob', 'freq', 'rssi']; Unused variable
 
 function init (ctx) {
+  var moment = ctx.moment;
+
   var utils = require('../utils')(ctx);
   var translate = ctx.language.translate;
   var levels = ctx.levels;

lib/plugins/openaps.js

@@ -1,13 +1,13 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 var times = require('../times');
 var consts = require('../constants');
 
 // var ALL_STATUS_FIELDS = ['status-symbol', 'status-label', 'iob', 'meal-assist', 'freq', 'rssi']; Unused variable
 
 function init (ctx) {
+  var moment = ctx.moment;
   var utils = require('../utils')(ctx);
   var openaps = {
     name: 'openaps'

lib/plugins/pump.js

@@ -1,12 +1,12 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 var times = require('../times');
 
 var ALL_STATUS_FIELDS = ['reservoir', 'battery', 'clock', 'status', 'device'];
 
 function init (ctx) {
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var timeago = require('./timeago')(ctx);
   var openaps = require('./openaps')(ctx);

lib/plugins/sensorage.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var _ = require('lodash');
-var moment = require('moment');
 var times = require('../times');
 
 function init(ctx) {
+  var moment = ctx.moment;
   var translate = ctx.language.translate;
   var levels = ctx.levels;
 

lib/plugins/virtAsstBase.js

@@ -1,9 +1,10 @@
 'use strict';
 
-var moment = require('moment');
 var _each = require('lodash/each');
 
 function init(env, ctx) {
+  var moment = ctx.moment;
+
   function virtAsstBase() {
     return virtAsstBase;
   }