From 1ec526c9a0fec62b72a30a79651bce9ad78a64f5 Mon Sep 17 00:00:00 2001
From: lishutong <lishutong@google.com>
Date: Thu, 19 Aug 2021 05:26:07 +0000
Subject: [PATCH] Add support for reuse configuration in OTA generator.

Use vuex to store the otaConfig, now the history configurations can be
reused in the job detail page. Also the targetBuilds, incrementalSources
are not stored in vuex as well. Once the targetBuilds are chosen, it
will not lose the states when switching the tab between singleOTA,
batchOTA and chainOTA.

Test: npm run test:unit
Change-Id: I563ac0c79fd0cedd5e71e8722b956545f6624551
---
 .../otagui/src/components/BatchOTAOptions.vue | 35 +++++++------
 .../otagui/src/components/ChainOTAOptions.vue | 34 ++++++++++---
 tools/otagui/src/components/OTAOptions.vue    | 31 ++++++++---
 .../otagui/src/components/PartialCheckbox.vue | 16 ++++--
 .../src/components/SingleOTAOptions.vue       | 35 +++++++------
 tools/otagui/src/store/index.js               | 51 ++++++++++++++++++-
 tools/otagui/src/views/JobConfigure.vue       |  9 ++--
 tools/otagui/src/views/JobDetails.vue         | 11 ++++
 8 files changed, 170 insertions(+), 52 deletions(-)

diff --git a/tools/otagui/src/components/BatchOTAOptions.vue b/tools/otagui/src/components/BatchOTAOptions.vue
index 6f3126018..fcbc6e01b 100644
--- a/tools/otagui/src/components/BatchOTAOptions.vue
+++ b/tools/otagui/src/components/BatchOTAOptions.vue
@@ -2,7 +2,7 @@
   <form @submit.prevent="sendForm">
     <FileList
       v-model="incrementalSources"
-      :disabled="!otaConfig.isIncremental"
+      :disabled="!checkIncremental"
       label="Source files"
     />
     <v-divider />
@@ -14,7 +14,6 @@
     <OTAOptions
       :targetDetails="targetDetails"
       :targetBuilds="targetBuilds"
-      @update:otaConfig="otaConfig=$event"
     />
     <v-divider class="my-5" />
     <v-btn
@@ -29,7 +28,6 @@
 <script>
 import OTAOptions from '@/components/OTAOptions.vue'
 import FileList from '@/components/FileList.vue'
-import { OTAConfiguration } from '@/services/JobSubmission.js'
 
 export default {
   components: {
@@ -44,25 +42,30 @@ export default {
   },
   data() {
     return {
-      incrementalSources: [],
-      targetBuilds: [],
-      otaConfig: new OTAConfiguration(),
     }
   },
   computed: {
     checkIncremental() {
-      return this.otaConfig.isIncremental
+      return this.$store.state.otaConfig.isIncremental
     },
-  },
-  watch: {
-    checkIncremental: {
-      handler: function () {
-        this.$emit('update:isIncremental', this.checkIncremental)
+    incrementalSources: {
+      get() {
+        return this.$store.state.sourceBuilds
       },
+      set(target) {
+        this.$store.commit('SET_SOURCES', target)
+      }
     },
+    targetBuilds: {
+      get() {
+        return this.$store.state.targetBuilds
+      },
+      set(target) {
+        this.$store.commit('SET_TARGETS', target)
+      }
+    }
   },
   created() {
-    this.$emit('update:isIncremental', this.checkIncremental)
     this.$emit('update:handler', this.addIncrementalSources, this.addTargetBuilds)
   },
   methods: {
@@ -71,10 +74,12 @@ export default {
      */
     async sendForm() {
       try {
-        let response_messages = await this.otaConfig.sendForms(
+        let response_messages = await this.$store.state.otaConfig.sendForms(
           this.targetBuilds, this.incrementalSources)
         alert(response_messages.join('\n'))
-        this.otaConfig.reset()
+        this.$store.state.otaConfig.reset()
+        this.$store.commit('SET_TARGETS', [])
+        this.$store.commit('SET_SOURCES', [])
       } catch (err) {
         alert(
           'Job cannot be started properly for the following reasons: ' + err
diff --git a/tools/otagui/src/components/ChainOTAOptions.vue b/tools/otagui/src/components/ChainOTAOptions.vue
index d4e394436..37d44f733 100644
--- a/tools/otagui/src/components/ChainOTAOptions.vue
+++ b/tools/otagui/src/components/ChainOTAOptions.vue
@@ -9,7 +9,6 @@
     <OTAOptions
       :targetDetails="targetDetails"
       :targetBuilds="targetBuilds"
-      @update:otaConfig="otaConfig=$event"
     />
     <v-divider class="my-5" />
     <v-btn
@@ -24,7 +23,6 @@
 <script>
 import OTAOptions from '@/components/OTAOptions.vue'
 import FileList from '@/components/FileList.vue'
-import { OTAConfiguration } from '@/services/JobSubmission.js'
 
 export default {
   components: {
@@ -39,12 +37,33 @@ export default {
   },
   data() {
     return {
-      targetBuilds: [],
-      otaConfig: new OTAConfiguration(),
+    }
+  },
+  computed: {
+    checkIncremental() {
+      return this.$store.state.otaConfig.isIncremental
+    },
+    targetBuilds: {
+      get() {
+        return this.$store.state.targetBuilds
+      },
+      set(target) {
+        this.$store.commit('SET_TARGETS', target)
+      }
+    }
+  },
+  watch: {
+    checkIncremental: {
+      handler() {
+        // The isIncremental flag has to be set false all the time
+        this.$store.commit('SET_ISINCREMENTAL', false)
+        this.$store.commit('SET_SOURCES', [])
+      }
     }
   },
   created() {
-    this.$emit('update:isIncremental', false)
+    this.$store.commit('SET_ISINCREMENTAL', false)
+    this.$store.commit('SET_SOURCES', [])
     this.$emit('update:handler', this.addIncrementalSources, this.addTargetBuilds)
   },
   methods: {
@@ -59,10 +78,11 @@ export default {
         return
       }
       try {
-        let response_messages = await this.otaConfig
+        let response_messages = await this.$store.state.otaConfig
           .sendChainForms(this.targetBuilds)
         alert(response_messages.join('\n'))
-        this.otaConfig.reset()
+        this.$store.state.otaConfig.reset()
+        this.$store.commit('SET_TARGETS', [])
       } catch (err) {
         alert(
           'Job cannot be started properly for the following reasons: ' + err
diff --git a/tools/otagui/src/components/OTAOptions.vue b/tools/otagui/src/components/OTAOptions.vue
index 6aee09fe0..86dee0921 100644
--- a/tools/otagui/src/components/OTAOptions.vue
+++ b/tools/otagui/src/components/OTAOptions.vue
@@ -15,10 +15,12 @@
   <div v-if="otaConfig.isPartial">
     <v-divider />
     <h3>Select Partitions</h3>
-    <PartialCheckbox
-      v-model="otaConfig.partial"
-      :labels="updatablePartitions"
-    />
+    <div v-if="targetDetails.length!==0">
+      <PartialCheckbox
+        v-model="otaConfig.partial"
+        :labels="updatablePartitions"
+      />
+    </div>
     <v-divider />
   </div>
   <v-btn
@@ -51,7 +53,7 @@
 import BaseInput from '@/components/BaseInput.vue'
 import BaseCheckbox from '@/components/BaseCheckbox.vue'
 import PartialCheckbox from '@/components/PartialCheckbox.vue'
-import { OTAConfiguration, OTABasicFlags, OTAExtraFlags } from '@/services/JobSubmission.js'
+import { OTABasicFlags, OTAExtraFlags } from '@/services/JobSubmission.js'
 
 export default {
   components: {
@@ -71,7 +73,7 @@ export default {
   },
   data () {
     return {
-      otaConfig: new OTAConfiguration(),
+      otaConfig: null,
       moreOptions: false,
       basicFlags: OTABasicFlags,
       extraFlags: OTAExtraFlags
@@ -93,14 +95,29 @@ export default {
       )
       return target[0].partitions
     },
+    checkIncremental() {
+      return this.$store.state.otaConfig.isIncremental
+    }
   },
   watch: {
     otaConfig: {
       handler () {
-        this.$emit('update:otaConfig', this.otaConfig)
+        this.$store.commit('SET_CONFIG', this.otaConfig)
       },
       deep: true
+    },
+    checkIncremental: {
+      handler () {
+        // In chain OTA, this option will be set outside this components
+        console.log('changed')
+        this.otaConfig.isIncremental = this.checkIncremental
+      }
     }
+  },
+  created() {
+    // This option only need to be synced once because this will not be
+    // modified outside this components
+    this.otaConfig = this.$store.state.otaConfig
   }
 }
 </script>
\ No newline at end of file
diff --git a/tools/otagui/src/components/PartialCheckbox.vue b/tools/otagui/src/components/PartialCheckbox.vue
index 9e716c36a..8d350fe70 100644
--- a/tools/otagui/src/components/PartialCheckbox.vue
+++ b/tools/otagui/src/components/PartialCheckbox.vue
@@ -64,10 +64,20 @@ export default {
     }
   },
   mounted() {
-    // Set the default value to be true once mounted
-    for (let key of this.labels) {
-      this.partitionSelected.set(key, true)
+    // Set the default value to be true once mounted if nothing has been selected
+    if (this.modelValue.length === 0) {
+      for (let key of this.labels) {
+        this.partitionSelected.set(key, true)
+      }
+    } else {
+      for (let key of this.labels) {
+        this.partitionSelected.set(key, false)
+      }
+      for (let key of this.modelValue) {
+        this.partitionSelected.set(key, true)
+      }
     }
+    this.$emit('update:modelValue', this.modelValue)
   },
   methods: {
     updateSelected(newSelect) {
diff --git a/tools/otagui/src/components/SingleOTAOptions.vue b/tools/otagui/src/components/SingleOTAOptions.vue
index 39addf8fc..02d6b84ce 100644
--- a/tools/otagui/src/components/SingleOTAOptions.vue
+++ b/tools/otagui/src/components/SingleOTAOptions.vue
@@ -1,7 +1,7 @@
 <template>
   <form @submit.prevent="sendForm">
     <FileSelect
-      v-if="otaConfig.isIncremental"
+      v-if="checkIncremental"
       v-model="incrementalSource"
       label="Select the source file"
       :options="targetDetails"
@@ -14,7 +14,6 @@
     <OTAOptions
       :targetDetails="targetDetails"
       :targetBuilds="[targetBuild]"
-      @update:otaConfig="otaConfig=$event"
     />
     <v-divider class="my-5" />
     <v-btn
@@ -29,7 +28,6 @@
 <script>
 import OTAOptions from '@/components/OTAOptions.vue'
 import FileSelect from '@/components/FileSelect.vue'
-import { OTAConfiguration } from '@/services/JobSubmission.js'
 
 export default {
   components: {
@@ -44,25 +42,30 @@ export default {
   },
   data() {
     return {
-      incrementalSource: '',
-      targetBuild: '',
-      otaConfig: new OTAConfiguration(),
     }
   },
   computed: {
     checkIncremental() {
-      return this.otaConfig.isIncremental
+      return this.$store.state.otaConfig.isIncremental
     },
-  },
-  watch: {
-    checkIncremental: {
-      handler: function () {
-        this.$emit('update:isIncremental', this.checkIncremental)
+    incrementalSource: {
+      get() {
+        return this.$store.state.sourceBuilds[0]
       },
+      set(target) {
+        this.$store.commit('SET_SOURCE', target)
+      }
     },
+    targetBuild: {
+      get() {
+        return this.$store.state.targetBuilds[0]
+      },
+      set(target) {
+        this.$store.commit('SET_TARGET', target)
+      }
+    }
   },
   created() {
-    this.$emit('update:isIncremental', this.checkIncremental)
     this.$emit('update:handler', this.setIncrementalSource, this.setTargetBuild)
   },
   methods: {
@@ -71,10 +74,12 @@ export default {
      */
     async sendForm() {
       try {
-        let response_message = await this.otaConfig.sendForm(
+        let response_message = await this.$store.state.otaConfig.sendForm(
           this.targetBuild, this.incrementalSource)
         alert(response_message)
-        this.otaConfig.reset()
+        this.$store.state.otaConfig.reset()
+        this.$store.commit('SET_TARGETS', [])
+        this.$store.commit('SET_SOURCES', [])
       } catch (err) {
         alert(
           'Job cannot be started properly for the following reasons: ' + err
diff --git a/tools/otagui/src/store/index.js b/tools/otagui/src/store/index.js
index 2b9da8fe1..8fa0de4bf 100644
--- a/tools/otagui/src/store/index.js
+++ b/tools/otagui/src/store/index.js
@@ -1,8 +1,55 @@
 import { createStore } from 'vuex'
+import { OTAConfiguration, OTAExtraFlags } from '@/services/JobSubmission.js'
 
 export default createStore({
-  state: {},
-  mutations: {},
+  state: {
+    otaConfig: new OTAConfiguration(),
+    targetBuilds: [],
+    sourceBuilds: []
+  },
+  mutations: {
+    REUSE_CONFIG(state, config) {
+      state.otaConfig.verbose = config.verbose
+      state.otaConfig.isIncremental = config.isIncremental
+      state.otaConfig.partial = config.partial
+      state.otaConfig.isPartial = config.isPartial
+      state.targetBuilds = [config.target]
+      if (config.isIncremental)
+        state.sourceBuilds = [config.incremental]
+      const extra =
+        config.extra.split('--')
+          .filter((s) => s!=='')
+          .map((s) => s.trimRight())
+      extra.forEach( (key) => {
+        if (OTAExtraFlags.filter((flags) => flags.key == key)) {
+          state.otaConfig[key] = true
+        } else {
+          state.extra += key
+        }
+      })
+    },
+    SET_CONFIG(state, config) {
+      state.otaConfig = config
+    },
+    RESET_CONFIG(state) {
+      state.otaConfig = new OTAConfiguration()
+    },
+    SET_TARGET(state, target) {
+      state.targetBuilds = [target]
+    },
+    SET_SOURCE(state, target) {
+      state.sourceBuilds = [target]
+    },
+    SET_TARGETS(state, targets) {
+      state.targetBuilds = targets
+    },
+    SET_SOURCES(state, targets) {
+      state.sourceBuilds = targets
+    },
+    SET_ISINCREMENTAL(state, isIncremental) {
+      state.otaConfig.isIncremental = isIncremental
+    }
+  },
   actions: {},
   modules: {}
 })
diff --git a/tools/otagui/src/views/JobConfigure.vue b/tools/otagui/src/views/JobConfigure.vue
index ba30433fe..06fbeb892 100644
--- a/tools/otagui/src/views/JobConfigure.vue
+++ b/tools/otagui/src/views/JobConfigure.vue
@@ -17,7 +17,6 @@
         :is="currentTab"
         class="tab-component"
         :targetDetails="targetDetails"
-        @update:isIncremental="isIncremental = $event"
         @update:handler="setHandler"
       />
     </v-col>
@@ -30,7 +29,7 @@
       <!-- the key-binding refresh has to be used to reload the methods-->
       <BuildLibrary
         :refresh="refresh"
-        :isIncremental="isIncremental"
+        :isIncremental="checkIncremental"
         @update:incrementalSource="addIncrementalSource"
         @update:targetBuild="addTargetBuild"
         @update:targetDetails="targetDetails = $event"
@@ -55,7 +54,6 @@ export default {
   data() {
     return {
       targetDetails: [],
-      isIncremental: false,
       currentTab: 'SingleOTAOptions',
       refresh: false,
       tabs: [
@@ -65,6 +63,11 @@ export default {
       ],
     }
   },
+  computed: {
+    checkIncremental() {
+      return this.$store.state.otaConfig.isIncremental
+    },
+  },
   methods: {
     setHandler(addIncrementalSource, addTargetBuild) {
       this.refresh = true,
diff --git a/tools/otagui/src/views/JobDetails.vue b/tools/otagui/src/views/JobDetails.vue
index ad1967549..515d1404c 100644
--- a/tools/otagui/src/views/JobDetails.vue
+++ b/tools/otagui/src/views/JobDetails.vue
@@ -5,6 +5,14 @@
       :job="job"
       :build-detail="true"
     />
+    <router-link :to="{name: 'Create'}">
+      <v-btn
+        block
+        @click="updateConfig()"
+      >
+        Reuse this configuration.
+      </v-btn>
+    </router-link>
     <v-divider class="my-5" />
     <div>
       <h3>STDERR</h3>
@@ -95,6 +103,9 @@ export default {
       if (this.job.status == 'Running') {
         setTimeout(this.updateStatus, 1000)
       }
+    },
+    updateConfig() {
+      this.$store.commit("REUSE_CONFIG", this.job)
     }
   },
 }