dashboard-shell-shell 1.0.115 → 1.0.117

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>
 

package/components/SortableTable/index.vue

@@ -1181,7 +1181,201 @@ export default {
     ref="container"
     :data-testid="componentTestid + '-list-container'"
   >
+  <div
+       :class="{'titled': $slots.title && $slots.title.length,  'mb-40': isFilterLabel}"
+      class="sortable-table-header mb-20"
+      :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable ? '100px' : '-10px',maxHeight: '32px'}"
+    >
+      <slot name="title" />
+      <div
+        v-if="showHeaderRow"
+        class="fixed-header-actions"
+        :class="{button: !!$slots['header-button'], 'advanced-filtering': hasAdvancedFiltering}"
+        style="display: flex;"
+      >
+        <!-- <div
+          :class="bulkActionsClass"
+          class="bulk"
+        >
+          <slot name="header-left">
+            <template v-if="tableActions">
+              <button
+                v-for="(act) in availableActions"
+                :id="act.action"
+                :key="act.action"
+                v-clean-tooltip="actionTooltip"
+                type="button"
+                class="btn role-primary"
+                :class="{[bulkActionClass]:true}"
+                :disabled="!act.enabled"
+                :data-testid="componentTestid + '-' + act.action"
+                @click="applyTableAction(act, null, $event)"
+                @keydown.enter.stop
+                @mouseover="setBulkActionOfInterest(act)"
+                @mouseleave="setBulkActionOfInterest(null)"
+              >
+                <i
+                  v-if="act.icon"
+                  :class="act.icon"
+                />
+                <span v-clean-html="act.label" />
+              </button>
+              <ActionDropdown
+                :class="bulkActionsDropdownClass"
+                class="bulk-actions-dropdown"
+                :disable-button="!selectedRows.length"
+                size="sm"
+              >
+                <template #button-content>
+                  <button
+                    ref="actionDropDown"
+                    class="btn bg-primary mr-0"
+                    :disabled="!selectedRows.length"
+                  >
+                    <i class="icon icon-gear" />
+                    <span>{{ t('sortableTable.bulkActions.collapsed.label') }}</span>
+                    <i class="ml-10 icon icon-chevron-down" />
+                  </button>
+                </template>
+                <template #popover-content>
+                  <ul class="list-unstyled menu">
+                    <li
+                      v-for="(act, i) in hiddenActions"
+                      :key="i"
+                      v-close-popper
+                      v-clean-tooltip="{
+                        content: actionTooltip,
+                        placement: 'right'
+                      }"
+                      :class="{ disabled: !act.enabled }"
+                      @click="applyTableAction(act, null, $event)"
+                      @mouseover="setBulkActionOfInterest(act)"
+                      @mouseleave="setBulkActionOfInterest(null)"
+                    >
+                      <i
+                        v-if="act.icon"
+                        :class="act.icon"
+                      />
+                      <span v-clean-html="act.label" />
+                    </li>
+                  </ul>
+                </template>
+              </ActionDropdown>
+              <label
+                v-if="selectedRowsText"
+                :class="bulkActionAvailabilityClass"
+                class="action-availability"
+              >
+                {{ selectedRowsText }}
+              </label>
+            </template>
+          </slot>
+        </div> -->
+        <div
+          v-if="!hasAdvancedFiltering && $slots['header-middle']"
+          class="middle"
+        >
+          <slot name="header-middle" />
+        </div>
 
+        <div
+          v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']"
+          class="search row"
+          data-testid="search-box-filter-row"
+        >
+          <ul
+            v-if="hasAdvancedFiltering"
+            class="advanced-filters-applied"
+          >
+            <li
+              v-for="(filter, i) in advancedFilteringValues"
+              :key="i"
+            >
+              <span class="label">{{ `"${filter.value}" ${ t('sortableTable.in') } ${filter.label}` }}</span>
+              <span
+                class="cross"
+                @click="clearAdvancedFilter(i)"
+              >&#10005;</span>
+              <div class="bg" />
+            </li>
+          </ul>
+          <slot name="header-right" />
+          <AsyncButton
+            v-if="isTooManyItemsToAutoUpdate"
+            mode="manual-refresh"
+            :size="manualRefreshButtonSize"
+            :current-phase="refreshButtonPhase"
+            @click="debouncedRefreshTableData"
+          />
+          <div
+            v-if="hasAdvancedFiltering"
+            ref="advanced-filter-group"
+            class="advanced-filter-group"
+          >
+            <button
+              class="btn role-primary"
+              @click="advancedFilteringVisibility = !advancedFilteringVisibility;"
+            >
+              {{ t('sortableTable.addFilter') }}
+            </button>
+            <div
+              v-show="advancedFilteringVisibility"
+              class="advanced-filter-container"
+            >
+              <input
+                ref="advancedSearchQuery"
+                v-model="advFilterSearchTerm"
+                type="search"
+                class="advanced-search-box"
+                :placeholder="t('sortableTable.filterFor')"
+              >
+              <div class="middle-block">
+                <span>{{ t('sortableTable.in') }}</span>
+                <LabeledSelect
+                  v-model:value="advFilterSelectedProp"
+                  class="filter-select"
+                  :clearable="true"
+                  :options="advFilterSelectOptions"
+                  :disabled="false"
+                  :searchable="false"
+                  mode="edit"
+                  :multiple="false"
+                  :taggable="false"
+                  :placeholder="t('sortableTable.selectCol')"
+                  @selecting="(col) => advFilterSelectedLabel = col.label"
+                />
+              </div>
+              <div class="bottom-block">
+                <button
+                  class="btn role-secondary"
+                  :disabled="!advancedFilteringValues.length"
+                  @click="clearAllAdvancedFilters"
+                >
+                  {{ t('sortableTable.resetFilters') }}
+                </button>
+                <button
+                  class="btn role-primary"
+                  @click="addAdvancedFilter"
+                >
+                  {{ t('sortableTable.add') }}
+                </button>
+              </div>
+            </div>
+          </div>
+          <slot name="header-button" />
+          <input
+            v-if="search"
+            ref="searchQuery"
+            v-model="eventualSearchQuery"
+            type="search"
+            class="input-sm search-box"
+            :aria-label="t('sortableTable.searchLabel')"
+            :placeholder="t('sortableTable.search')"
+          >
+         
+        </div>
+      </div>
+    </div>
     <div class="sort-table-div">
       <table
         ref="table"
@@ -1481,17 +1675,17 @@ export default {
         />
       </div>
       <div
-      :class="{'titled': $slots.title && $slots.title.length}"
-      class="sortable-table-header"
-      style="margin-left: 10px;min-width: 55%;"
-    >
-      <slot name="title" />
-      <div
-        v-if="showHeaderRow"
-        class="fixed-header-actions"
-        :class="{button: !!$slots['header-button'], 'advanced-filtering': hasAdvancedFiltering}"
+        :class="{'titled': $slots.title && $slots.title.length}"
+        class="sortable-table-header"
+         style="margin-left: 10px;min-width: 55%;"
       >
+        <slot name="title" />
         <div
+          v-if="showHeaderRow"
+          class="fixed-header-actions"
+          :class="{button: !!$slots['header-button'], 'advanced-filtering': hasAdvancedFiltering,}"
+        >
+          <div
           :class="bulkActionsClass"
           class="bulk"
         >
@@ -1568,111 +1762,11 @@ export default {
               </label>
             </template>
           </slot>
-        </div>
-        <div
-          v-if="!hasAdvancedFiltering && $slots['header-middle']"
-          class="middle"
-        >
-          <slot name="header-middle" />
-        </div>
-
-        <div
-          v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']"
-          class="search row"
-          data-testid="search-box-filter-row"
-        >
-          <ul
-            v-if="hasAdvancedFiltering"
-            class="advanced-filters-applied"
-          >
-            <li
-              v-for="(filter, i) in advancedFilteringValues"
-              :key="i"
-            >
-              <span class="label">{{ `"${filter.value}" ${ t('sortableTable.in') } ${filter.label}` }}</span>
-              <span
-                class="cross"
-                @click="clearAdvancedFilter(i)"
-              >&#10005;</span>
-              <div class="bg" />
-            </li>
-          </ul>
-          <slot name="header-right" />
-          <AsyncButton
-            v-if="isTooManyItemsToAutoUpdate"
-            mode="manual-refresh"
-            :size="manualRefreshButtonSize"
-            :current-phase="refreshButtonPhase"
-            @click="debouncedRefreshTableData"
-          />
-          <div
-            v-if="hasAdvancedFiltering"
-            ref="advanced-filter-group"
-            class="advanced-filter-group"
-          >
-            <button
-              class="btn role-primary"
-              @click="advancedFilteringVisibility = !advancedFilteringVisibility;"
-            >
-              {{ t('sortableTable.addFilter') }}
-            </button>
-            <div
-              v-show="advancedFilteringVisibility"
-              class="advanced-filter-container"
-            >
-              <input
-                ref="advancedSearchQuery"
-                v-model="advFilterSearchTerm"
-                type="search"
-                class="advanced-search-box"
-                :placeholder="t('sortableTable.filterFor')"
-              >
-              <div class="middle-block">
-                <span>{{ t('sortableTable.in') }}</span>
-                <LabeledSelect
-                  v-model:value="advFilterSelectedProp"
-                  class="filter-select"
-                  :clearable="true"
-                  :options="advFilterSelectOptions"
-                  :disabled="false"
-                  :searchable="false"
-                  mode="edit"
-                  :multiple="false"
-                  :taggable="false"
-                  :placeholder="t('sortableTable.selectCol')"
-                  @selecting="(col) => advFilterSelectedLabel = col.label"
-                />
-              </div>
-              <div class="bottom-block">
-                <button
-                  class="btn role-secondary"
-                  :disabled="!advancedFilteringValues.length"
-                  @click="clearAllAdvancedFilters"
-                >
-                  {{ t('sortableTable.resetFilters') }}
-                </button>
-                <button
-                  class="btn role-primary"
-                  @click="addAdvancedFilter"
-                >
-                  {{ t('sortableTable.add') }}
-                </button>
-              </div>
-            </div>
           </div>
-          <input
-            v-else-if="search"
-            ref="searchQuery"
-            v-model="eventualSearchQuery"
-            type="search"
-            class="input-sm search-box"
-            :aria-label="t('sortableTable.searchLabel')"
-            :placeholder="t('sortableTable.search')"
-          >
-          <slot name="header-button" />
         </div>
       </div>
-      </div>
+
+
        <!-- 分页 -->
       <div
           v-if="showPaging"

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.00000000117",
   "engines": {
     "node": ">=20.0.0"
   },