dashboard-shell-shell 1.0.111 → 1.0.113

package/components/form/__tests__/Probe.test.ts

@@ -6,18 +6,20 @@ import { DefaultProps } from 'vue/types/options';
 
 describe('component: Probe', () => {
   describe.each([
-    ['HTTPS', ['port', 'path']],
-    ['tcp', ['socket']],
-    ['exec', ['command']],
-  ])('given kind %p', (kind, extraFields) => {
+    [{ httpGet: { scheme: 'https' } }, ['port', 'path']],
+    [{ tcpSocket: {} }, ['socket']],
+    [{ exec: {} }, ['command']],
+  ])('given kind %p', (value, extraFields) => {
     it.each([
       ...extraFields,
       'successThreshold',
       'failureThreshold',
     ])('should emit an update on %p input', (field) => {
       const wrapper = mount(Probe as unknown as ExtendedVue<Vue, {}, {}, {}, DefaultProps>, {
-        props: { mode: _EDIT },
-        data:  () => ({ kind })
+        props: {
+          mode: _EDIT,
+          value,
+        },
       });
       const input = wrapper.find(`[data-testid="input-probe-${ field }"]`).find('input');
       const newValue = 123;
@@ -33,8 +35,10 @@ describe('component: Probe', () => {
       'timeoutSeconds',
     ])('should emit an update on %p input and blur', (field) => {
       const wrapper = mount(Probe as unknown as ExtendedVue<Vue, {}, {}, {}, DefaultProps>, {
-        props: { mode: _EDIT },
-        data:  () => ({ kind })
+        props: {
+          mode: _EDIT,
+          value
+        },
       });
       const input = wrapper.find(`[data-testid="input-probe-${ field }"]`).find('input');
       const newValue = 123;

package/components/form/__tests__/SSHKnownHosts.test.ts

@@ -2,6 +2,17 @@ import { mount } from '@vue/test-utils';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import SSHKnownHosts from '@shell/components/form/SSHKnownHosts/index.vue';
 
+jest.mock('focus-trap', () => {
+  return {
+    createFocusTrap: jest.fn().mockImplementation(() => {
+      return {
+        activate:   jest.fn(),
+        deactivate: jest.fn(),
+      };
+    }),
+  };
+});
+
 describe('component: SSHKnownHosts', () => {
   it.each([
     ['0 entities', '', 0],

package/components/form/__tests__/Select.test.ts

@@ -27,4 +27,41 @@ describe('select.vue', () => {
     // eslint-disable-next-line no-console
     expect(console.warn).not.toHaveBeenCalled();
   });
+
+  it('a11y: adding ARIA props should correctly fill out the appropriate fields on the component', async() => {
+    const label = 'Foo';
+    const value = 'foo';
+    const ariaDescribedById = 'some-described-by-id';
+    const ariaLabelText = 'some-aria-label';
+
+    const wrapper = shallowMount(SelectComponent, {
+      props: {
+        value,
+        options: [
+          { label, value },
+        ],
+      },
+      attrs: {
+        'aria-describedby': ariaDescribedById,
+        'aria-label':       ariaLabelText,
+      }
+    });
+
+    const labeledSelectContainer = wrapper.find('.unlabeled-select');
+    const ariaExpanded = labeledSelectContainer.attributes('aria-expanded');
+    const ariaDescribedBy = labeledSelectContainer.attributes('aria-describedby');
+    const ariaLabel = labeledSelectContainer.attributes('aria-label');
+
+    const vSelectInput = wrapper.find('.inline');
+
+    expect(ariaExpanded).toBe('false');
+    expect(ariaDescribedBy).toBe(ariaDescribedById);
+    expect(ariaLabel).toBe(ariaLabelText);
+
+    // make sure it's hardcoded to a "neutral" value so that
+    // in the current architecture of the component
+    // screen readers won't pick up the default "Select option" aria-label
+    // from the library
+    expect(vSelectInput.attributes('aria-label')).toBe('-');
+  });
 });

package/components/form/__tests__/UnitInput.test.ts

@@ -11,7 +11,7 @@ describe('component: UnitInput', () => {
     expect(wrapper.isVisible()).toBe(true);
   });
 
-  it.each(['blur', 'change'])('should emit input event when "%p" is fired', async(event) => {
+  it.each(['blur', 'update:value'])('should emit input event when "%p" is fired', async(event) => {
     const wrapper = mount(UnitInput, { props: { value: 1, delay: 0 } });
     const input = wrapper.find('input');
 
@@ -20,7 +20,7 @@ describe('component: UnitInput', () => {
     input.trigger(event);
 
     expect(wrapper.emitted('update:value')).toBeTruthy();
-    expect(wrapper.emitted('update:value')[2]).toStrictEqual([4]);
+    expect(wrapper.emitted('update:value')[1]).toStrictEqual([4]);
   });
 
   it.each([
@@ -184,7 +184,7 @@ describe('component: UnitInput', () => {
     input.trigger('blur');
 
     expect(wrapper.emitted('update:value')).toBeTruthy();
-    expect(wrapper.emitted('update:value')[3][0]).toBe(value);
+    expect(wrapper.emitted('update:value')[0][0]).toBe(value);
   });
 
   describe.each([
@@ -207,7 +207,7 @@ describe('component: UnitInput', () => {
       expect(inputElement.value).toBe('123');
     });
 
-    it.each(['input', 'blur'])('on %p 123 should display input value 123', async(trigger) => {
+    it.each(['update:value', 'blur'])('on %p 123 should display input value 123', async(trigger) => {
       const wrapper = mount(UnitInput, {
         props: {
           value: '0',
@@ -248,7 +248,6 @@ describe('component: UnitInput', () => {
       const input = wrapper.find('input');
 
       await input.trigger('update:value');
-      await input.trigger('input');
 
       expect(input.element.value).toBe('123');
     });

package/components/formatter/BadgeStateFormatter.vue

@@ -1,8 +1,9 @@
 <script>
 import { BadgeState } from '@components/BadgeState';
+import DotState from '@shell/components/DotState'
 import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
 export default {
-  components: { BadgeState },
+  components: { BadgeState, DotState },
   props:      {
     value: {
       type:    String,
@@ -49,15 +50,17 @@ export default {
 <template>
   <div>
     <div v-if="arbitrary">
-      <BadgeState
+      <!-- <BadgeState
         v-if="value"
         :color="stateBackground"
         :label="stateDisplay"
-      />
+      /> -->
+      <DotState  v-if="value" :color="stateBackground" :label="stateDisplay" />
     </div>
-    <BadgeState
+    <!-- <BadgeState
       v-else
       :value="row"
-    />
+    /> -->
+    <DotState v-else :value="row" />
   </div>
 </template>

package/components/formatter/InternalExternalIP.vue

@@ -28,6 +28,7 @@ export default {
   <span>
     <template v-if="isIp(row.externalIp)">
       {{ row.externalIp }} <CopyToClipboard
+        :aria-label="t('internalExternalIP.copyExternalIp')"
         label-as="tooltip"
         :text="row.externalIp"
         class="icon-btn"
@@ -43,6 +44,7 @@ export default {
     </template>
     <template v-else-if="isIp(row.internalIp)">
       {{ row.internalIp }}<CopyToClipboard
+        :aria-label="t('internalExternalIP.copyInternalIp')"
         label-as="tooltip"
         :text="row.internalIp"
         class="icon-btn"

package/components/formatter/SecretData.vue

@@ -13,17 +13,25 @@ export default {
     },
   },
 
-  data() {
+  beforeMount() {
     if (this.value.issuer) {
       const { cn, notAfter, sans = [] } = this.value;
 
-      return {
-        cn, expiration: notAfter, sans, isTLS: true
-      };
-    } else {
-      return { isTLS: false };
+      this.expiration = notAfter;
+      this.sans = sans;
+      this.cn = cn;
+      this.isTLS = true;
     }
   },
+
+  data() {
+    return {
+      isTLS:      false,
+      cn:         null,
+      sans:       [],
+      expiration: null,
+    };
+  },
   computed: {
     // use 'text-warning' or 'text-error' classes if the cert is <8 days from expiring or expired respectively
     dateClass() {
@@ -43,7 +51,12 @@ export default {
 
 <template>
   <div v-if="isTLS">
-    <t k="secret.certificate.cn" /> {{ cn }} <span v-if="row.unrepeatedSans && row.unrepeatedSans.length">{{ t('secret.certificate.plusMore', {n:row.unrepeatedSans.length}) }}</span><br>
+    <t k="secret.certificate.cn" />
+    {{ cn }}
+    <span v-if="row.unrepeatedSans && row.unrepeatedSans.length">
+      {{ t('secret.certificate.plusMore', {n:row.unrepeatedSans.length}) }}
+    </span>
+    <br>
     <t k="secret.certificate.expires" />: <DateComponent
       :class="dateClass"
       :value="expiration"

package/components/nav/Favorite.vue

@@ -10,6 +10,9 @@ export default {
   computed: {
     isFavorite() {
       return this.$store.getters['type-map/isFavorite'](this.resource);
+    },
+    ariaLabel() {
+      return this.t(`resourceDetail.masthead.ariaLabel.${ this.isFavorite ? 'unfavoriteAction' : 'favoriteAction' }`, { resource: this.resource });
     }
   },
 
@@ -28,10 +31,11 @@ export default {
 <template>
   <i
     :tabindex="0"
-    :aria-checked="!!isFavorite"
+    :aria-pressed="!!isFavorite"
     class="favorite icon"
     :class="{'icon-star-open': !isFavorite, 'icon-star': isFavorite}"
     aria-role="button"
+    :aria-label="ariaLabel"
     @click.stop.prevent="toggle"
     @keydown.enter.prevent="toggle"
     @keydown.space.prevent="toggle"

package/components/nav/Group.vue

@@ -158,6 +158,17 @@ export default {
         items = this.group;
       }
 
+      let parentPath = '';
+      const cluster = this.$route.params?.cluster;
+
+      // Where we use nested route configuration, consider the parent route when trying to identify the nav location
+      if (this.$route.matched.length > 1) {
+        const parentRoute = this.$route.matched[this.$route.matched.length - 2];
+
+        parentPath = parentRoute.path.replace(':cluster', cluster);
+        parentPath = parentPath === '/' ? undefined : parentPath;
+      }
+
       for (const item of items.children) {
         if (item.children && this.hasActiveRoute(item)) {
           return true;
@@ -166,8 +177,11 @@ export default {
           const matchesNavLevel = navLevels.filter((param) => !this.$route.params[param] || this.$route.params[param] !== item.route.params[param]).length === 0;
           const withoutHash = this.$route.hash ? this.$route.fullPath.slice(0, this.$route.fullPath.indexOf(this.$route.hash)) : this.$route.fullPath;
           const withoutQuery = withoutHash.split('?')[0];
+          const itemFullPath = this.$router.resolve(item.route).fullPath;
 
-          if (matchesNavLevel || this.$router.resolve(item.route).fullPath === withoutQuery) {
+          if (matchesNavLevel || itemFullPath === withoutQuery) {
+            return true;
+          } else if (parentPath && itemFullPath === parentPath) {
             return true;
           }
         }
@@ -231,8 +245,11 @@ export default {
         </router-link>
         <h6
           v-else
+           @click="peek($event, true)"
         >
-          <span v-clean-html="group.labelDisplay || group.label" />
+        <i :class="'nav-icon icon-'+group.name.replace(/\s+/g, '').toLowerCase()" />
+        {{ group.labelDisplay || group.label }}
+          <!-- <span v-clean-html="group.labelDisplay || group.label" /> -->
         </h6>
       </slot>
       <i
@@ -260,7 +277,7 @@ export default {
           v-if="child.divider"
           :key="idx"
         >
-          <hr>
+          <hr role="none">
         </li>
         <!-- <div v-else-if="child[childrenKey] && hideGroup(child[childrenKey])" :key="child.name">
           HIDDEN
@@ -342,21 +359,28 @@ export default {
       }
 
       &.active {
-        color: var(--primary-hover-text);
-        background-color: var(--primary-hover-bg);
+        color: var(--nav-hover-color);
+        background-color: var(--nav-active);
 
         h6 {
-          padding: 8px 0 8px 16px;
-          font-weight: bold;
-          color: var(--primary-hover-text);
+          /* padding: 8px 0 8px 16px;
+          font-weight: bold; */
+          color: var(--nav-hover-color);
+        }
+        I{
+          color: var(--nav-hover-color);
         }
 
-        &:hover {
+        /* &:hover {
           background-color: var(--primary-hover-bg);
-        }
+        } */
       }
       &:hover:not(.active) {
-        background-color: var(--nav-hover);
+        background-color: var(--nav-active);
+        color: var(--nav-hover-color);
+        h6{
+          color: var(--nav-hover-color);
+        }
       }
     }
   }
@@ -364,49 +388,53 @@ export default {
   .accordion {
     &.depth-0 {
       > .header {
+        /* padding: 8px 0; */
+        padding: 0px 0px 0px 20px;
+        height: 50px;
 
         &.noHover {
           cursor: default;
         }
 
         > H6 {
+          font-size: 14px;
           text-transform: none;
-          padding: 8px 0 8px 16px;
+          line-height: 50px;
+          display: flex;
+          align-items: center;
         }
 
         > I {
           position: absolute;
           right: 0;
           top: 0;
-          padding: 10px 10px 9px 7px;
+          padding: 0px 20px 0px 0px;
           user-select: none;
+          line-height: 50px;
         }
       }
 
       > .body {
         margin-left: 0;
       }
-
-      &.group-highlight {
-        background: var(--nav-active);
-      }
     }
 
     &.depth-1 {
       > .header {
-        padding-left: 20px;
         > H6 {
-          line-height: 18px;
+          font-size: 13px;
+          line-height: 16px;
           padding: 8px 0 7px 5px !important;
         }
         > I {
-          padding: 10px 7px 9px 7px !important;
+          padding: 9px 7px 8px 7px !important;
         }
       }
     }
 
     &:not(.depth-0) {
       > .header {
+        padding-left: 10px;
         > H6 {
           // Child groups that aren't linked themselves
           display: inline-block;
@@ -428,13 +456,16 @@ export default {
     padding: 0;
 
     A, A I {
-      color: var(--primary-hover-text);
+      /* color: var(--primary-hover-text); */
+      color: var(--nav-hover-color);
     }
 
     A {
-      color: var(--primary-hover-text);
-      background-color: var(--primary-hover-bg);
-      font-weight: bold;
+      background-color: var(--nav-active);
+      ::v-deep .icon {
+          /* color: var(--body-text); */
+          color: var(--nav-hover-color);
+        }
     }
   }
 
@@ -443,9 +474,6 @@ export default {
       border-left: solid 5px transparent;
       line-height: 16px;
       font-size: 14px;
-      padding-left: 24px;
-      display: flex;
-      justify-content: space-between;
     }
 
     A:focus {
@@ -459,4 +487,9 @@ export default {
       }
     }
   }
+  .nav-icon{
+    font-size: 32px;
+    margin-top: -11px;
+    color: #a8abb2;
+  }
 </style>

package/components/nav/Header.vue

@@ -81,7 +81,8 @@ export default {
       extensionHeaderActions: getApplicableExtensionEnhancements(this, ExtensionPoint.ACTION, ActionLocation.HEADER, this.$route),
       ctx:                    this,
       showImportModal:        false,
-      showSearchModal:        false
+      showSearchModal:        false,
+      userIcon:               require('~shell/assets/images/logo.png'),
     };
   },
 
@@ -404,7 +405,7 @@ export default {
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
 
-    <div
+    <!-- <div
       class="menu-spacer"
       :class="{'isSingleProduct': isSingleProduct }"
     >
@@ -523,8 +524,20 @@ export default {
           :alt="t('branding.logos.label')"
         />
       </div>
-    </div>
+    </div> -->
 
+      <!-- logo -->
+      <div class="menu-spacer">
+      <router-link
+        v-if="isSingleProduct && !isRancherInHarvester"
+        :to="singleProductLogoRoute"
+      >
+        <img
+          :src="userIcon"
+        >
+      </router-link>
+    </div>
+    <!-- 中间 -->
     <div class="spacer" />
 
     <div class="rd-header-right">
@@ -696,20 +709,23 @@ export default {
             data-testid="nav_header_showUserMenu"
             :aria-label="t('nav.userMenu.button.label')"
           >
-            <img
+            <!-- <img
               v-if="principal && principal.avatarSrc"
               :src="principal.avatarSrc"
               :class="{'avatar-round': principal.roundAvatar}"
               width="36"
               height="36"
+              :alt="t('nav.alt.userAvatar')"
             >
             <i
               v-else
               class="icon icon-user icon-3x avatar"
-            />
+            /> -->
+            <i class="icon icon-usericon" />
+            <span class="login-name">{{ principal.loginName }}</span>
           </rc-dropdown-trigger>
           <template #dropdownCollection>
-            <template v-if="authEnabled">
+            <!-- <template v-if="authEnabled">
               <div class="user-info">
                 <div class="user-name">
                   <i class="icon icon-lg icon-user" /> {{ principal.loginName }}
@@ -721,13 +737,13 @@ export default {
                 </div>
               </div>
               <rc-dropdown-separator />
-            </template>
-            <rc-dropdown-item
+            </template> -->
+            <!-- <rc-dropdown-item
               v-if="showPreferencesLink"
               @click="$router.push({ name: 'prefs'})"
             >
               {{ t('nav.userMenu.preferences') }}
-            </rc-dropdown-item>
+            </rc-dropdown-item> -->
             <rc-dropdown-item
               v-if="showAccountAndApiKeyLink"
               @click="$router.push({ name: 'account'})"
@@ -760,6 +776,7 @@ export default {
   HEADER {
     display: flex;
     z-index: z-index('mainHeader');
+    box-shadow: 0px 3px 3px 1px rgba(0,0,0,0.12);
 
     > .spacer {
       flex: 1;
@@ -877,7 +894,7 @@ export default {
 
     > * {
       background-color: var(--header-bg);
-      border-bottom: var(--header-border-size) solid var(--header-border);
+      /* border-bottom: var(--header-border-size) solid var(--header-border); */
     }
 
     .rd-header-right {
@@ -890,7 +907,7 @@ export default {
       }
 
       > .top {
-        padding-top: 6px;
+        padding-top: 10px;
 
         INPUT[type='search']::placeholder,
         .vs__open-indicator,
@@ -1010,7 +1027,7 @@ export default {
 
       > .user {
         outline: none;
-        width: var(--header-height);
+        /* width: var(--header-height); */
 
         .v-popper {
           display: flex;
@@ -1024,6 +1041,10 @@ export default {
         .user-image {
           display: flex;
           align-items: center;
+          &:hover{
+            color: var(--primary);
+          }
+
         }
 
         &:focus {
@@ -1152,5 +1173,10 @@ export default {
       }
     }
   }
-
+  .login-name{
+    font-size: 14px;
+    margin-left: 5px;
+    margin-top: 5px;
+    line-height: 20px;
+  }
 </style>

package/components/nav/Jump.vue

@@ -71,6 +71,12 @@ export default {
 
 <template>
   <div>
+    <p
+      id="describe-filter-resource-search"
+      hidden
+    >
+      {{ t('nav.resourceSearch.filteringDescription') }}
+    </p>
     <input
       ref="input"
       v-model="value"
@@ -78,6 +84,7 @@ export default {
       class="search"
       role="textbox"
       :aria-label="t('nav.resourceSearch.label')"
+      aria-describedby="describe-filter-resource-search"
       @keyup.esc="$emit('closeSearch')"
     >
     <div class="results">