From 10a304d360154262d696f324df85b0d6a304dc42 Mon Sep 17 00:00:00 2001
From: Ryan Galletto <ryan.galletto@netfoundry.io>
Date: Mon, 10 Jun 2024 14:21:41 -0400
Subject: [PATCH 1/2] Fix editing and saving of configs on the Config
 Management page

---
 .../features/wrappers/zac-wrapper.service.ts  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.service.ts b/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.service.ts
index 5c0a6d7b..9a632316 100644
--- a/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.service.ts
+++ b/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.service.ts
@@ -768,6 +768,7 @@ export class ZacWrapperService extends ZacWrapperServiceClass {
                 }
             }
         }
+        saveParams.data = this.redefineObject(saveParams.data);
         for (const prop in saveParams.data) {
             if (Array.isArray(saveParams.data[prop]) && saveParams.data[prop].length == 0) {
                 delete saveParams.data[prop];
@@ -812,6 +813,26 @@ export class ZacWrapperService extends ZacWrapperServiceClass {
         });
     }
 
+    redefineObject(obj) {
+        for (let prop in obj) {
+            if (Array.isArray(obj[prop]) && obj[prop].length==0) {
+                delete obj[prop];
+            } else {
+                if (typeof obj[prop] === "string" && obj[prop].trim().length==0) {
+                    delete obj[prop];
+                } else {
+                    if (typeof obj[prop] === "object") {
+                        obj[prop] = this.redefineObject(obj[prop]);
+                        if (Object.keys(obj[prop]).length==0) {
+                            delete obj[prop];
+                        }
+                    }
+                }
+            }
+        }
+        return obj;
+    }
+
     saveZitiSubData(params: any, returnTo: any) {
         const controllerDomain = this.settingsService?.settings?.selectedEdgeController || '';
         const serviceUrl = `${controllerDomain}/edge/management/v1`;

From 72b84fc1db5809e0c13f0a43ab4a947d510ac7a4 Mon Sep 17 00:00:00 2001
From: Ryan Galletto <ryan.galletto@netfoundry.io>
Date: Mon, 10 Jun 2024 14:36:51 -0400
Subject: [PATCH 2/2] Added mattermost webhook

---
 .github/workflows/mattermost-webhook.yml | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/mattermost-webhook.yml

diff --git a/.github/workflows/mattermost-webhook.yml b/.github/workflows/mattermost-webhook.yml
new file mode 100644
index 00000000..eb318541
--- /dev/null
+++ b/.github/workflows/mattermost-webhook.yml
@@ -0,0 +1,27 @@
+name: mattermost-ziti-webhook
+on:
+  create:
+  delete:
+  issues:
+  issue_comment:
+  pull_request_review:
+  pull_request_review_comment:
+  pull_request:
+  push:
+  fork:
+  release:
+
+jobs:
+  mattermost-ziti-webhook:
+    runs-on: ubuntu-latest
+    name: POST Webhook
+    if: github.repository_owner == 'openziti' && github.actor != 'dependabot[bot]'
+    env:
+      ZITI_LOG: 99
+      ZITI_NODEJS_LOG: 99
+    steps:
+      - uses: openziti/ziti-webhook-action@main
+        with:
+          ziti-id: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
+          webhook-url: ${{ secrets.ZITI_MATTERMOST_WEBHOOK_URL }}
+          webhook-secret: ${{ secrets.ZITI_MATTERMOSTI_WEBHOOK_SECRET }}
\ No newline at end of file