From 6552b1c13a5a0bf2e49a879a6febe03611a06ddf Mon Sep 17 00:00:00 2001
From: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Date: Sun, 29 Jan 2023 15:45:18 -0500
Subject: [PATCH 1/2] support repeat arguments

support `repeat` argument in `dargs.Argument`

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
---
 src/components/dargs/DargsInput.vue |   2 +-
 src/components/dargs/DargsItem.vue  | 112 ++++++++++++++++++++++++++--
 src/locales/en.json                 |   4 +-
 src/views/NewConfig.vue             |   2 +-
 4 files changed, 109 insertions(+), 11 deletions(-)

diff --git a/src/components/dargs/DargsInput.vue b/src/components/dargs/DargsInput.vue
index 96a2507f..6a4ebb72 100644
--- a/src/components/dargs/DargsInput.vue
+++ b/src/components/dargs/DargsInput.vue
@@ -4,7 +4,7 @@
       v-model="file"
       :label="$t('message.load_json')"
       accept=".json"
-      @change="from_json_file(file)"
+      @change="from_json_file(file[0])"
     />
     <v-row v-if="examples">
       <v-col>
diff --git a/src/components/dargs/DargsItem.vue b/src/components/dargs/DargsItem.vue
index aeb75cdb..454269b4 100644
--- a/src/components/dargs/DargsItem.vue
+++ b/src/components/dargs/DargsItem.vue
@@ -42,9 +42,53 @@
             />
           </v-col>
         </v-row>
+        <!-- list of arguments, repeat=True -->
+        <v-row v-if="select_type == 'list' && jdata.repeat" class="w-100">
+          <v-col cols="auto">
+          <v-list>
+            <v-card variant="outlined">
+            <v-list-item-title class="font-weight-black"> {{ jdata.name }}</v-list-item-title>
+            <p class="text--secondary"> {{ jdata.doc }}</p>
+            <v-list-item v-for="(rr_jdata, index) in repeat_jdata" :key="index">
+              <v-card variant="outlined">
+              <v-list-item-title class="font-weight-bold"> {{ jdata.name }} - Item {{ index }}</v-list-item-title>
+              <v-btn
+              block
+              @click="remove_repeat(index)"
+              prepend-icon="fa-solid fa-trash"
+              color="error"
+            >
+              {{ $t('message.remove_repeat', { index }) }}
+            </v-btn>
+              <v-list>
+                <v-list-item
+                  v-for="item in rr_jdata.sub_fields"
+                  :key="item.name"
+                >
+                  <!-- jdata.sub_fields is object -->
+                  <DargsItem
+                    :ref="'subitem_' + index"
+                    :jdata="item"
+                  />
+                </v-list-item>
+              </v-list>
+            </v-card>
+            </v-list-item>
+            <v-btn
+              block
+              @click="add_repeat()"
+              prepend-icon="fa-solid fa-plus"
+            >
+              {{ $t('message.add_repeat') }}
+            </v-btn>
+        </v-card>
+          </v-list>
+        </v-col>
+        </v-row>
+
         <!-- text areas for list -->
         <v-textarea
-          v-if="select_type == 'list'"
+          v-else-if="select_type == 'list'"
           v-model="value"
           :hint="$t('message.one_element_per_row') + '\n' + jdata.doc"
           :placeholder="select_type"
@@ -112,9 +156,10 @@
 
         <div v-else-if="select_type == 'dict'">
           <!-- dict sub_fields -->
-          <v-list v-if="Object.keys(jdata.sub_fields).length">
-            <v-list-item-title> {{ jdata.name }}</v-list-item-title>
-            <v-list-item-subtitle> {{ jdata.doc }}</v-list-item-subtitle>
+          <v-card variant="outlined" v-if="Object.keys(jdata.sub_fields).length">
+          <v-list>
+            <v-list-item-title class="font-weight-black"> {{ jdata.name }}</v-list-item-title>
+            <p class="text--secondary"> {{ jdata.doc }}</p>
             <v-list-item
               v-for="item in jdata.sub_fields"
               :key="item.name"
@@ -126,14 +171,15 @@
               />
             </v-list-item>
           </v-list>
+        </v-card>
 
           <!-- dict variant -->
           <v-list
             v-if="Object.keys(jdata.sub_variants).length"
             subheader
           >
-            <v-list-item-title> {{ jdata.name }}</v-list-item-title>
-            <v-list-item-subtitle> {{ jdata.doc }}</v-list-item-subtitle>
+            <v-list-item-title class="font-weight-black"> {{ jdata.name }}</v-list-item-title>
+            <p class="text--secondary"> {{ jdata.doc }}</p>
             <v-list-item
               v-for="item in jdata.sub_variants"
               :key="item.name"
@@ -173,9 +219,10 @@
       </v-col>
     </v-row>
   </div>
-  <div
+  <v-card
     v-else-if="jdata.object == 'Variant'"
     class="w-100"
+    variant="outlined"
   >
     <v-tabs
       v-model="tab"
@@ -203,7 +250,7 @@
         </v-card>
       </v-window-item>
     </v-window>
-  </div>
+  </v-card>
 </template>
 
 <script>
@@ -214,6 +261,7 @@ export default {
   },
   data() {
     var tab = 0;
+    const repeat_jdata = [];
     if (this.jdata.object == "Variant") {
       if (this.jdata.default_tag) {
         tab = Object.keys(this.jdata.choice_dict).indexOf(
@@ -221,6 +269,9 @@ export default {
         );
       }
       if (tab < 0) tab = 0;
+    } else if (this.jdata.object == "Argument" && this.jdata.repeat) {
+      // init with one element
+      repeat_jdata.push(this.jdata);
     }
     return {
       tab: tab,
@@ -231,6 +282,7 @@ export default {
         number: [(value) => !value || !isNaN(value) || "Number required."],
       },
       select_type: this.jdata.type && this.jdata.type[0],
+      repeat_jdata,
     };
   },
   methods: {
@@ -249,6 +301,19 @@ export default {
         );
       } else if (this.jdata.object == "Argument") {
         if (this.select_type == "list") {
+          if (this.jdata.repeat) {
+            return [...Array(this.repeat_jdata.length).keys()].map((ii) => {
+              return Object.keys(this.jdata.sub_fields).length
+                ? Object.fromEntries(
+                    new Map(
+                      this.$refs[`subitem_${ii}`]
+                        .filter((vv) => !vv.jdata.optional || vv.check)
+                        .map((vv) => [vv.jdata.name, vv.dvalue()])
+                    )
+                  )
+                : Object();
+            });
+          } else {
           // textarea -> list
           if (!this.value) return [];
           return this.value
@@ -261,6 +326,7 @@ export default {
                 return v;
               }
             });
+          }
         } else if (["str", "int", "float"].includes(this.select_type)) {
           if (!this.value) {
             if (this.select_type == "str") return "";
@@ -347,9 +413,33 @@ export default {
         load_subitem();
       } else if (this.jdata.object == "Argument") {
         if (this.jdata.type.includes("list") && Array.isArray(obj)) {
+          if(this.jdata.repeat){
+            this.repeat_jdata = [];
+            [...Array(obj.length).keys()].forEach((ii) => {
+              this.repeat_jdata.push(this.jdata);
+            });
+            [...Array(obj.length).keys()].forEach((ii) => {
+              var subobj = obj[ii];
+              if (this.$refs[`subitem_${ii}`])
+                this.$refs[`subitem_${ii}`].forEach((vv) => {
+                  // check if it exists, name and alias
+                  if (vv.jdata.name in subobj) {
+                    // exists
+                    vv.load(subobj[vv.jdata.name]);
+                  }
+                  vv.jdata.alias.forEach((aa) => {
+                    if (aa in subobj) vv.load(subobj[aa]);
+                  });
+                  if (vv.jdata.optional) {
+                    vv.check = vv.jdata.name in subobj;
+                  }
+                });
+            });
+          }else{
           // list -> multiple line str
           this.select_type = "list";
           this.value = obj.map(JSON.stringify).join("\n");
+          }
         } else if (this.jdata.type.includes("str") && typeof obj == "string") {
           this.select_type = "str";
           this.value = obj;
@@ -407,6 +497,12 @@ export default {
         this.$refs["subitem"][this.tab].load(obj);
       }
     },
+    add_repeat: function() {
+      this.repeat_jdata.push(this.jdata);
+    },
+    remove_repeat: function(index) {
+      this.repeat_jdata.splice(index, 1);
+    },
   },
 };
 </script>
diff --git a/src/locales/en.json b/src/locales/en.json
index efcc27ba..3d2280d4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -21,6 +21,8 @@
         "home": "Home",
         "software_input": "Software Input",
         "setting": "Setting | Settings",
-        "management": "Management"
+        "management": "Management",
+        "add_repeat": "Add Item",
+        "remove_repeat": "Remove Item {index}"
     }
 }
diff --git a/src/views/NewConfig.vue b/src/views/NewConfig.vue
index f14a0f8f..e0049971 100644
--- a/src/views/NewConfig.vue
+++ b/src/views/NewConfig.vue
@@ -46,7 +46,7 @@ export default {
         that.$router.push("/input");
         that.$root.$app.update_navi();
       };
-      reader.readAsText(this.file);
+      reader.readAsText(this.file[0]);
     },
   },
 };

From ff21f2ddbf22ad3402471dfe050af15dc64a5404 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 07:29:20 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/components/dargs/DargsItem.vue | 131 +++++++++++++++++------------
 1 file changed, 77 insertions(+), 54 deletions(-)

diff --git a/src/components/dargs/DargsItem.vue b/src/components/dargs/DargsItem.vue
index 454269b4..73a0daee 100644
--- a/src/components/dargs/DargsItem.vue
+++ b/src/components/dargs/DargsItem.vue
@@ -43,47 +43,59 @@
           </v-col>
         </v-row>
         <!-- list of arguments, repeat=True -->
-        <v-row v-if="select_type == 'list' && jdata.repeat" class="w-100">
+        <v-row
+          v-if="select_type == 'list' && jdata.repeat"
+          class="w-100"
+        >
           <v-col cols="auto">
-          <v-list>
-            <v-card variant="outlined">
-            <v-list-item-title class="font-weight-black"> {{ jdata.name }}</v-list-item-title>
-            <p class="text--secondary"> {{ jdata.doc }}</p>
-            <v-list-item v-for="(rr_jdata, index) in repeat_jdata" :key="index">
+            <v-list>
               <v-card variant="outlined">
-              <v-list-item-title class="font-weight-bold"> {{ jdata.name }} - Item {{ index }}</v-list-item-title>
-              <v-btn
-              block
-              @click="remove_repeat(index)"
-              prepend-icon="fa-solid fa-trash"
-              color="error"
-            >
-              {{ $t('message.remove_repeat', { index }) }}
-            </v-btn>
-              <v-list>
+                <v-list-item-title class="font-weight-black">
+                  {{ jdata.name }}
+                </v-list-item-title>
+                <p class="text--secondary">
+                  {{ jdata.doc }}
+                </p>
                 <v-list-item
-                  v-for="item in rr_jdata.sub_fields"
-                  :key="item.name"
+                  v-for="(rr_jdata, index) in repeat_jdata"
+                  :key="index"
                 >
-                  <!-- jdata.sub_fields is object -->
-                  <DargsItem
-                    :ref="'subitem_' + index"
-                    :jdata="item"
-                  />
+                  <v-card variant="outlined">
+                    <v-list-item-title class="font-weight-bold">
+                      {{ jdata.name }} - Item {{ index }}
+                    </v-list-item-title>
+                    <v-btn
+                      block
+                      prepend-icon="fa-solid fa-trash"
+                      color="error"
+                      @click="remove_repeat(index)"
+                    >
+                      {{ $t('message.remove_repeat', { index }) }}
+                    </v-btn>
+                    <v-list>
+                      <v-list-item
+                        v-for="item in rr_jdata.sub_fields"
+                        :key="item.name"
+                      >
+                        <!-- jdata.sub_fields is object -->
+                        <DargsItem
+                          :ref="'subitem_' + index"
+                          :jdata="item"
+                        />
+                      </v-list-item>
+                    </v-list>
+                  </v-card>
                 </v-list-item>
-              </v-list>
-            </v-card>
-            </v-list-item>
-            <v-btn
-              block
-              @click="add_repeat()"
-              prepend-icon="fa-solid fa-plus"
-            >
-              {{ $t('message.add_repeat') }}
-            </v-btn>
-        </v-card>
-          </v-list>
-        </v-col>
+                <v-btn
+                  block
+                  prepend-icon="fa-solid fa-plus"
+                  @click="add_repeat()"
+                >
+                  {{ $t('message.add_repeat') }}
+                </v-btn>
+              </v-card>
+            </v-list>
+          </v-col>
         </v-row>
 
         <!-- text areas for list -->
@@ -156,30 +168,41 @@
 
         <div v-else-if="select_type == 'dict'">
           <!-- dict sub_fields -->
-          <v-card variant="outlined" v-if="Object.keys(jdata.sub_fields).length">
-          <v-list>
-            <v-list-item-title class="font-weight-black"> {{ jdata.name }}</v-list-item-title>
-            <p class="text--secondary"> {{ jdata.doc }}</p>
-            <v-list-item
-              v-for="item in jdata.sub_fields"
-              :key="item.name"
-            >
-              <!-- jdata.sub_fields is object -->
-              <DargsItem
-                ref="subitem"
-                :jdata="item"
-              />
-            </v-list-item>
-          </v-list>
-        </v-card>
+          <v-card
+            v-if="Object.keys(jdata.sub_fields).length"
+            variant="outlined"
+          >
+            <v-list>
+              <v-list-item-title class="font-weight-black">
+                {{ jdata.name }}
+              </v-list-item-title>
+              <p class="text--secondary">
+                {{ jdata.doc }}
+              </p>
+              <v-list-item
+                v-for="item in jdata.sub_fields"
+                :key="item.name"
+              >
+                <!-- jdata.sub_fields is object -->
+                <DargsItem
+                  ref="subitem"
+                  :jdata="item"
+                />
+              </v-list-item>
+            </v-list>
+          </v-card>
 
           <!-- dict variant -->
           <v-list
             v-if="Object.keys(jdata.sub_variants).length"
             subheader
           >
-            <v-list-item-title class="font-weight-black"> {{ jdata.name }}</v-list-item-title>
-            <p class="text--secondary"> {{ jdata.doc }}</p>
+            <v-list-item-title class="font-weight-black">
+              {{ jdata.name }}
+            </v-list-item-title>
+            <p class="text--secondary">
+              {{ jdata.doc }}
+            </p>
             <v-list-item
               v-for="item in jdata.sub_variants"
               :key="item.name"