fixed ui for webhooks to update

akto-api-security · Nov 6, 2023 · 73713bc · 73713bc
1 parent 48733e4
commit 73713bc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/...board/web/polaris_web/web/src/apps/dashboard/components/shared/ApiCollectionsDropdown.jsx b/...board/web/polaris_web/web/src/apps/dashboard/components/shared/ApiCollectionsDropdown.jsx
@@ -22,7 +22,7 @@ function ApiCollectionsDropdown({ selectedCollections, setSelectedCollections })
         [],
     );
 
-    const [selectedOptions, setSelectedOptions] = useState(selectedCollections);
+    const [selectedOptions, setSelectedOptions] = useState(selectedCollections ? selectedCollections : []);
     const [inputValue, setInputValue] = useState('');
     const [options, setOptions] = useState(deselectedOptions);
 
@@ -68,7 +68,7 @@ function ApiCollectionsDropdown({ selectedCollections, setSelectedCollections })
                     <Listbox.Option
                         key={`${value}`}
                         value={value}
-                        selected={selectedOptions.includes(value)}
+                        selected={selectedOptions && selectedOptions.includes(value)}
                         accessibilityLabel={label}
                     >
                         {label}

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SampleData.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SampleData.js
@@ -147,9 +147,11 @@ function SampleData(props) {
     }, [])
 
     if (instance){
-      instance.onDidChangeModelContent(()=> {
-          getEditorData(instance.getValue())
-      })
+      if (!readOnly) {
+        instance.onDidChangeModelContent(()=> {
+            getEditorData(instance.getValue())
+        })
+      }
     }
 
     useEffect(() => {

diff --git a/...d/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/webhooks/Webhook.jsx b/...d/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/webhooks/Webhook.jsx
@@ -129,8 +129,6 @@ function Webhook() {
         },
     ];
 
-    const customWebhookFindId = customWebhooks.find(customWebhook => customWebhook.id.toString() === webhookId)
-
     function handleWebhookTabChange(selectedTabIndex) {
         setSelectedWebhookTab(selectedTabIndex)
     }
@@ -201,9 +199,7 @@ function Webhook() {
     }
 
     function getSelectedCollections(collectionStateField) {
-        const customWebhookFindId = customWebhooks.find(customWebhook => customWebhook.id.toString() === webhookId)
-
-        if (customWebhookFindId) return customWebhookFindId[collectionStateField]
+        if (webhook) return webhook[collectionStateField]
         else return []
     }
 
@@ -269,15 +265,15 @@ function Webhook() {
     )
 
 
-    let Card
+    let CardComponent
     let CardTitle
     let actionContent
     if (showOptions) {
-        Card = OptionsCard
+        CardComponent = OptionsCard
         CardTitle = "Options"
         actionContent = "Custom"
     } else {
-        Card = CustomWebhookEditor
+        CardComponent = CustomWebhookEditor
         CardTitle = "Custom"
         actionContent = "Default"
     }
@@ -289,7 +285,7 @@ function Webhook() {
     const OverallCard = (
         <LegacyCard title={CardTitle} key="options" actions={[{content: actionContent, onAction: toggleShowOptions}]}>
             <LegacyCard.Section>
-                {Card}
+                {CardComponent}
                 <Divider />
                 <div style={{ paddingTop: "10px" }}>
                     <Text variant="headingMd">Run every</Text>
@@ -335,7 +331,7 @@ function Webhook() {
         isLoading ? <SpinnerCentered /> :
             <PageWithMultipleCards
                 title={webhookId ?
-                    customWebhookFindId ? customWebhookFindId.webhookName : ''
+                    webhook? webhook.webhookName : ''
                     : "Create custom webhook"}
                 divider
                 backUrl="/dashboard/settings/integrations/webhooks"