refactor getKeyValuePairs helper for pending tasks change (#271)

Author: just-at-uber

client/components/domain-navigation.vue

@@ -111,10 +111,10 @@ export default {
         this.validation = 'pending';
         this.domainDescRequest = this.getDomainDesc(newDomain)
           .then(
-            desc => {
+            item => {
               this.domainDescName = newDomain;
               this.domainDesc = {
-                kvps: getKeyValuePairs(desc),
+                kvps: getKeyValuePairs({ item }),
               };
 
               return 'valid';
@@ -151,10 +151,10 @@ export default {
         .catch(res => ({
           error: `${res.statusText || res.message} ${res.status}`,
         }))
-        .then(desc => {
+        .then(item => {
           if (this.domainDescName === d) {
             this.domainDesc = {
-              kvps: getKeyValuePairs(desc),
+              kvps: getKeyValuePairs({ item }),
             };
             this.domainDescRequest = null;
           }

client/helpers/get-key-value-pairs.js

@@ -23,7 +23,7 @@ import moment from 'moment';
 import getJsonStringObject from './get-json-string-object';
 import { jsonKeys, preKeys } from '~constants';
 
-const getKeyValuePairs = event => {
+const getKeyValuePairs = ({ excludes = [], item }) => {
   const kvps = [];
   const flatten = (prefix, obj, root) => {
     Object.entries(obj).forEach(([k, value]) => {
@@ -33,6 +33,10 @@ const getKeyValuePairs = event => {
 
       const key = prefix ? `${prefix}.${k}` : k;
 
+      if (excludes.includes(key)) {
+        return;
+      }
+
       if (value.routeLink) {
         kvps.push({
           key,
@@ -108,7 +112,7 @@ const getKeyValuePairs = event => {
     });
   };
 
-  flatten('', event || {}, event);
+  flatten('', item || {}, item);
 
   return kvps;
 };

client/routes/domain/domain-settings.vue

@@ -40,7 +40,7 @@ export default {
       .then(
         r => {
           const domainConfig = mapDomainDescription(r);
-          const kvps = getKeyValuePairs(domainConfig);
+          const kvps = getKeyValuePairs({ item: domainConfig });
 
           this.domainConfig = { ...domainConfig, kvps };
         },

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

@@ -32,9 +32,11 @@ const getEventDetails = ({
   const { kvps, isHighlighted } = getEventKvpsHighlight({
     eventType,
     kvps: getKeyValuePairs({
-      timestamp: timeStampDisplay,
-      eventId,
-      ...details,
+      item: {
+        timestamp: timeStampDisplay,
+        eventId,
+        ...details,
+      },
     }),
     workflowHistoryEventHighlightList,
     workflowHistoryEventHighlightListEnabled,

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

@@ -43,7 +43,7 @@ const getEventFullDetails = ({
 
   const { kvps, isHighlighted } = getEventKvpsHighlight({
     eventType,
-    kvps: getKeyValuePairs(item),
+    kvps: getKeyValuePairs({ item }),
     workflowHistoryEventHighlightList,
     workflowHistoryEventHighlightListEnabled,
   });

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

@@ -40,7 +40,7 @@ const getEventSummary = event => {
       ? maps[event.eventType](event.details)
       : event.details;
 
-  const kvps = getKeyValuePairs(item);
+  const kvps = getKeyValuePairs({ item });
 
   return {
     ...item,

client/routes/workflow/helpers/get-summary.js

@@ -27,9 +27,9 @@ const getSummary = ({ events, isWorkflowRunning, workflow }) => {
   const formattedWorkflow = workflow.pendingActivities
     ? {
         ...workflow,
-        pendingActivities: workflow.pendingActivities.map(pendingActivity => ({
-          ...pendingActivity,
-          kvps: getKeyValuePairs(pendingActivity),
+        pendingActivities: workflow.pendingActivities.map(item => ({
+          ...item,
+          kvps: getKeyValuePairs({ item }),
         })),
       }
     : workflow;