From fb4608227813357d6d88a0cfbfbd6376abf9ae83 Mon Sep 17 00:00:00 2001
From: Luis Igreja <lfsigreja@gmail.com>
Date: Mon, 23 Dec 2024 18:34:21 -0300
Subject: [PATCH 1/2] fix: capture groups input gaps

---
 src/templates/form-fields-inputs/fieldText.vue             | 1 +
 .../FormFields/FormFieldsEdgeApplicationsRulesEngine.vue   | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/templates/form-fields-inputs/fieldText.vue b/src/templates/form-fields-inputs/fieldText.vue
index 4b8b9dee8..7caf848e4 100644
--- a/src/templates/form-fields-inputs/fieldText.vue
+++ b/src/templates/form-fields-inputs/fieldText.vue
@@ -67,6 +67,7 @@
 
 <template>
   <LabelBlock
+    v-if="props.label"
     :for="props.name"
     :data-testid="customTestId.label"
     :label="props.label"
diff --git a/src/views/EdgeApplicationsRulesEngine/FormFields/FormFieldsEdgeApplicationsRulesEngine.vue b/src/views/EdgeApplicationsRulesEngine/FormFields/FormFieldsEdgeApplicationsRulesEngine.vue
index 841ea7b3d..72cf513f6 100644
--- a/src/views/EdgeApplicationsRulesEngine/FormFields/FormFieldsEdgeApplicationsRulesEngine.vue
+++ b/src/views/EdgeApplicationsRulesEngine/FormFields/FormFieldsEdgeApplicationsRulesEngine.vue
@@ -878,18 +878,16 @@
               </FieldDropdown>
             </template>
             <template v-else-if="behaviorItem.value.name === 'capture_match_groups'">
-              <div class="flex flex-col w-full">
+              <div class="flex gap-3 flex-col w-full">
                 <FieldText
-                  class="w-full mb-3"
                   :name="`behaviors[${behaviorIndex}].captured_array`"
                   :key="behaviorItem.key"
-                  placeholder="captured array name"
+                  placeholder="Captured array name"
                   :value="behaviors[behaviorIndex].value.captured_array"
                   :data-testid="`edge-application-rule-form__behaviors-item-capture-match-groups-captured-array[${behaviorIndex}]`"
                 />
                 <FieldText
                   placeholder="Subject"
-                  class="w-full mb-3"
                   :name="`behaviors[${behaviorIndex}].subject`"
                   :key="behaviorItem.key"
                   :value="behaviors[behaviorIndex].value.subject"
@@ -897,7 +895,6 @@
                 />
                 <FieldText
                   placeholder="Regex"
-                  class="w-full"
                   :name="`behaviors[${behaviorIndex}].regex`"
                   :key="behaviorItem.key"
                   :value="behaviors[behaviorIndex].value.regex"

From 016a8b5720e4edbe51d936046d2f13935790be4d Mon Sep 17 00:00:00 2001
From: paulosf0 <paulo.ferreira@azion.com>
Date: Tue, 7 Jan 2025 18:05:43 -0300
Subject: [PATCH 2/2] chore: merged with dev branch

---
 src/services/waf-rules-services/v4/create-waf-rules-service.js  | 2 +-
 src/services/waf-rules-services/v4/edit-waf-rules-service.js    | 2 +-
 .../waf-rules-services/v4/edit-waf-rules-service.test.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/waf-rules-services/v4/create-waf-rules-service.js b/src/services/waf-rules-services/v4/create-waf-rules-service.js
index 89be3b4d2..da03e8ed1 100644
--- a/src/services/waf-rules-services/v4/create-waf-rules-service.js
+++ b/src/services/waf-rules-services/v4/create-waf-rules-service.js
@@ -34,7 +34,7 @@ const adapt = (payload) => {
       cross_site_scripting: payload.crossSiteScripting,
       directory_traversal: payload.directoryTraversal,
       remote_file_inclusion: payload.remoteFileInclusion,
-      sql_injection: payload.sqlInjection,
+      sql_injection: payload.sqlInjection
     }
   }
 }
diff --git a/src/services/waf-rules-services/v4/edit-waf-rules-service.js b/src/services/waf-rules-services/v4/edit-waf-rules-service.js
index ea9ce5d0b..851bf591d 100644
--- a/src/services/waf-rules-services/v4/edit-waf-rules-service.js
+++ b/src/services/waf-rules-services/v4/edit-waf-rules-service.js
@@ -56,4 +56,4 @@ const parseHttpResponse = (httpResponse) => {
     default:
       throw new Error(extractApiError(httpResponse)).message
   }
-}
\ No newline at end of file
+}
diff --git a/src/tests/services/waf-rules-services/v4/edit-waf-rules-service.test.js b/src/tests/services/waf-rules-services/v4/edit-waf-rules-service.test.js
index 229dbe44a..08a92aaa3 100644
--- a/src/tests/services/waf-rules-services/v4/edit-waf-rules-service.test.js
+++ b/src/tests/services/waf-rules-services/v4/edit-waf-rules-service.test.js
@@ -64,7 +64,7 @@ describe('WafRulesServices', () => {
           cross_site_scripting: fixtures.wafRulesMock.crossSiteScripting,
           directory_traversal: fixtures.wafRulesMock.directoryTraversal,
           remote_file_inclusion: fixtures.wafRulesMock.remoteFileInclusion,
-          sql_injection: fixtures.wafRulesMock.sqlInjection,
+          sql_injection: fixtures.wafRulesMock.sqlInjection
         },
         id: fixtures.wafRulesMock.id,
         name: fixtures.wafRulesMock.name,