Added displaynetwork option in filters for listnetwork only for admin

Author: harikrishna-patnala

ui/public/locales/en.json

@@ -2143,6 +2143,8 @@
 "label.traffictype": "Traffic type",
 "label.transportzoneuuid": "Transport zone UUID",
 "label.trigger.shutdown": "Trigger Safe Shutdown",
+"label.true": "True",
+"label.false": "False",
 "label.try.again": "Try again",
 "label.tuesday": "Tuesday",
 "label.two.factor.authentication.secret.key": "Your Two factor authentication secret key",

ui/src/components/view/SearchView.vue

@@ -289,9 +289,12 @@ export default {
         if (item === 'groupid' && !('listInstanceGroups' in this.$store.getters.apis)) {
           return true
         }
+        if (item === 'displaynetwork' && this.$store.getters.userInfo.roletype !== 'Admin') {
+          return true
+        }
         if (['zoneid', 'domainid', 'imagestoreid', 'storageid', 'state', 'account', 'hypervisor', 'level',
           'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
-          'type', 'serviceofferingid', 'diskofferingid'].includes(item)
+          'type', 'serviceofferingid', 'diskofferingid', 'displaynetwork'].includes(item)
         ) {
           type = 'list'
         } else if (item === 'tags') {
@@ -311,6 +314,12 @@ export default {
       return arrayField
     },
     fetchStaticFieldData (arrayField) {
+      if (arrayField.includes('displaynetwork')) {
+          const typeIndex = this.fields.findIndex(item => item.name === 'displaynetwork')
+          this.fields[typeIndex].loading = true
+          this.fields[typeIndex].opts = this.fetchBoolean()
+          this.fields[typeIndex].loading = false
+      }
       if (arrayField.includes('type')) {
         if (this.$route.path === '/guestnetwork' || this.$route.path.includes('/guestnetwork/')) {
           const typeIndex = this.fields.findIndex(item => item.name === 'type')
@@ -856,6 +865,18 @@ export default {
       }
       return types
     },
+    fetchBoolean () {
+      const types = []
+      types.push({
+        id: 'true',
+        name: 'label.true'
+      })
+      types.push({
+        id: 'false',
+        name: 'label.false'
+      })
+      return types
+    },
     fetchAccountTypes () {
       const types = []
       if (this.apiName.indexOf('listAccounts') > -1) {

ui/src/config/section/network.js

@@ -54,7 +54,7 @@ export default {
         return fields
       },
       filters: ['all', 'account', 'domainpath', 'shared'],
-      searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'type', 'tags'],
+      searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'type', 'displaynetwork', 'tags'],
       related: [{
         name: 'vm',
         title: 'label.instances',