add ready/state column for templates and isos

yadvr · yadvr · commit 7ddf45dab976 · 2023-08-11T13:55:50.000+05:30
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
@@ -219,6 +219,9 @@
       <status v-if="$route.path.startsWith('/host')" :text="getHostState(record)" displayText />
       <status v-else :text="text ? text : ''" displayText :styles="{ 'min-width': '80px' }" />
     </template>
+    <template #status="{ text }">
+      <status :text="text ? text : ''" displayText />
+    </template>
     <template #allocationstate="{ text }">
       <status :text="text ? text : ''" displayText />
     </template>
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
@@ -457,7 +457,6 @@ export default {
         var fields = ['name', 'state', 'size', 'cpunumber', 'memory', 'kubernetesversionname']
         if (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
           fields.push('account')
-          fields.push('domain')
         }
         if (store.apis.scaleKubernetesCluster.params.filter(x => x.name === 'autoscalingenabled').length > 0) {
           fields.splice(2, 0, 'autoscalingenabled')
diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js
@@ -35,10 +35,17 @@ export default {
       resourceType: 'Template',
       filters: ['self', 'shared', 'featured', 'community'],
       columns: () => {
-        var fields = ['name', 'ostypename', 'hypervisor']
+        var fields = ['name',
+          {
+            state: (record) => {
+              if (record.isready) {
+                return 'Ready'
+              }
+              return 'Not Ready'
+            }
+          }, 'ostypename', 'hypervisor']
         if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
           fields.push('size')
-          fields.push('physicalsize')
           fields.push('account')
         }
         if (['Admin'].includes(store.getters.userInfo.roletype)) {
@@ -188,7 +195,15 @@ export default {
       resourceType: 'ISO',
       filters: ['self', 'shared', 'featured', 'community'],
       columns: () => {
-        var fields = ['name', 'ostypename']
+        var fields = ['name',
+          {
+            state: (record) => {
+              if (record.isready) {
+                return 'Ready'
+              }
+              return 'Not Ready'
+            }
+          }, 'ostypename']
         if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
           fields.push('size')
           fields.push('account')

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,6 @@ export default {`
`457`	`457`	`var fields = ['name', 'state', 'size', 'cpunumber', 'memory', 'kubernetesversionname']`
`458`	`458`	`if (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {`
`459`	`459`	`fields.push('account')`
`460`		`- fields.push('domain')`
`461`	`460`	`}`
`462`	`461`	`if (store.apis.scaleKubernetesCluster.params.filter(x => x.name === 'autoscalingenabled').length > 0) {`
`463`	`462`	`fields.splice(2, 0, 'autoscalingenabled')`