Implement Proto Time changes (#89)

* Implement Proto Time changes

* Refactor time based utils

Author: feedmeapples

client/helpers/timestamp-to-date.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-const timestampToDate = timestamp => {
+const timestampToDate = (timestamp) => {
   if (!timestamp) {
     return timestamp;
   }
@@ -10,7 +10,7 @@ const timestampToDate = timestamp => {
   if (typeof timestamp === 'number') {
     ts = timestamp;
   } else if (typeof timestamp === 'string') {
-    ts = parseInt(timestamp);
+    return moment(timestamp);
   } else if (typeof timestamp === 'object') {
     if (typeof timestamp.value === 'string') {
       ts = parseInt(timestamp.value);

client/routes/namespace/workflow-list.vue

@@ -324,10 +324,8 @@ export default pagedGrid({
               workflowId: data.execution.workflowId,
               runId: data.execution.runId,
               workflowName: data.type.name,
-              startTime: moment(data.startTime).format('lll'),
-              endTime: data.closeTime
-                ? moment(data.closeTime).format('lll')
-                : '',
+              startTime: data.startTime.format('lll'),
+              endTime: data.closeTime ? data.closeTime.format('lll') : '',
               status: (data.status || 'open').toLowerCase(),
             }));
 

client/routes/workflow/helpers/get-event-details.js

@@ -1,9 +1,9 @@
 import { getKeyValuePairs } from '~helpers';
 
-const getEventDetails = event => {
-  const { details, eventId, eventType, timeStampDisplay } = event;
+const getEventDetails = (event) => {
+  const { details, eventId, eventType, eventTimeDisplay } = event;
   const kvps = getKeyValuePairs({
-    timestamp: timeStampDisplay,
+    eventTime: eventTimeDisplay,
     eventId,
     ...details,
   });
@@ -13,7 +13,7 @@ const getEventDetails = event => {
     eventId,
     eventType,
     kvps,
-    timestamp: timeStampDisplay,
+    eventTime: eventTimeDisplay,
   };
 };
 

client/routes/workflow/helpers/get-history-events.js

@@ -12,20 +12,25 @@ const getHistoryEvents = (events) => {
 
   return events
     .map((event) => {
-      const timestamp = timestampToDate(event.timestamp);
+      const eventTime = timestampToDate(event.eventTime);
 
       return {
         ...event,
-        timestamp,
+        eventTime,
       };
     })
     .map((event, index, eventList) => {
-      const timeStampDisplay = getTimeStampDisplay(event);
-      const timeElapsedDisplay = getTimeElapsedDisplay(event, index, eventList);
+      const eventTimeDisplay = getTimeStampDisplay(event.eventTime);
+      const eventTimes = eventList.map((a) => a.eventTime);
+      const timeElapsedDisplay = getTimeElapsedDisplay(
+        event.eventTime,
+        index,
+        eventTimes
+      );
 
       return {
         ...event,
-        timeStampDisplay,
+        eventTimeDisplay,
         timeElapsedDisplay,
       };
     })

client/routes/workflow/helpers/get-time-elapsed-display.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-const getTimeElapsedDisplay = ({ timestamp }, index, eventList) => {
+const getTimeElapsedDisplay = (timestamp, index, timestamps) => {
   if (!timestamp || index === -1) {
     return '';
   }
@@ -9,10 +9,8 @@ const getTimeElapsedDisplay = ({ timestamp }, index, eventList) => {
     return timestamp.format('MMM Do h:mm:ss a');
   }
 
-  const deltaFromPrev = moment.duration(
-    timestamp - eventList[index - 1].timestamp
-  );
-  let elapsed = moment.duration(timestamp - eventList[0].timestamp).format();
+  const deltaFromPrev = moment.duration(timestamp - timestamps[index - 1]);
+  let elapsed = moment.duration(timestamp - timestamps[0]).format();
 
   if (deltaFromPrev.asSeconds() >= 1) {
     elapsed += ` (+${deltaFromPrev.format()})`;

client/routes/workflow/helpers/get-time-elapsed-display.spec.js

@@ -5,52 +5,39 @@ describe('getTimeElapsedDisplay', () => {
   const DATE = '2020-01-01 00:00:00';
   const DATE_PLUS_ONE_HOUR = '2020-01-01 01:00:00';
 
-  describe('When passed an event with no timestamp', () => {
+  describe('When passed no timestamp', () => {
     it('should return "".', () => {
-      const event = {};
-      const output = getTimeElapsedDisplay(event);
+      const output = getTimeElapsedDisplay(null);
 
       expect(output).toEqual('');
     });
   });
 
-  describe('When passed an event with a timestamp and index = -1', () => {
+  describe('When passed a timestamp and index = -1', () => {
     it('should return "".', () => {
-      const event = {
-        timestamp: moment(DATE),
-      };
+      const ts = moment(DATE);
       const index = -1;
-      const output = getTimeElapsedDisplay(event, index);
+      const output = getTimeElapsedDisplay(ts, index);
 
       expect(output).toEqual('');
     });
   });
 
-  describe('When passed an event with a timestamp and index = 0', () => {
+  describe('When passed a timestamp and index = 0', () => {
     it('should return the date string.', () => {
-      const event = {
-        timestamp: moment(DATE),
-      };
+      const ts = moment(DATE);
       const index = 0;
-      const output = getTimeElapsedDisplay(event, index);
+      const output = getTimeElapsedDisplay(ts, index);
 
       expect(output).toEqual('Jan 1st 12:00:00 am');
     });
   });
 
-  describe('When passed an event with a timestamp and index = 1 and eventList', () => {
-    it('should return the elapsed time between the first event and the second.', () => {
-      const eventList = [
-        {
-          timestamp: moment(DATE),
-        },
-        {
-          timestamp: moment(DATE_PLUS_ONE_HOUR),
-        },
-      ];
+  describe('When passed a timestamp and index = 1 and list of times', () => {
+    it('should return the elapsed time between the first time and the second.', () => {
+      const times = [moment(DATE), moment(DATE_PLUS_ONE_HOUR)];
       const index = 1;
-      const event = eventList[index];
-      const output = getTimeElapsedDisplay(event, index, eventList);
+      const output = getTimeElapsedDisplay(times[index], index, times);
 
       expect(output).toEqual('1h (+1h)');
     });

client/routes/workflow/helpers/get-time-stamp-display.js

@@ -1,4 +1,4 @@
-const getTimeStampDisplay = ({ timestamp }, index) =>
+const getTimeStampDisplay = (timestamp, index) =>
   !timestamp || index === -1 ? '' : timestamp.format('MMM Do h:mm:ss a');
 
 export default getTimeStampDisplay;

client/routes/workflow/helpers/get-time-stamp-display.spec.js

@@ -4,34 +4,29 @@ import getTimeStampDisplay from './get-time-stamp-display';
 describe('getTimeStampDisplay', () => {
   const DATE = '2020-01-01 00:00:00';
 
-  describe('When passed an event with no timestamp', () => {
+  describe('When passed no timestamp', () => {
     it('should return "".', () => {
-      const event = {};
-      const output = getTimeStampDisplay(event);
+      const output = getTimeStampDisplay(undefined);
 
       expect(output).toEqual('');
     });
   });
 
-  describe('When passed an event with a timestamp and index = -1', () => {
+  describe('When passed a timestamp and index = -1', () => {
     it('should return "".', () => {
-      const event = {
-        timestamp: moment(DATE),
-      };
+      const ts = moment(DATE);
       const index = -1;
-      const output = getTimeStampDisplay(event, index);
+      const output = getTimeStampDisplay(ts, index);
 
       expect(output).toEqual('');
     });
   });
 
-  describe('When passed an event with a timestamp and index = 0', () => {
+  describe('When passed a timestamp and index = 0', () => {
     it('should return the date string.', () => {
-      const event = {
-        timestamp: moment(DATE),
-      };
+      const ts = moment(DATE);
       const index = 0;
-      const output = getTimeStampDisplay(event, index);
+      const output = getTimeStampDisplay(ts, index);
 
       expect(output).toEqual('Jan 1st 12:00:00 am');
     });

client/routes/workflow/helpers/map-timeline-events.js

@@ -34,7 +34,7 @@ export default function(historyEvents) {
           id: `activity${activityId}`,
           className: 'activity',
           eventIds: [e.eventId],
-          start: moment(scheduledEvent.timestamp),
+          start: moment(scheduledEvent.eventTime),
           ongoing: true,
           content: `Activity ${activityId}: ${shortName(
             scheduledEvent.details.activityType &&
@@ -60,7 +60,7 @@ export default function(historyEvents) {
         e.eventType !== 'ActivityTaskScheduled' &&
         e.eventType !== 'ActivityTaskStarted'
       ) {
-        assignEnd(item, e.timestamp);
+        assignEnd(item, e.eventTime);
         item.className = `activity ${e.eventType
           .replace('ActivityTask', '')
           .toLowerCase()}`;
@@ -78,7 +78,7 @@ export default function(historyEvents) {
           id: `childWf${initiatedEventId}`,
           className: 'child-workflow',
           eventIds: [e.eventId],
-          start: moment(initiatedEvent.timestamp),
+          start: moment(initiatedEvent.eventTime),
           ongoing: true,
           content: `Child Workflow: ${shortName(e.details.workflowType.name)}`,
           details: {
@@ -107,7 +107,7 @@ export default function(historyEvents) {
         e.eventType !== 'StartChildWorkflowExecutionInitiated' &&
         e.eventType !== 'ChildWorkflowExecutionStarted'
       ) {
-        assignEnd(item, e.timestamp);
+        assignEnd(item, e.eventTime);
         item.className = `child-workflow ${e.eventType
           .replace('ChildWorkflowExecution', '')
           .toLowerCase()}`;
@@ -117,8 +117,8 @@ export default function(historyEvents) {
         id: `timer${e.details.timerId}`,
         className: 'timer',
         eventIds: [e.eventId],
-        start: moment(e.timestamp),
-        end: moment(e.timestamp).add(
+        start: moment(e.eventTime),
+        end: moment(e.eventTime).add(
           e.details.startToFireTimeoutSeconds,
           'seconds'
         ),
@@ -142,7 +142,7 @@ export default function(historyEvents) {
         id: `marker${e.eventId}`,
         className: `marker marker-${markerName}`,
         eventIds: [e.eventId],
-        start: moment(e.timestamp),
+        start: moment(e.eventTime),
         content:
           {
             Version: 'Version Marker',
@@ -156,7 +156,7 @@ export default function(historyEvents) {
         id: `signal${e.eventId}`,
         className: 'signal',
         eventIds: [e.eventId],
-        start: moment(e.timestamp),
+        start: moment(e.eventTime),
         content: 'Workflow Signaled',
         details: {
           input: e.details.input,
@@ -167,7 +167,7 @@ export default function(historyEvents) {
         id: `extsignal${e.eventId}`,
         className: 'external-signal',
         eventIds: [e.eventId],
-        start: moment(e.timestamp),
+        start: moment(e.eventTime),
         ongoing: true,
         content: 'External Workflow Signaled',
         details: summarizeEvents.SignalExternalWorkflowExecutionInitiated(
@@ -180,7 +180,7 @@ export default function(historyEvents) {
       if (initiatedEvent) {
         initiatedEvent.eventIds.push(e.eventId);
         // TODO - code will break as item is not defined.
-        // assignEnd(item, e.timestamp);
+        // assignEnd(item, e.eventTime);
       }
     } else if (
       e.eventType === 'WorkflowTaskFailed' ||
@@ -192,7 +192,7 @@ export default function(historyEvents) {
           .replace('WorkflowTask', '')
           .toLowerCase()}`,
         eventIds: [e.eventId],
-        start: moment(e.timestamp),
+        start: moment(e.eventTime),
         content: e.eventType,
         details: e.details,
       });

client/routes/workflow/history.vue

@@ -152,7 +152,7 @@
                       {{
                         tsFormat === 'elapsed'
                           ? item.timeElapsedDisplay
-                          : item.timeStampDisplay
+                          : item.eventTimeDisplay
                       }}
                     </div>
                     <div class="td col-summary">
@@ -390,7 +390,7 @@ export default {
       }
 
       return {
-        timestamp: this.selectedEvent.timestamp.format('MMM Do h:mm:ss a'),
+        eventTime: this.selectedEvent.eventTime.format('MMM Do h:mm:ss a'),
         eventId: this.selectedEvent.eventId,
         ...this.selectedEvent.details,
       };