handle bad input in Args and BusyWorker components (#24)

gojek · Jun 29, 2022 · 718d0e0 · 718d0e0
1 parent 44c09da
commit 718d0e0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/webui/internal/assets/assets.go b/webui/internal/assets/assets.go
diff --git a/webui/internal/assets/build/work.js b/webui/internal/assets/build/work.js
diff --git a/webui/internal/assets/src/Args.js b/webui/internal/assets/src/Args.js
@@ -12,6 +12,12 @@ export default class Args extends React.Component {
   render() {
     let args = this.props.args;
 
+    if (args == null) {
+      return (
+        <span>null</span>
+      );
+    }
+
     // If object has base64 encoded JSON property named 'payload', try to unwrap it.
     if (args.hasOwnProperty('payload') && base64regex.test(args.payload)) {
       try {

diff --git a/webui/internal/assets/src/Processes.js b/webui/internal/assets/src/Processes.js
@@ -11,6 +11,18 @@ class BusyWorkers extends React.Component {
     worker: PropTypes.arrayOf(PropTypes.object).isRequired,
   }
 
+  parseJson(input) {
+    if (input.length === 0) {
+      return null;
+    }
+
+    try {
+      return JSON.parse(input);
+    } catch (e) {
+      return {parse_error: 'not a valid JSON', value: input};
+    }
+  }
+
   render() {
     return (
       <div className={styles.tableResponsive}>
@@ -28,7 +40,7 @@ class BusyWorkers extends React.Component {
                 return (
                   <tr key={worker.worker_id}>
                     <td>{worker.job_name}</td>
-                    <td><Args args={JSON.parse(worker.args_json)}/></td>
+                    <td><Args args={this.parseJson(worker.args_json)}/></td>
                     <td><UnixTime ts={worker.started_at}/></td>
                     <td><UnixTime ts={worker.checkin_at}/></td>
                     <td>{worker.checkin}</td>