From 7f74f2f3def4b6848df4ca03c7097b80c1782743 Mon Sep 17 00:00:00 2001
From: thdlam <47620431+thdlam@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:59:48 -0700
Subject: [PATCH 1/2] fix add and edit button being enabled

---
 .../services/script/editor/triggerEventModal.tsx | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/triggerEventModal.tsx b/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/triggerEventModal.tsx
index 3991bd83c6..3e8a425439 100644
--- a/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/triggerEventModal.tsx
+++ b/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/triggerEventModal.tsx
@@ -54,7 +54,7 @@ export const TriggerEventModal = ({
         namespace: initialValue.namespace,
         criteria: {
           ...triggerEvent.criteria,
-          context: JSON.stringify(initialValue?.criteria?.context, null, 2),
+          context: initialValue?.criteria?.context ? JSON.stringify(initialValue?.criteria?.context, null, 2) : null,
         },
       });
     }
@@ -115,14 +115,8 @@ export const TriggerEventModal = ({
   };
 
   const isSaveButtonDisabled = () => {
-    const { criteria, name } = triggerEvent;
-    if (
-      isObjectEmpty(criteria) ||
-      criteria?.context === undefined ||
-      criteria?.context === '' ||
-      name === null ||
-      name === ''
-    ) {
+    const { name } = triggerEvent;
+    if (name === null || name === '') {
       return true;
     }
 
@@ -156,7 +150,7 @@ export const TriggerEventModal = ({
             disabled={isSaveButtonDisabled()}
             onClick={() => {
               const criteria: ScriptItemTriggerEventCriteria = {
-                context: JSON.parse(triggerEvent.criteria?.context),
+                context: triggerEvent.criteria?.context ? JSON.parse(triggerEvent.criteria?.context) : null,
               };
               onSave({ namespace: triggerEvent.namespace, name: triggerEvent.name, criteria });
             }}
@@ -169,7 +163,7 @@ export const TriggerEventModal = ({
       <GoAFormItem label="Select trigger event">
         <GoADropdown
           data-test-id="script-trigger-event-name-dropDown"
-          name="streamEvents"
+          name="script-trigger-event-name-dropDown"
           selectedValues={[`${triggerEvent.namespace}:${triggerEvent.name}`]}
           multiSelect={false}
           onChange={(name, values) => {

From 29988c21aa4c642b410166961260e9932c32240c Mon Sep 17 00:00:00 2001
From: thdlam <47620431+thdlam@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:21:09 -0700
Subject: [PATCH 2/2] fix sorting and null text

---
 .../script/editor/scriptEditorEventsTab.tsx        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/scriptEditorEventsTab.tsx b/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/scriptEditorEventsTab.tsx
index 3dea786734..32e52c415a 100644
--- a/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/scriptEditorEventsTab.tsx
+++ b/apps/tenant-management-webapp/src/app/pages/admin/services/script/editor/scriptEditorEventsTab.tsx
@@ -66,7 +66,9 @@ const ScriptEventTriggerDefinitionComponent: FunctionComponent<ScriptTriggerEven
         <tr>
           <td className="payload-details" headers="" colSpan={5}>
             <div className="spacingLarge">Trigger Criteria</div>
-            <div data-testid="trigger-events-details">{JSON.stringify(triggerEvent.criteria?.context, null, 2)}</div>
+            <div data-testid="trigger-events-details">
+              {triggerEvent.criteria?.context ? JSON.stringify(triggerEvent.criteria?.context, null, 2) : null}
+            </div>
             <br />
           </td>
         </tr>
@@ -88,6 +90,14 @@ const ScriptEventTriggerListComponent: FunctionComponent<ScriptEventTriggerListC
   onEdit,
   onDelete,
 }) => {
+  const sortedTriggerEvents = () => {
+    return triggerEvents?.sort((a: ScriptItemTriggerEvent, b: ScriptItemTriggerEvent) => {
+      const concatenatedA = `${a.namespace}:${a.name}`;
+      const concatenatedB = `${b.namespace}:${b.name}`;
+      return concatenatedA.localeCompare(concatenatedB);
+    });
+  };
+
   return (
     <>
       <TriggerEventScrollPane>
@@ -108,7 +118,7 @@ const ScriptEventTriggerListComponent: FunctionComponent<ScriptEventTriggerListC
                   </tr>
                 </thead>
                 <tbody>
-                  {triggerEvents?.sort().map((triggerEvent) => (
+                  {sortedTriggerEvents().map((triggerEvent) => (
                     <ScriptEventTriggerDefinitionComponent
                       onEdit={onEdit}
                       onDelete={onDelete}