dashboard-shell-shell 1.0.122 → 1.0.1000000081

package/components/__tests__/SlideInPanelManager.spec.ts

@@ -0,0 +1,166 @@
+import { mount } from '@vue/test-utils';
+import { createStore, Store } from 'vuex';
+import { nextTick } from 'vue';
+import SlideInPanelManager from '@shell/components/SlideInPanelManager.vue';
+
+const MockComponent = {
+  template: '<div data-testid="slide-in-panel-component">Mock Panel Content</div>',
+  props:    ['width', 'title', 'extraProp']
+};
+
+describe('slideInPanelManager.vue with Teleport', () => {
+  let store: Store<any>;
+  let getters: Record<string, () => any>;
+  let slidesDiv: HTMLDivElement;
+
+  beforeEach(() => {
+    // Create teleport target container
+    slidesDiv = document.createElement('div');
+    slidesDiv.setAttribute('id', 'slides');
+    document.body.appendChild(slidesDiv);
+
+    getters = {
+      'slideInPanel/isOpen':         () => true,
+      'slideInPanel/component':      () => MockComponent,
+      'slideInPanel/componentProps': () => ({
+        width: '40%', title: 'Test Title', extraProp: 'extra'
+      })
+    };
+
+    store = createStore({
+      getters,
+      mutations: { 'slideInPanel/close': jest.fn() }
+    });
+  });
+
+  afterEach(() => {
+    // Clean up the teleport container
+    document.body.removeChild(slidesDiv);
+  });
+
+  const factory = () => {
+    return mount(SlideInPanelManager, {
+      attachTo: document.body, // attach to document so Teleport renders
+      global:   { plugins: [store] }
+    });
+  };
+
+  it('renders slide in panel with proper style when open', async() => {
+    factory();
+    await nextTick();
+
+    const slidePanel = document.querySelector('#slides .slide-in') as HTMLElement;
+    const slideGlass = document.querySelector('[data-testid="slide-in-glass"]') as HTMLElement;
+    const slideComponent = document.querySelector('[data-testid="slide-in-panel-component"]') as HTMLElement;
+    const headerTitle = document.querySelector('#slides .slide-in .header .title') as HTMLElement;
+
+    expect(slidePanel).toBeTruthy();
+    expect(slideGlass).toBeTruthy();
+    expect(slideComponent).toBeTruthy();
+    expect(headerTitle.textContent?.trim()).toBe('Test Title');
+
+    const styleAttr = slidePanel.getAttribute('style') || '';
+
+    expect(styleAttr).toContain('width: 40%');
+    expect(styleAttr).toContain('top: 55px');
+    expect(styleAttr).toContain('height: calc(100vh - 55px)');
+    expect(styleAttr).toContain('right: 0');
+  });
+
+  it('renders default panel title when no title is provided', async() => {
+    // Update getter so that no title is provided
+    getters['slideInPanel/componentProps'] = () => ({ width: '40%' });
+    store = createStore({
+      getters,
+      mutations: { 'slideInPanel/close': jest.fn() }
+    });
+    factory();
+    await nextTick();
+
+    const headerTitle = document.querySelector('#slides #slide-in-panel-manager .header .title') as HTMLElement;
+
+    expect(headerTitle.textContent?.trim()).toBe('Details');
+  });
+
+  it('computes panelTop correctly when a banner exists', async() => {
+    // Create a banner element with a simulated clientHeight.
+    const banner = document.createElement('div');
+
+    banner.setAttribute('id', 'banner-header');
+    document.body.appendChild(banner);
+    // Simulate a banner with a clientHeight of 100.
+    Object.defineProperty(banner, 'clientHeight', { value: 100, configurable: true });
+
+    factory();
+    await nextTick();
+
+    const slidePanel = document.querySelector('#slides .slide-in') as HTMLElement;
+    const styleAttr = slidePanel.getAttribute('style') || '';
+
+    // Expected panelTop = HEADER_HEIGHT (55) + banner.clientHeight (100) = "155px"
+    expect(styleAttr).toContain('top: 155px');
+    expect(styleAttr).toContain('height: calc(100vh - 155px)');
+
+    document.body.removeChild(banner);
+  });
+
+  it('renders slide in glass as hidden and panel with negative right when closed', async() => {
+    // Set isOpen to false.
+    getters['slideInPanel/isOpen'] = () => false;
+    store = createStore({
+      getters,
+      mutations: { 'slideInPanel/close': jest.fn() }
+    });
+    factory();
+    await nextTick();
+
+    const slideGlass = document.querySelector('[data-testid="slide-in-glass"]') as HTMLElement;
+
+    expect(slideGlass).toBeTruthy();
+    expect(slideGlass.style.display).toBe('none');
+
+    const slidePanel = document.querySelector('#slides .slide-in') as HTMLElement;
+    const styleAttr = slidePanel.getAttribute('style') || '';
+
+    // With currentProps width "40%", panelRight should be "-40%" when closed.
+    expect(styleAttr).toContain('right: -40%');
+  });
+
+  it('calls store commit when clicking on the slide-in glass overlay', async() => {
+    const closeMutation = jest.fn();
+
+    getters['slideInPanel/isOpen'] = () => true;
+    store = createStore({
+      getters,
+      mutations: { 'slideInPanel/close': closeMutation }
+    });
+    factory();
+    await nextTick();
+
+    const slideGlass = document.querySelector('[data-testid="slide-in-glass"]') as HTMLElement;
+
+    slideGlass.click();
+    await nextTick();
+
+    expect(closeMutation).toHaveBeenCalledWith({}, undefined);
+  });
+
+  it('calls store commit when clicking on the slide-in close icon', async() => {
+    const closeMutation = jest.fn();
+
+    getters['slideInPanel/isOpen'] = () => true;
+    store = createStore({
+      getters,
+      mutations: { 'slideInPanel/close': closeMutation }
+    });
+    factory();
+    await nextTick();
+
+    const closeIcon = document.querySelector('[data-testid="slide-in-close"]') as HTMLElement;
+
+    closeIcon.click();
+    await nextTick();
+
+    expect(closeMutation).toHaveBeenCalledWith({}, undefined);
+  });
+});

package/components/auth/Principal.vue

@@ -90,6 +90,7 @@ export default {
         <img
           :src="principal.avatarSrc"
           :class="{'round': principal.roundAvatar}"
+          :alt="t('principal.alt.avatar')"
         >
       </div>
       <div
@@ -98,9 +99,9 @@ export default {
       >
         <table>
           <tbody>
-            <tr><td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td></tr>
-            <tr><td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td></tr>
-            <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+            <tr><th>{{ t('principal.name') }}: </th><td>{{ principal.name || principal.loginName }}</td></tr>
+            <tr><th>{{ t('principal.loginName') }}: </th><td>{{ principal.loginName }}</td></tr>
+            <tr><th>{{ t('principal.type') }}: </th><td>{{ principal.displayType }}</td></tr>
           </tbody>
         </table>
       </div>
@@ -164,6 +165,12 @@ export default {
     grid-template-rows: auto math.div($size, 2);
     column-gap: 10px;
 
+    th {
+      text-align: left;
+      font-weight: normal;
+      padding-right: 10px;
+    }
+
     &.showLabels {
       grid-template-areas:
         "avatar name";

package/components/auth/RoleDetailEdit.vue

@@ -801,7 +801,7 @@ export default {
     .columns {
       .col > .unlabeled-select:not(.taggable) {
         // override the odd padding-top from shell/assets/styles/global/_select.scss
-        padding: $unlabaled-select-padding
+        /* padding: $unlabaled-select-padding */
       }
     }
   }

package/components/auth/__tests__/RoleDetailEdit.test.ts

@@ -51,8 +51,9 @@ describe('component: RoleDetailEdit', () => {
     const wrapper = mount(RoleDetailEdit, {
       props: {
         value: {
-          rules:   [{ verbs }],
-          subtype: 'GLOBAL'
+          rules:    [{ verbs }],
+          subtype:  'GLOBAL',
+          metadata: { name: 'global-role-with-inherited' },
         },
       },
 

package/components/form/ArrayList.vue

@@ -1,4 +1,5 @@
 <script>
+import { ref, watch, computed } from 'vue';
 import debounce from 'lodash/debounce';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import { removeAt } from '@shell/utils/array';
@@ -94,22 +95,87 @@ export default {
       // we only want functions in the rules array
       validator: (rules) => rules.every((rule) => ['function'].includes(typeof rule))
     },
+    a11yLabel: {
+      type:    String,
+      default: '',
+    },
+    componentTestid: {
+      type:    String,
+      default: 'array-list',
+    }
   },
-  data() {
-    const input = (Array.isArray(this.value) ? this.value : []).slice();
-    const rows = [];
+
+  setup(props, { emit }) {
+    const input = (Array.isArray(props.value) ? props.value : []).slice();
+    const rows = ref([]);
 
     for ( const value of input ) {
-      rows.push({ value });
+      rows.value.push({ value });
     }
-    if ( !rows.length && this.initialEmptyRow ) {
-      const value = this.defaultAddValue ? clone(this.defaultAddValue) : '';
+    if ( !rows.value.length && props.initialEmptyRow ) {
+      const value = props.defaultAddValue ? clone(props.defaultAddValue) : '';
 
-      rows.push({ value });
+      rows.value.push({ value });
     }
 
-    return { rows, lastUpdateWasFromValue: false };
+    const isView = computed(() => {
+      return props.mode === _VIEW;
+    });
+
+    /**
+     * Cleanup rows and emit input
+     */
+    const update = () => {
+      if ( isView.value ) {
+        return;
+      }
+      const out = [];
+
+      for ( const row of rows.value ) {
+        const trim = !props.valueMultiline && (typeof row.value === 'string');
+        const value = trim ? row.value.trim() : row.value;
+
+        if ( typeof value !== 'undefined' ) {
+          out.push(value);
+        }
+      }
+      emit('update:value', out);
+    };
+
+    const lastUpdateWasFromValue = ref(false);
+    const queueUpdate = debounce(update, 50);
+
+    watch(
+      rows,
+      () => {
+        // lastUpdateWasFromValue is used to break a cycle where when rows are updated
+        // this was called which then forced rows to updated again
+        if (!lastUpdateWasFromValue.value) {
+          queueUpdate();
+        }
+        lastUpdateWasFromValue.value = false;
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => props.value,
+      () => {
+        lastUpdateWasFromValue.value = true;
+        rows.value = (props.value || []).map((v) => ({ value: v }));
+      },
+      { deep: true }
+    );
+
+    return {
+      rows,
+      lastUpdateWasFromValue,
+      queueUpdate,
+      isView,
+      update,
+    };
   },
+
   computed: {
     _addLabel() {
       return this.addLabel || this.t('generic.add');
@@ -117,10 +183,6 @@ export default {
     _removeLabel() {
       return this.removeLabel || this.t('generic.remove');
     },
-
-    isView() {
-      return this.mode === _VIEW;
-    },
     showAdd() {
       return this.addAllowed;
     },
@@ -141,29 +203,7 @@ export default {
       return !this.valueMultiline && this.protip;
     }
   },
-  watch: {
-    value: {
-      deep: true,
-      handler() {
-        this.lastUpdateWasFromValue = true;
-        this.rows = (this.value || []).map((v) => ({ value: v }));
-      }
-    },
-
-    rows: {
-      deep: true,
-      handler(newValue, oldValue) {
-        // lastUpdateWasFromValue is used to break a cycle where when rows are updated
-        // this was called which then forced rows to updated again
-        if (!this.lastUpdateWasFromValue) {
-          this.queueUpdate();
-        }
-        this.lastUpdateWasFromValue = false;
-      }
-    }
-  },
   created() {
-    this.queueUpdate = debounce(this.update, 50);
   },
   methods: {
     add() {
@@ -189,26 +229,6 @@ export default {
       this.queueUpdate();
     },
 
-    /**
-     * Cleanup rows and emit input
-     */
-    update() {
-      if ( this.isView ) {
-        return;
-      }
-      const out = [];
-
-      for ( const row of this.rows ) {
-        const trim = !this.valueMultiline && (typeof row.value === 'string');
-        const value = trim ? row.value.trim() : row.value;
-
-        if ( typeof value !== 'undefined' ) {
-          out.push(value);
-        }
-      }
-      this.$emit('update:value', out);
-    },
-
     /**
      * Handle paste event, e.g. split multiple lines in rows
      */
@@ -254,7 +274,32 @@ export default {
         </h3>
       </slot>
     </div>
-
+    <div
+      v-if="showAdd && !isView"
+      class="footer"
+    >
+      <slot
+        v-if="showAdd"
+        name="add"
+        :add="add"
+      >
+        <button
+          type="button"
+          class="btn role-primary add"
+          :disabled="loading || disableAdd"
+          :data-testid="`${componentTestid}-button`"
+          :aria-label="_addLabel"
+          role="button"
+          @click="add()"
+        >
+          <i
+            class="mr-5 icon"
+            :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
+          />
+          {{ _addLabel }}
+        </button>
+      </slot>
+    </div>
     <template v-if="rows.length">
       <div v-if="showHeader">
         <slot name="column-headers">
@@ -266,7 +311,7 @@ export default {
       <div
         v-for="(row, idx) in rows"
         :key="idx"
-        :data-testid="`array-list-box${ idx }`"
+        :data-testid="`${componentTestid}-box${ idx }`"
         class="box"
       >
         <slot
@@ -290,7 +335,7 @@ export default {
                 v-if="valueMultiline"
                 ref="value"
                 v-model:value="row.value"
-                :data-testid="`textarea-${idx}`"
+                :data-testid="`${componentTestid}-textarea-${idx}`"
                 :placeholder="valuePlaceholder"
                 :mode="mode"
                 :disabled="disabled"
@@ -301,7 +346,7 @@ export default {
                 v-else-if="rules.length > 0"
                 ref="value"
                 v-model:value="row.value"
-                :data-testid="`labeled-input-${idx}`"
+                :data-testid="`${componentTestid}-labeled-input-${idx}`"
                 :placeholder="valuePlaceholder"
                 :disabled="isView || disabled"
                 :rules="rules"
@@ -313,9 +358,10 @@ export default {
                 v-else
                 ref="value"
                 v-model="row.value"
-                :data-testid="`input-${idx}`"
+                :data-testid="`${componentTestid}-input-${idx}`"
                 :placeholder="valuePlaceholder"
                 :disabled="isView || disabled"
+                :aria-label="a11yLabel ? a11yLabel : undefined"
                 @paste="onPaste(idx, $event)"
               >
             </slot>
@@ -335,7 +381,9 @@ export default {
               type="button"
               :disabled="isView"
               class="btn role-link"
-              :data-testid="`remove-item-${idx}`"
+              :data-testid="`${componentTestid}-remove-item-${idx}`"
+              :aria-label="`${_removeLabel} ${idx + 1}`"
+              role="button"
               @click="remove(row, idx)"
             >
               {{ _removeLabel }}
@@ -354,30 +402,7 @@ export default {
         </div>
       </slot>
     </div>
-    <div
-      v-if="showAdd && !isView"
-      class="footer mt-20"
-    >
-      <slot
-        v-if="showAdd"
-        name="add"
-        :add="add"
-      >
-        <button
-          type="button"
-          class="btn role-tertiary add"
-          :disabled="loading || disableAdd"
-          data-testid="array-list-button"
-          @click="add()"
-        >
-          <i
-            class="mr-5 icon"
-            :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
-          />
-          {{ _addLabel }}
-        </button>
-      </slot>
-    </div>
+
   </div>
 </template>
 
@@ -398,7 +423,12 @@ export default {
     .value {
       flex: 1;
       INPUT {
-        height: $unlabeled-input-height;
+        height: $input-height;
+        border: solid var(--border-width) var(--input-border);
+        padding: 4px 11px;
+        &:hover{
+          box-shadow: 0 4px 6px 0 var(--input-border-box-shadow);
+        }
       }
     }
   }
@@ -406,6 +436,7 @@ export default {
     text-align: right;
   }
   .footer {
+    margin-bottom: 24px;
     .protip {
       float: right;
       padding: 5px 0;
@@ -415,4 +446,11 @@ export default {
   .required {
     color: var(--error);
   }
+  :deep() .labeled-input.compact-input{
+    padding: 0px;
+  }
+  :deep() .box{
+    margin-bottom: 10px;
+  }
+    
 </style>

package/components/form/ArrayListGrouped.vue

@@ -127,8 +127,16 @@ export default {
       & > .remove {
         position: absolute;
 
-        top: 0;
-        right: 0;
+        top: 10px;
+        right: 10px;
+        & > .close{
+          width: 32px;
+          min-width: 32px !important;
+          color: var(--body-text);
+          &:hover{
+            color: var(--link);
+          }
+        }
       }
 
       & > .info-box {

package/components/form/ArrayListSelect.vue

@@ -98,6 +98,6 @@ export default {
 
 <style lang="scss" scoped>
 :deep() .unlabeled-select {
-  height: 61px;
+  height: 30px;
   }
 </style>

package/components/form/Command.vue

@@ -43,23 +43,14 @@ export default {
   },
 
   data() {
-    const {
-      command,
-      args,
-      workingDir,
-      stdin = false,
-      stdinOnce = false,
-      tty = false,
-    } = this.value;
-
     return {
-      args,
-      command,
+      args:           this.value.args,
+      command:        this.value.command,
       commandOptions: ['No', 'Once', 'Yes'],
-      stdin,
-      stdinOnce,
-      tty,
-      workingDir,
+      stdin:          this.value.stdin || false,
+      stdinOnce:      this.value.stdin || false,
+      tty:            this.value.tty || false,
+      workingDir:     this.value.workingDir,
     };
   },
 

package/components/form/EnvVars.vue

@@ -39,14 +39,10 @@ export default {
   },
 
   data() {
-    const { env = [], envFrom = [] } = this.value;
-
-    const allEnv = [...env, ...envFrom].map((row) => {
-      return { value: row, id: randomStr(4) };
-    });
-
     return {
-      env, envFrom, allEnv
+      env:     [],
+      envFrom: [],
+      allEnv:  [],
     };
   },
 
@@ -63,7 +59,18 @@ export default {
       }
     }
   },
+
   created() {
+    const { env = [], envFrom = [] } = this.value;
+
+    const allEnv = [...env, ...envFrom].map((row) => {
+      return { value: row, id: randomStr(4) };
+    });
+
+    this.env = env;
+    this.envFrom = envFrom;
+    this.allEnv = allEnv;
+
     this.queueUpdate = debounce(this.update, 500);
   },
 
@@ -107,7 +114,8 @@ export default {
   <div :style="{'width':'100%'}">
     <div
       v-for="(row, i) in allEnv"
-      :key="i"
+      :key="row.id"
+      :data-testid="`env-var-row-${i}`"
     >
       <ValueFromResource
         v-model:value="row.value"

package/components/form/Footer.vue

@@ -51,7 +51,7 @@ export default defineComponent({
   <div v-if="!isView">
     <div class="spacer-small" />
 
-    <div
+    <!-- <div
       v-for="(err,idx) in errors"
       :key="idx"
     >
@@ -59,7 +59,7 @@ export default defineComponent({
         color="error"
         :label="err"
       />
-    </div>
+    </div> -->
     <div class="buttons">
       <div class="left">
         <slot name="left" />
@@ -91,9 +91,10 @@ export default defineComponent({
 
 <style lang='scss'>
   .buttons {
-    display: grid;
+    /* display: grid;
     grid-template-areas:  "left right";
-    grid-template-columns: "min-content auto";
+    grid-template-columns: "min-content auto"; */
+    display: flex;
 
     .left {
       grid-area: left;
@@ -105,11 +106,13 @@ export default defineComponent({
     }
 
     .right {
-      grid-area: right;
-      text-align: right;
+      /* grid-area: right;
+      text-align: right; */
+      display: flex;
 
       .btn, button {
-        margin: 0 0 0 $column-gutter;
+        /* margin: 0 0 0 $column-gutter; */
+        margin: 0 10px 0 0px;
       }
     }
   }