Revert "Debug subscription filters fix (#1967)" (#1975)

This reverts commit 93f949d.

Author: faderskd

hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/path-filter-row/PathFilterRow.vue

@@ -21,7 +21,7 @@
 </script>
 
 <template>
-  <v-row class="my-0" v-if="props.type === 'created'">
+  <v-row class="mt-0">
     <v-col cols="5">
       <v-combobox
         :items="paths"
@@ -55,25 +55,21 @@
 
     <v-col cols="1">
       <v-btn
+        v-if="props.type === 'new'"
         :ripple="false"
-        color="error"
-        icon="mdi-delete"
+        color="success"
+        icon="mdi-plus-circle"
         variant="text"
-        @click="$emit('remove')"
+        @click="$emit('add')"
       />
-    </v-col>
-  </v-row>
-  <v-row class="mt-0" v-else justify="end">
-    <v-col class="pt-0" cols="2">
       <v-btn
-        v-if="props.type === 'new'"
+        v-else
         :ripple="false"
-        color="success"
+        color="error"
+        icon="mdi-delete"
         variant="text"
-        @click="$emit('add')"
-      >
-        Add Filter
-      </v-btn>
+        @click="$emit('remove')"
+      />
     </v-col>
   </v-row>
 </template>

hermes-console/src/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue

@@ -46,7 +46,6 @@
     v-model:matcher="newFilterMatcher"
     @add="addFilter()"
     type="new"
-    class="mb-3"
   />
 </template>
 

hermes-console/src/views/subscription/subscription-form/subscription-header-filters/header-filter-row/HeaderFilterRow.vue

@@ -22,8 +22,8 @@
 
 <template>
   <v-form v-model="isFormValid" @submit.prevent="submit">
-    <v-row v-if="props.type === 'created'">
-      <v-col cols="5">
+    <v-row>
+      <v-col>
         <text-field
           :model-value="props.name"
           @input="$emit('update:name', $event.target.value)"
@@ -32,7 +32,7 @@
         />
       </v-col>
 
-      <v-col cols="5">
+      <v-col>
         <text-field
           :model-value="props.matcher"
           @input="$emit('update:matcher', $event.target.value)"
@@ -43,6 +43,15 @@
 
       <v-col>
         <v-btn
+          v-if="props.type === 'new'"
+          type="submit"
+          :ripple="false"
+          variant="text"
+          icon="mdi-plus-circle"
+          color="success"
+        />
+        <v-btn
+          v-else
           type="submit"
           :ripple="false"
           variant="text"
@@ -51,11 +60,6 @@
         />
       </v-col>
     </v-row>
-    <v-row v-else justify="end">
-      <v-btn type="submit" :ripple="false" variant="text" color="success">
-        Add Filter
-      </v-btn>
-    </v-row>
   </v-form>
 </template>