web-manager 3.2.42 → 3.2.44

package/index.js

@@ -87,6 +87,7 @@ function Manager() {
     global: {
       version: '',
       url: '',
+      buildTime: 0,
       cacheBreaker: '',
       brand: {
         name: 'default'
@@ -555,6 +556,7 @@ function Manager() {
           self.properties.global.app = configuration.global.app;
           self.properties.global.version = configuration.global.version;
           self.properties.global.url = configuration.global.url;
+          self.properties.global.buildTime = new Date((+configuration.global.buildTime * 1000) || new Date())
           self.properties.global.cacheBreaker = configuration.global.cacheBreaker;
 
           self.properties.global.brand = configuration.global.brand;
@@ -1192,7 +1194,8 @@ function Manager() {
   function refreshNewVersion(self) {
     console.log('refreshNewVersion()');
 
-    fetch('/@output/build/build.json' + '?cb=' + new Date().getTime())
+    // Make request to get the build time (live)
+    fetch('/@output/build/build.json?cb=' + new Date().getTime())
     .then(function (res) {
       if (res.ok) {
         return res.json();
@@ -1201,15 +1204,26 @@ function Manager() {
       }
     })
     .then(function (data) {
-      var buildTime = new Date(data['npm-build'].timestamp_utc);
-      var startTime = self.properties.page.startTime;
+      var buildTimeCurrent = self.properties.global.buildTime || new Date(0);
+      var buildTimeLive = new Date(data['npm-build'].timestamp);
 
-      if (buildTime > startTime) {
-        // console.log('refreshNewVersion(): Refreshing...');
+      // Log
+      console.log('refreshNewVersion()', data, buildTimeCurrent, buildTimeLive);
 
+      // If the live time is newer, refresh
+      if (buildTimeCurrent < buildTimeLive) {
+        console.log('refreshNewVersion(): Refreshing...');
+
+        if (self.isDevelopment()) {
+          return;
+        }
+
+        // Force page reload
         window.onbeforeunload = function () {
           return undefined;
         }
+
+        // Refresh
         window.location.reload(true);
       }
     })

package/lib/account.js

@@ -266,15 +266,21 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   account.plan.trial.expires.timestampUNIX = Math.round(new Date(account.plan.trial.expires.timestamp || 0).getTime() / 1000);
 
   // @@@DEVELOPER
+  // var date = '2024-04-23T00:07:29.183Z';
+  // var date = `2024-03-23T00:07:29.183Z`;
   // account.plan.id = 'basic';
   // account.plan.trial = {
   //   activated: false,
   //   expires: {
-  //     timestamp: new Date('2024-04-23T00:07:29.183Z').toISOString(),
-  //     timestampUNIX: Math.round(new Date('2024-04-23T00:07:29.183Z').getTime() / 1000),
-  //   }
+  //     timestamp: new Date(date).toISOString(),
+  //     timestampUNIX: Math.round(new Date(date).getTime() / 1000),
+  //   },
   // }
-  // account.plan.status = 'suspended';
+  // account.plan.expires = {
+  //   timestamp: new Date(date).toISOString(),
+  //   timestampUNIX: Math.round(new Date(date).getTime() / 1000),
+  // }
+  // account.plan.status = 'cancelled';
 
   account.plan.limits = account.plan.limits || {};
   // account.plan.devices = account.plan.devices || 1;
@@ -329,6 +335,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   var trialExpireDate = new Date(account.plan.trial.expires.timestamp);
   var daysTillTrialExpire = Math.floor((trialExpireDate - now) / 86400000);
   var startDate = new Date(account.plan.payment.startDate.timestamp);
+  var unresolvedPlanId = account.plan.id;
   var planIsActive = difference > -1 && account.plan.id !== defaultPlanId;
   var planIsSuspended = account.plan.status === 'suspended';
 
@@ -511,13 +518,15 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     // If user is on trial, start date is trial exp date
     var visibleStartDate = account.plan.trial.activated ? account.plan.trial.expires.timestamp : account.plan.payment.startDate.timestamp;
     // If basic, just show account creation date
-    if (isBasicPlan) {
+    if (unresolvedPlanId === defaultPlanId) {
       visibleStartDate = accountCreationDate;
+      billingStatusEl.setAttribute('hidden', true);
     }
     var visibleFrequency = account.plan.payment.frequency === 'unknown' ? 'monthly' : account.plan.payment.frequency;
 
     // Update billing UI
-    billingPlanId.setInnerHTML(splitDashesAndUppercase(account.plan.id));
+    // billingPlanId.setInnerHTML(splitDashesAndUppercase(account.plan.id));
+    billingPlanId.setInnerHTML(splitDashesAndUppercase(unresolvedPlanId)); // Show unresolved because we want to show what plan they have bought not what the expirattion status resolves to
     billingFrequencyEl.setInnerHTML(visibleFrequency);
     billingStatusEl.setInnerHTML(visibleStatus);
     billingStatusColorEl
@@ -531,9 +540,11 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     billingStartDateEl.setInnerHTML(new Date(visibleStartDate).toLocaleString(undefined, {
       year: 'numeric', month: 'long', day: 'numeric',
     }));
-    billingExpirationDateEl.setInnerHTML(isBasicPlan && daysTillExpire < 366
-      ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
-      : '');
+    // billingExpirationDateEl.setInnerHTML(isBasicPlan && daysTillExpire < 366
+    billingExpirationDateEl.setInnerHTML('<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days ');
+    if (daysTillExpire > 0 && daysTillExpire < 366) {
+      billingExpirationDateEl.removeAttribute('hidden');
+    }
 
     // Update payment method UI
     if (account.plan.status === 'suspended') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.42",
+  "version": "3.2.44",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {