template type filter

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

Author: shwstppr

ui/src/components/view/SearchView.vue

@@ -312,7 +312,7 @@ export default {
           'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
           'type', 'scope', 'managementserverid', 'serviceofferingid',
           'diskofferingid', 'networkid', 'usagetype', 'restartrequired',
-          'displaynetwork', 'arch', 'oscategoryid'].includes(item)
+          'displaynetwork', 'arch', 'oscategoryid', 'templatetype'].includes(item)
         ) {
           type = 'list'
         } else if (item === 'tags') {
@@ -454,6 +454,13 @@ export default {
         this.fields[typeIndex].opts = this.$fetchCpuArchitectureTypes()
         this.fields[typeIndex].loading = false
       }
+
+      if (arrayField.includes('templatetype')) {
+        const typeIndex = this.fields.findIndex(item => item.name === 'templatetype')
+        this.fields[typeIndex].loading = true
+        this.fields[typeIndex].opts = this.$fetchTemplateTypes()
+        this.fields[typeIndex].loading = false
+      }
     },
     async fetchDynamicFieldData (arrayField, searchKeyword) {
       const promises = []

ui/src/config/section/image.js

@@ -67,7 +67,7 @@ export default {
         return fields
       },
       searchFilters: () => {
-        var filters = ['name', 'zoneid', 'tags', 'arch', 'oscategoryid']
+        var filters = ['name', 'zoneid', 'tags', 'arch', 'oscategoryid', 'templatetype']
         if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
           filters.push('storageid')
           filters.push('imagestoreid')

ui/src/main.js

@@ -37,7 +37,8 @@ import {
   genericUtilPlugin,
   localesPlugin,
   dialogUtilPlugin,
-  cpuArchitectureUtilPlugin
+  cpuArchitectureUtilPlugin,
+  imagesUtilPlugin
 } from './utils/plugins'
 import { VueAxios } from './utils/request'
 import directives from './utils/directives'
@@ -55,6 +56,7 @@ vueApp.use(localesPlugin)
 vueApp.use(genericUtilPlugin)
 vueApp.use(dialogUtilPlugin)
 vueApp.use(cpuArchitectureUtilPlugin)
+vueApp.use(imagesUtilPlugin)
 vueApp.use(extensions)
 vueApp.use(directives)
 

ui/src/utils/plugins.js

@@ -550,3 +550,17 @@ export const cpuArchitectureUtilPlugin = {
     }
   }
 }
+
+export const imagesUtilPlugin = {
+  install (app) {
+    app.config.globalProperties.$fetchTemplateTypes = function () {
+      const baseTypes = ['USER', 'VNF']
+      const adminTypes = ['SYSTEM', 'BUILTIN', 'ROUTING']
+      const types = [...baseTypes]
+      if (store.getters.userInfo?.roletype === 'Admin') {
+        types.push(...adminTypes)
+      }
+      return types.map(type => ({ id: type, name: type, description: type }))
+    }
+  }
+}

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -582,7 +582,7 @@ export default {
       this.fetchCustomHypervisorName()
       this.fetchZone()
       this.fetchOsTypes()
-      this.fetchTemplateTypes()
+      this.templateTypes.opts = this.$fetchTemplateTypes()
       this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
       this.fetchUserData()
       this.fetchUserdataPolicy()
@@ -726,33 +726,6 @@ export default {
         this.osTypes.loading = false
       })
     },
-    fetchTemplateTypes () {
-      this.templateTypes.opts = []
-      const templatetypes = []
-      templatetypes.push({
-        id: 'USER',
-        description: 'USER'
-      })
-      templatetypes.push({
-        id: 'VNF',
-        description: 'VNF'
-      })
-      if (this.isAdminRole) {
-        templatetypes.push({
-          id: 'SYSTEM',
-          description: 'SYSTEM'
-        })
-        templatetypes.push({
-          id: 'BUILTIN',
-          description: 'BUILTIN'
-        })
-        templatetypes.push({
-          id: 'ROUTING',
-          description: 'ROUTING'
-        })
-      }
-      this.templateTypes.opts = templatetypes
-    },
     fetchUserData () {
       const params = {}
       params.listAll = true