From 78c7fab9ccc791be2cd37cc066ff66e508fd442c Mon Sep 17 00:00:00 2001
From: fiftin <denguk@gmail.com>
Date: Mon, 22 Jul 2024 17:40:18 +0500
Subject: [PATCH 1/3] feat(ui): replace codemirror with argspicker for tasks

---
 web/src/components/TaskForm.vue | 98 ++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/web/src/components/TaskForm.vue b/web/src/components/TaskForm.vue
index a9d8d254d..f5e144425 100644
--- a/web/src/components/TaskForm.vue
+++ b/web/src/components/TaskForm.vue
@@ -91,49 +91,55 @@
     <TaskParamsForm v-if="template.app === 'ansible'" v-model="item" :app="template.app" />
     <TaskParamsForm v-else v-model="item.params" :app="template.app" />
 
-    <div class="mt-4" v-if="!advancedOptions">
-      <a @click="advancedOptions = true">
-        {{ $t('advanced') }}
-        <v-icon style="transform: translateY(-1px)">mdi-chevron-right</v-icon>
-      </a>
-    </div>
-
-    <div class="mt-4" v-else>
-      <a @click="advancedOptions = false">
-        {{ $t('hide') }}
-        <v-icon style="transform: translateY(-1px)">mdi-chevron-up</v-icon>
-      </a>
-    </div>
-
-    <v-alert
-      v-if="advancedOptions && !template.allow_override_args_in_task"
-      color="info"
-      dense
-      text
-      class="mb-2"
-    >
-      <div style="position: relative; margin-top: 10px;">
-        <video
-          autoplay
-          muted
-          style="width: 100%; border-radius: 4px;"
-        >
-          <source
-            src="/allow-override-cli-args-in-task.mp4"
-            type="video/mp4"/>
-        </video>
-      </div>
-    </v-alert>
-
-    <codemirror
-      class="mt-4"
-      v-if="advancedOptions && template.allow_override_args_in_task"
-      :style="{ border: '1px solid lightgray' }"
-      v-model="item.arguments"
-      :options="cmOptions"
-      :placeholder="$t('cliArgsJsonArrayExampleIMyinventoryshPrivatekeythe')"
+<!--    <div class="mt-4" v-if="!advancedOptions">-->
+<!--      <a @click="advancedOptions = true">-->
+<!--        {{ $t('advanced') }}-->
+<!--        <v-icon style="transform: translateY(-1px)">mdi-chevron-right</v-icon>-->
+<!--      </a>-->
+<!--    </div>-->
+
+<!--    <div class="mt-4" v-else>-->
+<!--      <a @click="advancedOptions = false">-->
+<!--        {{ $t('hide') }}-->
+<!--        <v-icon style="transform: translateY(-1px)">mdi-chevron-up</v-icon>-->
+<!--      </a>-->
+<!--    </div>-->
+
+<!--    <v-alert-->
+<!--      v-if="advancedOptions && !template.allow_override_args_in_task"-->
+<!--      color="info"-->
+<!--      dense-->
+<!--      text-->
+<!--      class="mb-2"-->
+<!--    >-->
+<!--      <div style="position: relative; margin-top: 10px;">-->
+<!--        <video-->
+<!--          autoplay-->
+<!--          muted-->
+<!--          style="width: 100%; border-radius: 4px;"-->
+<!--        >-->
+<!--          <source-->
+<!--            src="/allow-override-cli-args-in-task.mp4"-->
+<!--            type="video/mp4"/>-->
+<!--        </video>-->
+<!--      </div>-->
+<!--    </v-alert>-->
+
+    <ArgsPicker
+      v-if="template.allow_override_args_in_task"
+      :vars="args"
+      @change="setArgs"
     />
 
+<!--    <codemirror-->
+<!--      class="mt-4"-->
+<!--      v-if="advancedOptions && template.allow_override_args_in_task"-->
+<!--      :style="{ border: '1px solid lightgray' }"-->
+<!--      v-model="item.arguments"-->
+<!--      :options="cmOptions"-->
+<!--      :placeholder="$t('cliArgsJsonArrayExampleIMyinventoryshPrivatekeythe')"-->
+<!--    />-->
+
   </v-form>
 </template>
 <script>
@@ -141,12 +147,13 @@
 
 import ItemFormBase from '@/components/ItemFormBase';
 import axios from 'axios';
-import { codemirror } from 'vue-codemirror';
+// import { codemirror } from 'vue-codemirror';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/mode/vue/vue.js';
 import 'codemirror/addon/lint/json-lint.js';
 import 'codemirror/addon/display/placeholder.js';
 import TaskParamsForm from '@/components/TaskParamsForm.vue';
+import ArgsPicker from '@/components/ArgsPicker.vue';
 
 export default {
   mixins: [ItemFormBase],
@@ -155,8 +162,9 @@ export default {
     sourceTask: Object,
   },
   components: {
+    ArgsPicker,
     TaskParamsForm,
-    codemirror,
+    // codemirror,
   },
   data() {
     return {
@@ -173,7 +181,7 @@ export default {
         lint: true,
         indentWithTabs: false,
       },
-      advancedOptions: false,
+      // advancedOptions: false,
     };
   },
   watch: {
@@ -248,7 +256,7 @@ export default {
         this.item.params = {};
       }
 
-      this.advancedOptions = this.item.arguments != null;
+      // this.advancedOptions = this.item.arguments != null;
 
       this.template = (await axios({
         keys: 'get',

From f3399e2829a77abaac7691606b7b8b12954dbd38 Mon Sep 17 00:00:00 2001
From: fiftin <denguk@gmail.com>
Date: Mon, 22 Jul 2024 17:49:52 +0500
Subject: [PATCH 2/3] feat(tasks): use ArgPicker on UI

---
 .dredd/hooks/helpers.go         |  2 +-
 web/src/components/TaskForm.vue | 54 +++++++--------------------------
 2 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/.dredd/hooks/helpers.go b/.dredd/hooks/helpers.go
index 8bc8877d2..0a7922494 100644
--- a/.dredd/hooks/helpers.go
+++ b/.dredd/hooks/helpers.go
@@ -211,7 +211,7 @@ func addSchedule() *db.Schedule {
 func addTask() *db.Task {
 	t := db.Task{
 		ProjectID:  userProject.ID,
-		TemplateID: int(templateID),
+		TemplateID: templateID,
 		Status:     "testing",
 		UserID:     &userPathTestUser.ID,
 		Created:    db.GetParsedTime(time.Now()),
diff --git a/web/src/components/TaskForm.vue b/web/src/components/TaskForm.vue
index f5e144425..99621a254 100644
--- a/web/src/components/TaskForm.vue
+++ b/web/src/components/TaskForm.vue
@@ -91,55 +91,12 @@
     <TaskParamsForm v-if="template.app === 'ansible'" v-model="item" :app="template.app" />
     <TaskParamsForm v-else v-model="item.params" :app="template.app" />
 
-<!--    <div class="mt-4" v-if="!advancedOptions">-->
-<!--      <a @click="advancedOptions = true">-->
-<!--        {{ $t('advanced') }}-->
-<!--        <v-icon style="transform: translateY(-1px)">mdi-chevron-right</v-icon>-->
-<!--      </a>-->
-<!--    </div>-->
-
-<!--    <div class="mt-4" v-else>-->
-<!--      <a @click="advancedOptions = false">-->
-<!--        {{ $t('hide') }}-->
-<!--        <v-icon style="transform: translateY(-1px)">mdi-chevron-up</v-icon>-->
-<!--      </a>-->
-<!--    </div>-->
-
-<!--    <v-alert-->
-<!--      v-if="advancedOptions && !template.allow_override_args_in_task"-->
-<!--      color="info"-->
-<!--      dense-->
-<!--      text-->
-<!--      class="mb-2"-->
-<!--    >-->
-<!--      <div style="position: relative; margin-top: 10px;">-->
-<!--        <video-->
-<!--          autoplay-->
-<!--          muted-->
-<!--          style="width: 100%; border-radius: 4px;"-->
-<!--        >-->
-<!--          <source-->
-<!--            src="/allow-override-cli-args-in-task.mp4"-->
-<!--            type="video/mp4"/>-->
-<!--        </video>-->
-<!--      </div>-->
-<!--    </v-alert>-->
-
     <ArgsPicker
       v-if="template.allow_override_args_in_task"
       :vars="args"
       @change="setArgs"
     />
 
-<!--    <codemirror-->
-<!--      class="mt-4"-->
-<!--      v-if="advancedOptions && template.allow_override_args_in_task"-->
-<!--      :style="{ border: '1px solid lightgray' }"-->
-<!--      v-model="item.arguments"-->
-<!--      :options="cmOptions"-->
-<!--      :placeholder="$t('cliArgsJsonArrayExampleIMyinventoryshPrivatekeythe')"-->
-<!--    />-->
-
   </v-form>
 </template>
 <script>
@@ -184,6 +141,12 @@ export default {
       // advancedOptions: false,
     };
   },
+  computed: {
+    args() {
+      return JSON.parse(this.item.arguments || '[]');
+    },
+  },
+
   watch: {
     needReset(val) {
       if (val) {
@@ -205,7 +168,12 @@ export default {
       }
     },
   },
+
   methods: {
+    setArgs(args) {
+      this.item.arguments = JSON.stringify(args || []);
+    },
+
     getTaskMessage(task) {
       let buildTask = task;
 

From 8b99d49968653c2b78813d1daf72bb213dd64d21 Mon Sep 17 00:00:00 2001
From: fiftin <denguk@gmail.com>
Date: Mon, 22 Jul 2024 19:21:09 +0500
Subject: [PATCH 3/3] fix(i8n): add some strings

---
 web/src/lang/en.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/src/lang/en.js b/web/src/lang/en.js
index 11d4a9fb6..50dcb8ca8 100644
--- a/web/src/lang/en.js
+++ b/web/src/lang/en.js
@@ -1,4 +1,6 @@
 export default {
+  'Check interval': 'Check interval',
+  Schedule: 'Schedule',
   backup: 'Backup',
   downloadTheProjectBackupFile: 'Download the project backup file (in json)',
   restoreProject: 'Restore Project...',