Add error handling to getEditableJSON

mozilla · Oct 30, 2024 · f902127 · f902127
1 parent 67303f5
commit f902127
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/app/columns.tsx b/app/columns.tsx
@@ -245,7 +245,10 @@ export const fxmsMessageColumns: ColumnDef<FxMSMessageInfo>[] = [
     header: "",
     cell: (props: any) => {
       const supportedTypes = ["infobar", "spotlight"];
-      if (supportedTypes.includes(props.row.original.template)) {
+      if (
+        supportedTypes.includes(props.row.original.template) &&
+        props.row.original.editableJson
+      ) {
         return (
           <button
             onClick={() =>

diff --git a/lib/messageUtils.ts b/lib/messageUtils.ts
@@ -176,16 +176,33 @@ export function maybeCreateWelcomePreview(message: any): object {
   return message;
 }
 
-export function getEditableJSON(message: any): string {
+export function getEditableJSON(message: any): string | undefined {
   // fallbacks for important properties
-  if (message.template === "spotlight") {
-    message.content.screens.forEach((screen: any) => {
-      if (!screen.id) {
-        screen.id = message.content.id;
+  switch (message.template) {
+    case "spotlight":
+      try {
+        message.content.screens.forEach((screen: any) => {
+          if (!screen.id) {
+            screen.id = message.content.id;
+          }
+        });
+        return message;
+      } catch (e) {
+        console.log("Could not generate editable JSON: ", e);
       }
-    });
+      break;
+    case "infobar":
+      try {
+        if (message.content && message.content.buttons) {
+          return message;
+        }
+      } catch (e) {
+        console.log("Could note generate editable JSON: ", e);
+      }
+      break;
+    default:
+      return undefined;
   }
-  return message;
 }
 
 export function getPreviewLink(message: any): string {