Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila

5 files changed, 15 insertions, 5 deletions

diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
index 5cb23218..6d76afe1 100644
--- a/src/views/_sila/Fans/Dynamic/FanSpeed.vue
+++ b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
@@ -37,7 +37,6 @@
     ></chart>
 
     <b-table
-      v-if="items && items.length > 0"
       responsive="md"
       show-empty
       table-variant="accessory"
@@ -45,6 +44,7 @@
       :items="items"
       :fields="fields"
       :empty-text="$t('global.table.emptyMessage')"
+      :bisy="isBusy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -99,6 +99,7 @@ export default {
     return {
       warning: 2450,
       shutdown: 3150,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -220,6 +221,7 @@ export default {
       this.startLoader();
       this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
         this.endLoader();
+        this.isBusy = false;
       });
     },
   },
diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
index ef60a7e0..7d143beb 100644
--- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
+++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
@@ -53,7 +53,6 @@
       :critical="critical"
     ></chart>
     <b-table
-      v-if="items && items.length > 0"
       responsive="md"
       show-empty
       table-variant="accessory"
@@ -61,6 +60,7 @@
       :items="items"
       :fields="fields"
       :empty-text="$t('global.table.emptyMessage')"
+      :busy="isBusy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -111,6 +111,7 @@ export default {
       warning: 72,
       notNormal: 44,
       critical: 55,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -188,6 +189,7 @@ export default {
       this.startLoader();
       this.$store.dispatch('memory/getMemoryDynamic', payload).finally(() => {
         this.endLoader();
+        this.isBusy = false;
       });
     },
   },
diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
index 3f70bd20..9f8d41cb 100644
--- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
+++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
@@ -30,7 +30,6 @@
       :warning="warning"
     ></chart>
     <b-table
-      v-if="items && items.length > 0"
       responsive="md"
       show-empty
       table-variant="accessory"
@@ -38,6 +37,7 @@
       :items="items"
       :fields="fields"
       :empty-text="$t('global.table.emptyMessage')"
+      :busy="isBusy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -86,6 +86,7 @@ export default {
   data() {
     return {
       warning: 72,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -165,6 +166,7 @@ export default {
         .dispatch('motherboard/getMotherboardDynamic', payload)
         .finally(() => {
           this.endLoader();
+          this.isBusy = false;
         });
     },
   },
diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue
index 7ca9e19b..732ddd09 100644
--- a/src/views/_sila/Processors/Dynamic/CpuPower.vue
+++ b/src/views/_sila/Processors/Dynamic/CpuPower.vue
@@ -40,7 +40,6 @@
         :shutdown="+shutdown"
       ></chart>
       <b-table
-        v-if="items && items.length > 0"
         responsive="md"
         show-empty
         table-variant="accessory"
@@ -48,6 +47,7 @@
         :items="items"
         :fields="fields"
         :empty-text="$t('global.table.emptyMessage')"
+        :busy="isBusy"
       >
         <template #cell(name)="{ value, index }">
           <div
@@ -100,6 +100,7 @@ export default {
     return {
       warning: 66,
       shutdown: 88,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -163,6 +164,7 @@ export default {
         .dispatch('processors/getCpuPowerDynamic', payload)
         .finally(() => {
           this.endLoader();
+          this.isBusy = false;
         });
     },
   },
diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
index e879cca8..ebe3e22a 100644
--- a/src/views/_sila/Processors/Dynamic/CpuTemp.vue
+++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
@@ -47,7 +47,6 @@
         :critical="+critical"
       ></chart>
       <b-table
-        v-if="items && items.length > 0"
         responsive="md"
         show-empty
         table-variant="accessory"
@@ -55,6 +54,7 @@
         :items="items"
         :fields="fields"
         :empty-text="$t('global.table.emptyMessage')"
+        :busy="isBusy"
       >
         <template #cell(name)="{ value, index }">
           <div
@@ -108,6 +108,7 @@ export default {
       warning: 72,
       notNormal: 44,
       critical: 55,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -192,6 +193,7 @@ export default {
         .dispatch('processors/getCpuTempDynamic', payload)
         .finally(() => {
           this.endLoader();
+          this.isBusy = false;
         });
     },
   },