allowed dismissing persistent modals on Esc press. allow filtering on certain scripts and agent dropdowns. moved other dropdowns to tactical dropdown. Fixes with bulk actions

src/components/scripts/ScriptFormModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <q-dialog ref="dialogRef" @hide="onDialogHide" persistent :maximized="maximized">
+  <q-dialog ref="dialogRef" @hide="onDialogHide" persistent @keydown.esc="onDialogHide" :maximized="maximized">
     <q-card class="q-dialog-plugin" :style="maximized ? '' : 'width: 70vw; max-width: 90vw'">
       <q-bar>
         {{ title }}
@@ -79,15 +79,16 @@
         </q-card-section>
         <div class="q-px-sm q-pt-none q-pb-sm q-mt-none row">
           <tactical-dropdown
-            label="Script Arguments (press Enter after typing each argument)"
-            filled
-            class="col-12"
             v-model="formScript.args"
+            label="Script Arguments (press Enter after typing each argument)"
+            class="col-12"
+            filled
             use-input
             multiple
             hide-dropdown-icon
             input-debounce="0"
             new-value-mode="add"
+            :readonly="readonly"
           />
         </div>
 

src/components/scripts/ScriptUploadModal.vue

@@ -19,11 +19,11 @@
 
         <q-card-section>
           <tactical-dropdown
+            v-model="script.category"
+            :options="categories"
             label="Category"
             hint="Press Enter or Tab when adding a new value"
             outlined
-            v-model="script.category"
-            :options="categories"
             filterable
             clearable
             new-value-mode="add-unique"
@@ -47,28 +47,17 @@
         </q-card-section>
 
         <q-card-section>
-          <q-select
-            label="Type"
-            dense
-            options-dense
-            outlined
-            v-model="script.shell"
-            :options="shellOptions"
-            emit-value
-            map-options
-          />
+          <tactical-dropdown v-model="script.shell" :options="shellOptions" label="Type" outlined mapOptions />
         </q-card-section>
 
         <q-card-section>
-          <q-select
+          <tactical-dropdown
+            v-model="script.args"
             label="Script Arguments"
             placeholder="(press Enter after typing each argument)"
             filled
-            v-model="script.args"
             use-input
-            use-chips
             multiple
-            dense
             hide-dropdown-icon
             input-debounce="0"
             new-value-mode="add"

src/components/scripts/TestScriptModal.vue

@@ -21,17 +21,15 @@
           />
         </q-card-section>
         <q-card-section>
-          <q-select
+          <tactical-dropdown
+            v-model="args"
             label="Script Arguments (press Enter after typing each argument)"
             filled
-            v-model="args"
             use-input
-            use-chips
             multiple
             hide-dropdown-icon
             input-debounce="0"
             new-value-mode="add"
-            dense
           />
         </q-card-section>
         <q-card-section>
@@ -47,6 +45,7 @@
           />
         </q-card-section>
         <q-card-actions align="right">
+          <q-btn label="Cancel" v-close-popup />
           <q-btn :loading="loading" label="Run" color="primary" type="submit" />
         </q-card-actions>
         <q-card-section v-if="ret" class="q-pl-md q-pr-md q-pt-none q-ma-none scroll" style="max-height: 50vh">