refactor fetch arch types

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

ui/src/components/view/SearchView.vue

@@ -451,7 +451,7 @@ export default {
       if (arrayField.includes('arch')) {
         const typeIndex = this.fields.findIndex(item => item.name === 'arch')
         this.fields[typeIndex].loading = true
-        this.fields[typeIndex].opts = this.fetchArchitectureTypes()
+        this.fields[typeIndex].opts = this.$fetchCpuArchitectureTypes()
         this.fields[typeIndex].loading = false
       }
     },
@@ -1324,12 +1324,6 @@ export default {
           })
       })
     },
-    fetchArchitectureTypes () {
-      return [
-        { id: 'x86_64', name: 'AMD 64 bits (x86_64)' },
-        { id: 'aarch64', name: 'ARM 64 bits (aarch64)' }
-      ]
-    },
     onSearch (value) {
       this.paramsFilter = {}
       this.searchQuery = value

ui/src/main.js

@@ -35,7 +35,8 @@ import {
   resourceTypePlugin,
   fileSizeUtilPlugin,
   genericUtilPlugin,
-  localesPlugin
+  localesPlugin,
+  cpuArchitectureUtilPlugin
 } from './utils/plugins'
 import { VueAxios } from './utils/request'
 import directives from './utils/directives'
@@ -51,6 +52,7 @@ vueApp.use(resourceTypePlugin)
 vueApp.use(fileSizeUtilPlugin)
 vueApp.use(localesPlugin)
 vueApp.use(genericUtilPlugin)
+vueApp.use(cpuArchitectureUtilPlugin)
 vueApp.use(extensions)
 vueApp.use(directives)
 

ui/src/utils/plugins.js

@@ -523,3 +523,15 @@ export function createPathBasedOnVmType (vmtype, virtualmachineid) {
 
   return path + virtualmachineid
 }
+
+export const cpuArchitectureUtilPlugin = {
+  install (app) {
+    app.config.globalProperties.$fetchCpuArchitectureTypes = function () {
+      const architectures = [
+        { id: 'x86_64', name: 'AMD 64 bits (x86_64)' },
+        { id: 'aarch64', name: 'ARM 64 bits (aarch64)' }
+      ]
+      return architectures.map(item => ({ ...item, description: item.name }))
+    }
+  }
+}

ui/src/views/image/AddKubernetesSupportedVersion.vue

@@ -216,7 +216,7 @@ export default {
       })
     },
     fetchData () {
-      this.fetchArchitectureTypes()
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
       this.fetchZoneData()
     },
     isValidValueForKey (obj, key) {
@@ -225,19 +225,6 @@ export default {
     arrayHasItems (array) {
       return array !== null && array !== undefined && Array.isArray(array) && array.length > 0
     },
-    fetchArchitectureTypes () {
-      this.architectureTypes.opts = []
-      const typesList = []
-      typesList.push({
-        id: 'x86_64',
-        description: 'AMD 64 bits (x86_64)'
-      })
-      typesList.push({
-        id: 'aarch64',
-        description: 'ARM 64 bits (aarch64)'
-      })
-      this.architectureTypes.opts = typesList
-    },
     fetchZoneData () {
       const params = {}
       params.showicon = true

ui/src/views/image/RegisterOrUploadIso.vue

@@ -384,7 +384,7 @@ export default {
     fetchData () {
       this.fetchZoneData()
       this.fetchOsType()
-      this.fetchArchitectureTypes()
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
       this.fetchUserData()
       this.fetchUserdataPolicy()
       if ('listDomains' in this.$store.getters.apis) {
@@ -410,19 +410,6 @@ export default {
         this.form.zoneid = (this.zones[0].id ? this.zones[0].id : '')
       })
     },
-    fetchArchitectureTypes () {
-      this.architectureTypes.opts = []
-      const typesList = []
-      typesList.push({
-        id: 'x86_64',
-        description: 'AMD 64 bits (x86_64)'
-      })
-      typesList.push({
-        id: 'aarch64',
-        description: 'ARM 64 bits (aarch64)'
-      })
-      this.architectureTypes.opts = typesList
-    },
     fetchOsType () {
       this.osTypeLoading = true
 

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -583,7 +583,7 @@ export default {
       this.fetchZone()
       this.fetchOsTypes()
       this.fetchTemplateTypes()
-      this.fetchArchitectureTypes()
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
       this.fetchUserData()
       this.fetchUserdataPolicy()
       if ('listDomains' in this.$store.getters.apis) {
@@ -753,19 +753,6 @@ export default {
       }
       this.templateTypes.opts = templatetypes
     },
-    fetchArchitectureTypes () {
-      this.architectureTypes.opts = []
-      const typesList = []
-      typesList.push({
-        id: 'x86_64',
-        description: 'AMD 64 bits (x86_64)'
-      })
-      typesList.push({
-        id: 'aarch64',
-        description: 'ARM 64 bits (aarch64)'
-      })
-      this.architectureTypes.opts = typesList
-    },
     fetchUserData () {
       const params = {}
       params.listAll = true

ui/src/views/image/UpdateISO.vue

@@ -216,7 +216,7 @@ export default {
     },
     fetchData () {
       this.fetchOsTypes()
-      this.fetchArchitectureTypes()
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
       this.fetchUserdata()
       this.fetchUserdataPolicy()
     },
@@ -235,19 +235,6 @@ export default {
         this.osTypes.loading = false
       })
     },
-    fetchArchitectureTypes () {
-      this.architectureTypes.opts = []
-      const typesList = []
-      typesList.push({
-        id: 'x86_64',
-        description: 'AMD 64 bits (x86_64)'
-      })
-      typesList.push({
-        id: 'aarch64',
-        description: 'ARM 64 bits (aarch64)'
-      })
-      this.architectureTypes.opts = typesList
-    },
     fetchUserdataPolicy () {
       const userdataPolicy = []
       userdataPolicy.push({

ui/src/views/image/UpdateTemplate.vue

@@ -310,7 +310,7 @@ export default {
     },
     fetchData () {
       this.fetchOsTypes()
-      this.fetchArchitectureTypes()
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
       this.fetchRootDiskControllerTypes(this.resource.hypervisor)
       this.fetchNicAdapterTypes()
       this.fetchKeyboardTypes()
@@ -335,19 +335,6 @@ export default {
         this.osTypes.loading = false
       })
     },
-    fetchArchitectureTypes () {
-      this.architectureTypes.opts = []
-      const typesList = []
-      typesList.push({
-        id: 'x86_64',
-        description: 'AMD 64 bits (x86_64)'
-      })
-      typesList.push({
-        id: 'aarch64',
-        description: 'ARM 64 bits (aarch64)'
-      })
-      this.architectureTypes.opts = typesList
-    },
     fetchRootDiskControllerTypes (hyperVisor) {
       const controller = []
       this.rootDisk.opts = []

ui/src/views/infra/ClusterAdd.vue

@@ -213,7 +213,8 @@ export default {
     fetchData () {
       this.fetchZones()
       this.fetchHypervisors()
-      this.fetchArchitectureTypes()
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
+      this.selectedArchitecture = this.architectureTypes?.opts?.[0]?.id || null
       this.params = this.$store.getters.apis.addCluster.params
       Object.keys(this.placeholder).forEach(item => { this.returnPlaceholder(item) })
     },
@@ -240,20 +241,6 @@ export default {
         this.loading = false
       })
     },
-    fetchArchitectureTypes () {
-      this.architectureTypes.opts = []
-      const typesList = []
-      typesList.push({
-        id: 'x86_64',
-        description: 'AMD 64 bits (x86_64)'
-      })
-      typesList.push({
-        id: 'aarch64',
-        description: 'ARM 64 bits (aarch64)'
-      })
-      this.architectureTypes.opts = typesList
-      this.selectedArchitecture = this.architectureTypes.opts[0].id
-    },
     fetchPods () {
       this.loading = true
       api('listPods', {