dashboard-shell-shell 1.0.115 → 1.0.116

package/components/SideNav.vue

@@ -20,7 +20,6 @@ import { TYPE_MODES } from '@shell/store/type-map';
 import { NAME as NAVLINKS } from '@shell/config/product/navlinks';
 import Group from '@shell/components/nav/Group';
 import LocaleSelector from '@shell/components/LocaleSelector';
-import { cloud2harvesterhci, harvester2cloud } from '@shell/utils/router';
 
 export default {
   name:       'SideNav',
@@ -155,7 +154,7 @@ export default {
     },
 
     isVirtualProduct() {
-      return this.rootProduct.name === harvester2cloud(HARVESTER);
+      return this.rootProduct.name === HARVESTER;
     },
 
     allNavLinks() {
@@ -237,7 +236,7 @@ export default {
 
     getProductsGroups(out, loadProducts, namespaceMode, productMap) {
       const clusterId = this.$store.getters['clusterId'];
-      const currentType = cloud2harvesterhci(this.$route.params.resource) || '';
+      const currentType = this.$route.params.resource || '';
 
       for ( const productId of loadProducts ) {
         const modes = [TYPE_MODES.BASIC];
@@ -395,12 +394,8 @@ export default {
 </script>
 
 <template>
-  <nav
-    class="side-nav"
-    role="navigation"
-    :aria-label="t('nav.ariaLabel.sideNav')"
-  >
-  <div class="side-all-title">
+  <nav class="side-nav">
+    <div class="side-all-title">
           控制台
   </div>
     <!-- Actual nav -->
@@ -422,36 +417,36 @@ export default {
       </template>
     </div>
     <!-- SideNav footer area (seems to be tied to harvester) -->
-    <!-- <div
+    <div
       v-if="showProductFooter"
       class="footer"
-    > -->
+    >
       <!-- support link -->
-      <!-- <router-link
+      <router-link
         :to="supportLink"
         class="pull-right"
         role="link"
         :aria-label="t('nav.support', {hasSupport: true})"
       >
         {{ t('nav.support', {hasSupport: true}) }}
-      </router-link> -->
+      </router-link>
       <!-- version number -->
-      <!-- <span
+      <span
         v-clean-tooltip="{content: displayVersion, placement: 'top'}"
         class="clip version text-muted"
       >
         {{ displayVersion }}
-      </span> -->
+      </span>
 
       <!-- locale selector -->
-      <!-- <LocaleSelector
+      <LocaleSelector
         v-if="isSingleProduct && hasMultipleLocales && !isStandaloneHarvester"
         mode="login"
         :show-icon="false"
-      /> -->
-    <!-- </div> -->
+      />
+    </div>
     <!-- SideNav footer alternative -->
-    <!-- <div
+    <div
       v-else
       class="version text-muted flex"
     >
@@ -472,7 +467,7 @@ export default {
           (Harvester-{{ harvesterVersion }})
         </span>
       </template>
-    </div> -->
+    </div>
   </nav>
 </template>
 
@@ -498,10 +493,6 @@ export default {
 
       A { padding-left: 0; }
     }
-    :deep() A{
-      height: 50px;
-      background-color: #fff;
-    }
 
     .tools {
       display: flex;
@@ -577,13 +568,4 @@ export default {
     display: flex;
   }
 
-
-  .side-all-title{
-    height: 50px;
-    line-height: 50px;
-    font-size: 16px;
-    color: #7f7f7f;
-    padding-left: 21px;
-    font-weight: bold;
-  }
 </style>

package/components/nav/Type.vue

@@ -177,6 +177,7 @@ export default {
     {{ type }}?
   </li>
 </template>
+
 <style lang="scss" scoped>
   .ns-and-icon {
     margin-right: 4px;
@@ -198,7 +199,6 @@ export default {
     .label {
       align-items: center;
       grid-area: label;
-      display: flex;
       overflow: hidden;
       text-overflow: ellipsis;
 
@@ -206,13 +206,13 @@ export default {
         padding-left: 3px;
       }
 
-      ::v-deep .highlight {
+      :deep() .highlight {
         background: var(--diff-ins-bg);
         color: var(--body-text);
         padding: 2px;
       }
 
-      ::v-deep .icon {
+      :deep() .icon {
         position: relative;
         color: var(--muted);
       }
@@ -225,24 +225,20 @@ export default {
       grid-column-gap: 5px;
       font-size: 14px;
       line-height: 24px;
-      /* padding: 7.5px 7px 7.5px 10px; */
-      padding: 0px 16px 0px 40px;
-      height: 50px;
+      padding: 7.5px 7px 7.5px 10px;
       margin: 0 0 0 -3px;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
       color: var(--body-text);
+      height: 33px;
 
       &:hover {
-        background: var(--nav-active);
-        color: var(--nav-hover-color);
-        /* background: var(--nav-hover); */
+        background: var(--nav-hover);
         text-decoration: none;
 
-        ::v-deep .icon {
-          /* color: var(--body-text); */
-          color: var(--nav-hover-color);
+        :deep() .icon {
+          color: var(--body-text);
         }
       }
     }
@@ -251,26 +247,46 @@ export default {
       grid-area: favorite;
       font-size: 12px;
       position: relative;
+      vertical-align: middle;
+      margin-right: 4px;
     }
 
     .count {
-      grid-area: count;
       font-size: 12px;
-      text-align: right;
       justify-items: center;
       padding-right: 4px;
+      display: flex;
+      align-items: center;
+    }
+
+    &.nav-type.nav-link {
+      a .label {
+        display: flex;
+      }
     }
 
     &.nav-type:not(.depth-0) {
       A {
-        font-size: 13px;
-        padding: 5.5px 7px 5.5px 10px;
+        padding-left: 16px;
       }
 
-      ::v-deep .label I {
+      :deep() .label I {
         padding-right: 2px;
       }
     }
+
+    &.nav-type:is(.depth-1) {
+      A {
+        font-size: 13px;
+        padding-left: 23px;
+      }
+    }
+
+    &.nav-type:not(.depth-0):not(.depth-1) {
+      A {
+        padding-left: 14px;
+      }
+    }
   }
 
 </style>

package/package.json

@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "author": "SUSE",
   "private": false,
-  "version": "1.0.00000000115",
+  "version": "1.0.00000000116",
   "engines": {
     "node": ">=20.0.0"
   },