From 3bd62d0ab4b933286742d4f1e7a2f647c098964d Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Tue, 9 Aug 2022 16:12:58 +0300
Subject: SILABMC-191: fix login page

---
 src/layouts/_sila/LoginLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/_sila/LoginLayout.vue b/src/layouts/_sila/LoginLayout.vue
index 5e064a48..a3773d58 100644
--- a/src/layouts/_sila/LoginLayout.vue
+++ b/src/layouts/_sila/LoginLayout.vue
@@ -52,7 +52,7 @@ export default {
     width: 45vw;
   }
 }
-@media (max-width: 750px) {
+@include media-breakpoint-down(sm) {
   .login-aside {
     display: none;
   }
-- 
cgit v1.2.3


From 85da454e7c6dc02edbb665d070163110e746b248 Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Tue, 9 Aug 2022 16:38:32 +0300
Subject: SILABMC-191: fix label of custom checkbox

---
 src/assets/styles/bmc/_sila/_forms.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index 1539c96a..14f1d155 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -164,6 +164,10 @@ div:not(.search-global) > .form-group {
   vertical-align: sub;
 }
 
+.custom-control-label::before {
+  margin-top: -5px;
+}
+
 .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after,
 .custom-checkbox
   .custom-control-input:indeterminate
-- 
cgit v1.2.3


From e8275b295c5c3bf02720ee38a37ae4e71542b1a8 Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Tue, 9 Aug 2022 16:49:09 +0300
Subject: SILABMC-191: fix to display label for disable fields

---
 src/assets/styles/bmc/_sila/_forms.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index 14f1d155..13a14ed8 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -43,6 +43,10 @@ div:not(.search-global) > .form-group {
     background-color: $gray-5;
     border: none;
   }
+  & .custom-select:disabled,
+  .form-control:disabled {
+    position: initial;
+  }
   & .input-group-text {
     border: none;
     background-color: $gray-5;
-- 
cgit v1.2.3


From 3b602a7dc56fa647e9a798793cda24308bcb527e Mon Sep 17 00:00:00 2001
From: Maksim Zakharov <m.zakharov@IBS.RU>
Date: Tue, 9 Aug 2022 18:00:56 +0300
Subject: add dynamic graphics in progress

---
 src/components/_sila/Global/Chart.vue                   | 8 ++++++--
 src/components/_sila/Global/TableDatePicker.vue         | 2 ++
 src/views/_sila/Fans/Dynamic/FanSpeed.vue               | 4 +++-
 src/views/_sila/Memory/Dynamic/MemoryTemp.vue           | 4 +++-
 src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue | 4 +++-
 src/views/_sila/Processors/Dynamic/CpuPower.vue         | 4 +++-
 src/views/_sila/Processors/Dynamic/CpuTemp.vue          | 4 +++-
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue
index 63f1f0a9..d6ea2492 100644
--- a/src/components/_sila/Global/Chart.vue
+++ b/src/components/_sila/Global/Chart.vue
@@ -133,8 +133,12 @@ export default {
           color: this.colors[index],
         };
       });
-
-      return metricArr;
+      return metricArr.length > 0
+        ? metricArr
+        : [
+            { color: '', data: [], name: '' },
+            { color: '', data: [], name: '' },
+          ];
     },
 
     metricTime() {
diff --git a/src/components/_sila/Global/TableDatePicker.vue b/src/components/_sila/Global/TableDatePicker.vue
index 397c507f..307389a1 100644
--- a/src/components/_sila/Global/TableDatePicker.vue
+++ b/src/components/_sila/Global/TableDatePicker.vue
@@ -2,11 +2,13 @@
   <b-col class="d-flex align-items-center date-picker">
     <span
       :class="{ 'switch-active': timeScale === 'hour' }"
+      style="cursor: pointer"
       @click="switchTimeScale('hour')"
       >{{ $t('global.datePicker.lastHour') }}</span
     >
     <span
       :class="{ 'switch-active': timeScale === 'day' }"
+      style="cursor: pointer"
       @click="switchTimeScale('day')"
       >{{ $t('global.datePicker.lastDay') }}</span
     >
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
index 5cb23218..a13a39ea 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="isBisy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -99,6 +99,7 @@ export default {
     return {
       warning: 2450,
       shutdown: 3150,
+      isBisy: true,
       fields: [
         {
           key: 'name',
@@ -220,6 +221,7 @@ export default {
       this.startLoader();
       this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
         this.endLoader();
+        this.isBisy = false;
       });
     },
   },
diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
index ef60a7e0..74c78d33 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="isBisy"
     >
       <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..0db21e48 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="isBisy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -86,6 +86,7 @@ export default {
   data() {
     return {
       warning: 72,
+      isBisy: true,
       fields: [
         {
           key: 'name',
@@ -165,6 +166,7 @@ export default {
         .dispatch('motherboard/getMotherboardDynamic', payload)
         .finally(() => {
           this.endLoader();
+          this.isBisy = false;
         });
     },
   },
diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue
index 7ca9e19b..d0478fa7 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="isBisy"
       >
         <template #cell(name)="{ value, index }">
           <div
@@ -100,6 +100,7 @@ export default {
     return {
       warning: 66,
       shutdown: 88,
+      isBisy: true,
       fields: [
         {
           key: 'name',
@@ -163,6 +164,7 @@ export default {
         .dispatch('processors/getCpuPowerDynamic', payload)
         .finally(() => {
           this.endLoader();
+          this.isBisy = false;
         });
     },
   },
diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
index e879cca8..686b9505 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="isBisy"
       >
         <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;
         });
     },
   },
-- 
cgit v1.2.3


From aed1b11cf9b523bf106abd767226e98c098b6e0a Mon Sep 17 00:00:00 2001
From: Maksim Zakharov <m.zakharov@IBS.RU>
Date: Wed, 10 Aug 2022 14:27:34 +0300
Subject: fix property name

---
 src/views/_sila/Fans/Dynamic/FanSpeed.vue               | 6 +++---
 src/views/_sila/Memory/Dynamic/MemoryTemp.vue           | 2 +-
 src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue | 6 +++---
 src/views/_sila/Processors/Dynamic/CpuPower.vue         | 6 +++---
 src/views/_sila/Processors/Dynamic/CpuTemp.vue          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
index a13a39ea..6d76afe1 100644
--- a/src/views/_sila/Fans/Dynamic/FanSpeed.vue
+++ b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
@@ -44,7 +44,7 @@
       :items="items"
       :fields="fields"
       :empty-text="$t('global.table.emptyMessage')"
-      :bisy="isBisy"
+      :bisy="isBusy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -99,7 +99,7 @@ export default {
     return {
       warning: 2450,
       shutdown: 3150,
-      isBisy: true,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -221,7 +221,7 @@ export default {
       this.startLoader();
       this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
         this.endLoader();
-        this.isBisy = false;
+        this.isBusy = false;
       });
     },
   },
diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
index 74c78d33..7d143beb 100644
--- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
+++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
@@ -60,7 +60,7 @@
       :items="items"
       :fields="fields"
       :empty-text="$t('global.table.emptyMessage')"
-      :busy="isBisy"
+      :busy="isBusy"
     >
       <template #cell(name)="{ value, index }">
         <div
diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
index 0db21e48..9f8d41cb 100644
--- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
+++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
@@ -37,7 +37,7 @@
       :items="items"
       :fields="fields"
       :empty-text="$t('global.table.emptyMessage')"
-      :busy="isBisy"
+      :busy="isBusy"
     >
       <template #cell(name)="{ value, index }">
         <div
@@ -86,7 +86,7 @@ export default {
   data() {
     return {
       warning: 72,
-      isBisy: true,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -166,7 +166,7 @@ export default {
         .dispatch('motherboard/getMotherboardDynamic', payload)
         .finally(() => {
           this.endLoader();
-          this.isBisy = false;
+          this.isBusy = false;
         });
     },
   },
diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue
index d0478fa7..732ddd09 100644
--- a/src/views/_sila/Processors/Dynamic/CpuPower.vue
+++ b/src/views/_sila/Processors/Dynamic/CpuPower.vue
@@ -47,7 +47,7 @@
         :items="items"
         :fields="fields"
         :empty-text="$t('global.table.emptyMessage')"
-        :busy="isBisy"
+        :busy="isBusy"
       >
         <template #cell(name)="{ value, index }">
           <div
@@ -100,7 +100,7 @@ export default {
     return {
       warning: 66,
       shutdown: 88,
-      isBisy: true,
+      isBusy: true,
       fields: [
         {
           key: 'name',
@@ -164,7 +164,7 @@ export default {
         .dispatch('processors/getCpuPowerDynamic', payload)
         .finally(() => {
           this.endLoader();
-          this.isBisy = false;
+          this.isBusy = false;
         });
     },
   },
diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
index 686b9505..ebe3e22a 100644
--- a/src/views/_sila/Processors/Dynamic/CpuTemp.vue
+++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
@@ -54,7 +54,7 @@
         :items="items"
         :fields="fields"
         :empty-text="$t('global.table.emptyMessage')"
-        :busy="isBisy"
+        :busy="isBusy"
       >
         <template #cell(name)="{ value, index }">
           <div
-- 
cgit v1.2.3


From 40edc2d8ca00c2820161c84d564853942201ceed Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Wed, 10 Aug 2022 15:06:38 +0300
Subject: SILABMC-243: Fix custom switch

---
 src/assets/styles/bmc/_sila/_forms.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index 13a14ed8..aec35370 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -168,7 +168,7 @@ div:not(.search-global) > .form-group {
   vertical-align: sub;
 }
 
-.custom-control-label::before {
+.custom-radio > .custom-control-label::before {
   margin-top: -5px;
 }
 
-- 
cgit v1.2.3