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

4 files changed, 30 insertions, 13 deletions

diff --git a/src/assets/styles/bmc/_sila/_base.scss b/src/assets/styles/bmc/_sila/_base.scss
index e95a1ce1..138f623f 100644
--- a/src/assets/styles/bmc/_sila/_base.scss
+++ b/src/assets/styles/bmc/_sila/_base.scss
@@ -101,3 +101,8 @@ h6,
     outline: 0;
   }
 }
+
+.disabledDiv {
+  pointer-events: none;
+  opacity: 0.3;
+}
diff --git a/src/components/_sila/AppHeader/AppHeader.vue b/src/components/_sila/AppHeader/AppHeader.vue
index 165d744e..b890331b 100644
--- a/src/components/_sila/AppHeader/AppHeader.vue
+++ b/src/components/_sila/AppHeader/AppHeader.vue
@@ -43,7 +43,7 @@
           </b-navbar-brand>
           <div v-if="isNavTagPresent" :key="routerKey" class="pl-2 nav-tags">
             <span>|</span>
-            <span class="pl-3 asset-tag">{{ assetTag }}</span>
+            <span class="pl-3">{{ assetTag }}</span>
             <span class="pl-3">{{ modelType }}</span>
             <span class="pl-3">{{ serialNumber }}</span>
           </div>
diff --git a/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue b/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue
index 14160502..f1858ae9 100644
--- a/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue
@@ -52,17 +52,19 @@
       </template>
       <!-- Toggle identify LED -->
       <template #cell(identifyLed)="row">
-        <b-form-checkbox
-          v-model="row.item.identifyLed"
-          name="switch"
-          switch
-          @change="toggleIdentifyLedValue(row.item)"
-        >
-          <span v-if="row.item.identifyLed">
-            {{ $t('global.status.on') }}
-          </span>
-          <span v-else> {{ $t('global.status.off') }} </span>
-        </b-form-checkbox>
+        <div class="disabledDiv">
+          <b-form-checkbox
+            v-model="row.item.identifyLed"
+            name="switch"
+            switch
+            @change="toggleIdentifyLedValue(row.item)"
+          >
+            <span v-if="row.item.identifyLed">
+              {{ $t('global.status.on') }}
+            </span>
+            <span v-else> {{ $t('global.status.off') }} </span>
+          </b-form-checkbox>
+        </div>
       </template>
       <template #row-details="{ item }">
         <b-container fluid>
@@ -243,6 +245,13 @@ export default {
       this.searchTotalFilteredRows = filteredItems.length;
     },
     toggleIdentifyLedValue(row) {
+      // dimms don't have leds, then
+      // eslint-disable-next-line no-constant-condition
+      if (true) {
+        row.identifyLed = false;
+        return;
+      }
+
       this.$store
         .dispatch('memory/updateIdentifyLedValue', {
           uri: row.uri,
diff --git a/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue
index c6c798cf..8052c6aa 100644
--- a/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue
@@ -1,5 +1,8 @@
 <template>
-  <page-section :section-title="$t('pageInventory.processors')">
+  <page-section
+    v-if="processors && processors.length > 0"
+    :section-title="$t('pageInventory.processors')"
+  >
     <!-- Search -->
     <b-row class="align-items-end">
       <b-col sm="6" md="5" xl="4">