From 44b4931430e4e842bb3bd3071f1ed847bc802372 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 10 May 2022 15:21:57 +0200
Subject: [PATCH] fix: ui events

---
 app/views/console/functions/function.phtml | 8 ++++++--
 app/views/console/webhooks/webhook.phtml   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/console/functions/function.phtml b/app/views/console/functions/function.phtml
index 4914710555..38d8de8d9c 100644
--- a/app/views/console/functions/function.phtml
+++ b/app/views/console/functions/function.phtml
@@ -7,11 +7,13 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
 $patterns = [];
 
 foreach ($events as $name => $event) {
+    $patterns[] = $name;
     foreach ($event as $key => $value) {
         if (!\str_starts_with($key, '$')) {
             if (!($value['$resource'] ?? false)) {
                 $patterns[] = "{$name}.{$key}";
             } else {
+                $patterns[] = $key;
                 foreach ($value as $key2 => $value2) {
                     if (!\str_starts_with($key2, '$')) {
                         if (!($value2['$resource'] ?? false)) {
@@ -24,6 +26,8 @@ foreach ($events as $name => $event) {
     }
 }
 
+sort($patterns);
+
 ?>
 <div
     data-service="functions.get"
@@ -630,12 +634,12 @@ foreach ($events as $name => $event) {
                             <div x-show="hasResource">
                                 <label x-text="'Select ' + resourceName + ' (optional)'"></label>
                                 <input type="text" :placeholder="resourceName" x-model="resource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
-                                <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard access</div>
+                                <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
                             </div>
                             <div x-show="hasSubResource">
                                 <label x-text="'Select ' + subResourceName + ' (optional)'"></label>
                                 <input type="text" :placeholder="subResourceName" x-model="subResource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
-                                <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard access</div>
+                                <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
                             </div>
                             <div x-show="hasAttribute">
                                 <label for="subResource">Add Attribute (optional)</label>
diff --git a/app/views/console/webhooks/webhook.phtml b/app/views/console/webhooks/webhook.phtml
index 78f02822a3..1e23d83f57 100644
--- a/app/views/console/webhooks/webhook.phtml
+++ b/app/views/console/webhooks/webhook.phtml
@@ -4,11 +4,13 @@ $events = $this->getParam('events', []);
 $patterns = [];
 
 foreach ($events as $name => $event) {
+    $patterns[] = $name;
     foreach ($event as $key => $value) {
         if (!\str_starts_with($key, '$')) {
             if (!($value['$resource'] ?? false)) {
                 $patterns[] = "{$name}.{$key}";
             } else {
+                $patterns[] = $key;
                 foreach ($value as $key2 => $value2) {
                     if (!\str_starts_with($key2, '$')) {
                         if (!($value2['$resource'] ?? false)) {
@@ -21,6 +23,8 @@ foreach ($events as $name => $event) {
     }
 }
 
+sort($patterns);
+
 ?>
 <div
     data-service="projects.getWebhook"
@@ -170,12 +174,12 @@ foreach ($events as $name => $event) {
                         <div x-show="hasResource">
                             <label x-text="'Select ' + resourceName + ' (optional)'"></label>
                             <input type="text" :placeholder="resourceName" x-model="resource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
-                            <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard access</div>
+                            <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
                         </div>
                         <div x-show="hasSubResource">
                             <label x-text="'Select ' + subResourceName + ' (optional)'"></label>
                             <input type="text" :placeholder="subResourceName" x-model="subResource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
-                            <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard access</div>
+                            <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
                         </div>
                         <div x-show="hasAttribute">
                             <label for="subResource">Add Attribute (optional)</label>