Browse Source

Merge pull request #1943 from porter-dev/nico/por-436-cronjob-input-breaking-on-revisions-with

[POR-436] Expanded job chart breaking when trying to parse invalid cron expression
Nicolas Frati 4 years ago
parent
commit
c001b47afd

+ 12 - 5
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedJobChart.tsx

@@ -152,6 +152,17 @@ export const ExpandedJobChartFC: React.FC<{
       timeStyle: "long",
       timeStyle: "long",
     });
     });
 
 
+    let runDescription = "";
+
+    try {
+      runDescription = `Runs ${CronPrettifier.toString(
+        chart?.config?.schedule.value
+      ).toLowerCase()} UTC`;
+    } catch (error) {
+      runDescription =
+        "An unexpected error happened while trying to parse the cron expression.";
+    }
+
     if (currentTab === "jobs") {
     if (currentTab === "jobs") {
       return (
       return (
         <TabWrapper>
         <TabWrapper>
@@ -186,11 +197,7 @@ export const ExpandedJobChartFC: React.FC<{
           {chart?.config?.schedule?.enabled ? (
           {chart?.config?.schedule?.enabled ? (
             <RunsDescription>
             <RunsDescription>
               <i className="material-icons">access_time</i>
               <i className="material-icons">access_time</i>
-              Runs{" "}
-              {CronPrettifier.toString(
-                chart?.config?.schedule.value
-              ).toLowerCase()}{" "}
-              UTC
+              {runDescription}
               <Dot
               <Dot
                 style={{
                 style={{
                   color: "#ffffff88",
                   color: "#ffffff88",