fix(JobsForm): fix type errors and remove dead code

dcos · Feb 27, 2019 · cd6d457 · cd6d457
1 parent c274f51
commit cd6d457
Showing 1 changed file with 8 additions and 71 deletions.
diff --git a/plugins/jobs/src/js/types/JobRunStatusSummary.ts b/plugins/jobs/src/js/types/JobRunStatusSummary.ts
@@ -19,77 +19,14 @@ export function JobRunStatusSummaryTypeResolver(
   history: MetronomeJobHistorySummary
 ): JobRunStatusSummary {
   const summary = JobHistorySummaryTypeResolver(history);
-  let status = "N/A" as JobRunStatus;
-  let time: string | null = null;
-  let lastFailureAt = 0;
-  let lastSuccessAt = 0;
-
-  if (summary.lastFailureAt !== null) {
-    lastFailureAt = DateUtil.strToMs(summary.lastFailureAt);
-  }
-
-  if (summary.lastSuccessAt !== null) {
-    lastSuccessAt = DateUtil.strToMs(summary.lastSuccessAt);
-  }
-
-  if (summary.lastFailureAt !== null || summary.lastSuccessAt !== null) {
-    if (lastFailureAt > lastSuccessAt) {
-      status = "Failed" as JobRunStatus;
-      time = summary.lastFailureAt;
-    } else {
-      status = "Success" as JobRunStatus;
-      time = summary.lastSuccessAt;
-    }
+  if ([summary.lastFailureAt, summary.lastSuccessAt].every(x => x === null)) {
+    return { status: "N/A", time: null };
   }
 
-  return { status, time: time ? DateUtil.strToMs(time) : null };
+  const lastFailureAt = DateUtil.strToMs(summary.lastFailureAt) || 0;
+  const lastSuccessAt = DateUtil.strToMs(summary.lastSuccessAt) || 0;
+  return {
+    status: lastFailureAt > lastSuccessAt ? "Failed" : "Success",
+    time: Math.max(lastFailureAt, lastSuccessAt)
+  };
 }
-
-export const JobRunStatusSummaryFieldResolver = {
-  status(history: MetronomeJobHistorySummary): JobRunStatus {
-    const summary = JobHistorySummaryTypeResolver(history);
-    let status = "N/A" as JobRunStatus;
-    let lastFailureAt = 0;
-    let lastSuccessAt = 0;
-
-    if (summary.lastFailureAt !== null) {
-      lastFailureAt = DateUtil.strToMs(summary.lastFailureAt);
-    }
-
-    if (summary.lastSuccessAt !== null) {
-      lastSuccessAt = DateUtil.strToMs(summary.lastSuccessAt);
-    }
-
-    if (summary.lastFailureAt !== null || summary.lastSuccessAt !== null) {
-      status =
-        lastFailureAt > lastSuccessAt
-          ? ("Failed" as JobRunStatus)
-          : ("Success" as JobRunStatus);
-    }
-
-    return status;
-  },
-  time(history: MetronomeJobHistorySummary): number | null {
-    const summary = JobHistorySummaryTypeResolver(history);
-    let time: string | null = null;
-    let lastFailureAt = 0;
-    let lastSuccessAt = 0;
-
-    if (summary.lastFailureAt !== null) {
-      lastFailureAt = DateUtil.strToMs(summary.lastFailureAt);
-    }
-
-    if (summary.lastSuccessAt !== null) {
-      lastSuccessAt = DateUtil.strToMs(summary.lastSuccessAt);
-    }
-
-    if (summary.lastFailureAt !== null || summary.lastSuccessAt !== null) {
-      time =
-        lastFailureAt > lastSuccessAt
-          ? summary.lastFailureAt
-          : summary.lastSuccessAt;
-    }
-
-    return time ? DateUtil.strToMs(time) : null;
-  }
-};