add exact datetime of next agent update cycle in pending actions #457

src/components/modals/logs/PendingActions.vue

@@ -67,7 +67,10 @@
             <q-td v-else-if="props.row.action_type === 'chocoinstall'">
               <q-icon name="download" size="sm" />
             </q-td>
-            <q-td v-if="props.row.status !== 'completed'">{{ props.row.due }}</q-td>
+            <q-td v-if="props.row.status !== 'completed'">
+              <span v-if="props.row.action_type === 'agentupdate'">{{ agentUpdateTime }}</span>
+              <span v-else>{{ props.row.due }}</span>
+            </q-td>
             <q-td v-else>Completed</q-td>
             <q-td>{{ props.row.description }}</q-td>
             <q-td v-if="props.row.action_type === 'chocoinstall' && props.row.status === 'completed'">
@@ -138,6 +141,7 @@ export default {
         { name: "details", field: "details", align: "left", sortable: false },
       ],
       agent_visibleColumns: ["type", "due", "desc", "details"],
+      agentUpdateTime: this.getNextAgentUpdateTime(),
     };
   },
   methods: {

src/mixins/mixins.js

@@ -195,6 +195,19 @@ export default {
         .catch(e => { });
 
       return options;
-    }
+    },
+    getNextAgentUpdateTime() {
+      const d = new Date();
+      let ret;
+      if (d.getMinutes() <= 35) {
+        ret = d.setMinutes(35);
+      } else {
+        ret = date.addToDate(d, { hours: 1 });
+        ret.setMinutes(35);
+      }
+      const a = date.formatDate(ret, "MMM D, YYYY");
+      const b = date.formatDate(ret, "h:mm A");
+      return `${a} at ${b}`;
+    },
   }
 }