@rancher/shell 3.0.1-rc.2 → 3.0.1-rc.4

package/assets/styles/app.scss

@@ -32,4 +32,3 @@
 
 @import "./vendor/vue-select";
 @import "./vendor/code-mirror";
-@import 'node_modules/xterm/css/xterm.css';

package/assets/translations/en-us.yaml

@@ -1065,7 +1065,7 @@ catalog:
     target:
       git: Git repository containing Helm chart or cluster template definitions
       http: http(s) URL to an index generated by Helm
-      oci: OCI Repository <span class="oci-experimental-badge text-bold ml-5">Experimental</span>
+      oci: OCI Repository
       label: Target
     url:
       label: Index URL
@@ -1480,16 +1480,16 @@ cluster:
       defaultLabel: Use default data directory configuration
       commonLabel: Use a common base directory for data directory configuration (sub-directories will be used for the system-agent, provisioning and distro paths)
       customLabel: Use custom data directories
-    common: 
+    common:
       label: Data directory base path
       tooltip: Data directory base path. We will append the sub-directories appropriate for each directory (/agent, /provisioning and either /rke2 or /k3s)
-    systemAgent: 
+    systemAgent:
       label: System-agent directory path
       tooltip: Data directory for the system-agent connection info and plans
-    provisioning: 
+    provisioning:
       label: Provisioning directory path
       tooltip: Data directory for provisioning related files
-    k8sDistro: 
+    k8sDistro:
       label: K8s Distro directory path
       tooltip: Data directory for the k8s distro
   machineConfig:
@@ -5300,7 +5300,6 @@ setup:
     skip: Skip
     tip: What URL should be used for this {vendor} installation? All the nodes in your clusters will need to be able to reach this.
   setPassword: The first order of business is to set a strong password for the default <code>{username}</code> user. We suggest using this random one generated just for you, but enter your own if you like.
-  telemetry: Allow collection of <a href="{docsBase}/faq/telemetry" target="_blank" rel="noopener noreferrer nofollow">anonymous statistics</a> to help us improve {name}
   useManual: Set a specific password to use
   useRandom: Use a randomly generated password
   welcome: Welcome to {vendor}!
@@ -6139,6 +6138,14 @@ wm:
     clear: Clear
     containerName: "Container: {label}"
     failed: "Unable to open a shell to the container (none of the shell commmands succeeded)\n\r"
+    logLevel:
+      info: INFO
+      error: ERROR
+      warning: WARN
+      debug: DEBUG
+    logMessage:
+      containerError: "{ logLevel }: Container missing shell executable (/bin/sh)"
+
   kubectlShell:
     title: "Kubectl: {name}"
 
@@ -6544,7 +6551,7 @@ workload:
           managed: Managed
           shared: Shared
       drivers:
-        driver.longhorn.io: Longhorn
+        driver-longhorn-io: Longhorn
       fsType: Filesystem Type
       shareName: Share Name
       secretName: Secret Name
@@ -7415,7 +7422,6 @@ advancedSettings:
     'ui-dashboard-index': 'HTML index location for the {appName} UI.'
     'ui-offline-preferred': 'Controls whether UI assets are served locally by the server container or from the remote URL defined in the ui-index and ui-dashboard-index settings. The `Dynamic` option will use local assets in production builds of {appName}.'
     'ui-pl': 'Private-Label company name.'
-    'telemetry-opt': 'Telemetry reporting opt-in.'
     'auth-user-info-max-age-seconds': 'The maximum age of a users auth tokens before an auth provider group membership sync will be performed.'
     'auth-user-info-resync-cron': 'Default cron schedule for resyncing auth provider group memberships.'
     'cluster-template-enforcement': 'Non-admins will be restricted to launching clusters via preapproved RKE Templates only.'
@@ -7440,10 +7446,6 @@ advancedSettings:
     'ui-default-landing':
       ember: Cluster Manager
       vue: Cluster Explorer
-    'telemetry-opt':
-      prompt: Prompt
-      in: Opt-in to Telemetry
-      out: Opt-out of Telemetry
     'ui-offline-preferred':
       dynamic: Dynamic
       true: Local

package/assets/translations/zh-hans.yaml

@@ -4556,9 +4556,6 @@ rbac:
       admin:
         label: 管理员
         description: 管理员可以完全控制整个安装以及所有集群中的所有资源。
-      restricted-admin:
-        label: 受限管理员
-        description: 受限管理员可以完全控制所有下游集群的所有资源，但不能访问本地集群。
       user:
         label: 普通用户
         description: 普通用户可以创建集群，并管理其授权访问的集群和项目。
@@ -4967,7 +4964,6 @@ setup:
     skip: 跳过
     tip: 此 {vendor} 安装应使用什么 URL？集群中的所有节点都需要能访问该 URL。
   setPassword: 请为默认用户 <code>{username}</code>设置强密码。建议使用生成的随机密码。你也可以自行设置。
-  telemetry: 允许收集<a href="{docsBase}/faq/telemetry" target="_blank" rel="noopener noreferrer nofollow">匿名统计数据</a>，以帮我们改进 {name}。
   useManual: 设置密码
   useRandom: 使用随机生成的密码
   welcome: 欢迎使用 {vendor}！
@@ -7014,7 +7010,6 @@ advancedSettings:
     'ui-dashboard-index': '{appName} UI 的 HTML 索引位置。'
     'ui-offline-preferred': '控制 UI 资产是由服务器容器在本地提供，还是从 ui-index 和 ui-dashboard-index 设置中定义的远程 URL 提供。`动态` 选项将在 {appName} 的生产版本中使用本地资产。'
     'ui-pl': '自有品牌公司名称。'
-    'telemetry-opt': '遥测报告加入。'
     'auth-user-info-max-age-seconds': '在同步验证提供程序组成员之前，用户验证 Token 的最长存活时间。'
     'auth-user-info-resync-cron': '重新同步验证提供程序组成员的默认 cron 调度。'
     'cluster-template-enforcement': '非管理员只能通过预先批准的 RKE 模板启动集群。'
@@ -7035,10 +7030,6 @@ advancedSettings:
     'ui-default-landing':
       ember: Cluster Manager
       vue: 集群浏览器
-    'telemetry-opt':
-      prompt: 提示
-      in: 加入遥测
-      out: 退出遥测
     'ui-offline-preferred':
       dynamic: 动态
       true: 本地

package/components/GlobalRoleBindings.vue

@@ -108,7 +108,6 @@ export default {
       // This not only identifies global roles but the order here is the order we want to display them in the UI
       globalPermissions: [
         'admin',
-        'restricted-admin',
         'user',
         'user-base',
       ],
@@ -121,7 +120,6 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['releaseNotesUrl']),
     ...mapGetters({ t: 'i18n/t' }),
 
     isCreate() {
@@ -375,11 +373,6 @@ export default {
                     </div>
                   </template>
                 </Checkbox>
-                <p
-                  v-if="role.id === 'restricted-admin'"
-                  v-clean-html="t('rbac.globalRoles.role.restricted-admin.deprecation', { releaseNotesUrl }, true)"
-                  class="deprecation-notice"
-                />
               </div>
             </div>
           </template>

package/components/ResourceDetail/Masthead.vue

@@ -447,7 +447,7 @@ export default {
               {{ parent.displayName }}:
             </router-link>
             <span v-else>{{ parent.displayName }}:</span>
-            <span v-if="value.detailPageHeaderActionOverride && value.detailPageHeaderActionOverride(realMode)">{{ value.detailPageHeaderActionOverride(realMode) }}</span>
+            <span v-if="value?.detailPageHeaderActionOverride && value?.detailPageHeaderActionOverride(realMode)">{{ value?.detailPageHeaderActionOverride(realMode) }}</span>
             <t
               v-else
               class="masthead-resource-title"

package/components/ResourceDetail/index.vue

@@ -14,6 +14,8 @@ import { clone, diff } from '@shell/utils/object';
 import IconMessage from '@shell/components/IconMessage';
 import ForceDirectedTreeChart from '@shell/components/fleet/ForceDirectedTreeChart';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
+import { stringify } from '@shell/utils/error';
+import { Banner } from '@components/Banner';
 
 function modeFor(route) {
   if ( route.query?.mode === _IMPORT ) {
@@ -48,6 +50,7 @@ export default {
     ResourceYaml,
     Masthead,
     IconMessage,
+    Banner
   },
 
   mixins: [CreateEditView],
@@ -75,7 +78,11 @@ export default {
     componentTestid: {
       type:    String,
       default: 'resource-details'
-    }
+    },
+    errorsMap: {
+      type:    Object,
+      default: null
+    },
   },
 
   async fetch() {
@@ -202,16 +209,26 @@ export default {
         notFound = fqid;
       }
 
-      if (realMode === _VIEW) {
-        model = liveModel;
-      } else {
-        model = await store.dispatch(`${ inStore }/clone`, { resource: liveModel });
-      }
-
-      initialModel = await store.dispatch(`${ inStore }/clone`, { resource: liveModel });
+      try {
+        if (realMode === _VIEW) {
+          model = liveModel;
+        } else {
+          model = await store.dispatch(`${ inStore }/clone`, { resource: liveModel });
+        }
+        initialModel = await store.dispatch(`${ inStore }/clone`, { resource: liveModel });
 
+        if ( as === _YAML ) {
+          yaml = await getYaml(this.$store, liveModel);
+        }
+      } catch (e) {
+        this.errors.push(e);
+      }
       if ( as === _YAML ) {
-        yaml = await getYaml(this.$store, liveModel);
+        try {
+          yaml = await getYaml(this.$store, liveModel);
+        } catch (e) {
+          this.errors.push(e);
+        }
       }
 
       if ( as === _GRAPH ) {
@@ -225,7 +242,11 @@ export default {
     }
 
     // Ensure common properties exists
-    model = await store.dispatch(`${ inStore }/cleanForDetail`, model);
+    try {
+      model = await store.dispatch(`${ inStore }/cleanForDetail`, model);
+    } catch (e) {
+      this.errors.push(e);
+    }
 
     const out = {
       hasGraph,
@@ -272,6 +293,7 @@ export default {
       notFound:        null,
       canViewChart:    true,
       canViewYaml:     null,
+      errors:          []
     };
   },
 
@@ -311,6 +333,18 @@ export default {
 
       return null;
     },
+    hasErrors() {
+      return this.errors?.length && Array.isArray(this.errors);
+    },
+    mappedErrors() {
+      return !this.errors ? {} : this.errorsMap || this.errors.reduce((acc, error) => ({
+        ...acc,
+        [error]: {
+          message: error?.data?.message || error,
+          icon:    null
+        }
+      }), {});
+    },
   },
 
   watch: {
@@ -360,6 +394,7 @@ export default {
   },
 
   methods: {
+    stringify,
     setSubtype(subtype) {
       this.resourceSubtype = subtype;
     },
@@ -371,6 +406,9 @@ export default {
         m[act]();
       }
     },
+    closeError(index) {
+      this.errors = this.errors.filter((_, i) => i !== index);
+    },
   }
 };
 </script>
@@ -398,6 +436,22 @@ export default {
         :value="liveModel"
       />
     </Masthead>
+    <div
+      v-if="hasErrors"
+      id="cru-errors"
+      class="cru__errors"
+    >
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :data-testid="`error-banner${i}`"
+        :label="stringify(mappedErrors[err].message)"
+        :icon="mappedErrors[err].icon"
+        :closable="true"
+        @close="closeError(i)"
+      />
+    </div>
 
     <ForceDirectedTreeChart
       v-if="isGraph && canViewChart"
@@ -413,8 +467,9 @@ export default {
       :yaml="yaml"
       :offer-preview="offerPreview"
       :done-route="doneRoute"
-      :done-override="value.doneOverride"
+      :done-override="value ? value.doneOverride : null"
       @update:value="$emit('input', $event)"
+      @error="e=>errors.push(e)"
     />
 
     <component

package/components/ResourceYaml.vue

@@ -205,58 +205,6 @@ export default {
       cm.getMode().fold = saved;
     },
 
-    onChanges(cm, changes) {
-      if ( changes.length !== 1 ) {
-        return;
-      }
-
-      const change = changes[0];
-
-      if ( change.from.line !== change.to.line ) {
-        return;
-      }
-
-      let line = change.from.line;
-      let str = cm.getLine(line);
-      let maxIndent = indentChars(str);
-
-      if ( maxIndent === null ) {
-        return;
-      }
-
-      cm.replaceRange('', { line, ch: 0 }, { line, ch: 1 }, '+input');
-
-      while ( line > 0 ) {
-        line--;
-        str = cm.getLine(line);
-        const indent = indentChars(str);
-
-        if ( indent === null ) {
-          break;
-        }
-
-        if ( indent < maxIndent ) {
-          cm.replaceRange('', { line, ch: 0 }, { line, ch: 1 }, '+input');
-
-          if ( indent === 0 ) {
-            break;
-          }
-
-          maxIndent = indent;
-        }
-      }
-
-      function indentChars(str) {
-        const match = str.match(/^#(\s+)/);
-
-        if ( match ) {
-          return match[1].length;
-        }
-
-        return null;
-      }
-    },
-
     updateValue(value) {
       this.$refs.yamleditor.updateValue(value);
     },
@@ -354,7 +302,6 @@ export default {
       class="yaml-editor flex-content"
       :editor-mode="editorMode"
       @onReady="onReady"
-      @onChanges="onChanges"
     />
     <slot
       name="yamlFooter"

package/components/SortableTable/THead.vue

@@ -429,7 +429,7 @@ export default {
       color: var(--body-text);
 
       .table-header-container {
-        display: flex;
+        display: inline-flex;
 
         .content {
           display: flex;

package/components/auth/RoleDetailEdit.vue

@@ -1,5 +1,4 @@
 <script>
-import { mapGetters } from 'vuex';
 import { MANAGEMENT, RBAC } from '@shell/config/types';
 import CruResource from '@shell/components/CruResource';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -15,7 +14,6 @@ import { ucFirst } from '@shell/utils/string';
 import SortableTable from '@shell/components/SortableTable';
 import { _CLONE, _DETAIL } from '@shell/config/query-params';
 import { SCOPED_RESOURCES, SCOPED_RESOURCE_GROUPS } from '@shell/config/roles';
-import { Banner } from '@components/Banner';
 import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 
 import { SUBTYPE_MAPPING, VERBS } from '@shell/models/management.cattle.io.roletemplate';
@@ -66,7 +64,6 @@ export default {
     SortableTable,
     Loading,
     Error,
-    Banner,
     LabeledInput
   },
 
@@ -163,12 +160,6 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['releaseNotesUrl']),
-
-    showRestrictedAdminDeprecationBanner() {
-      return this.value.subtype === GLOBAL && this.value.id === 'restricted-admin';
-    },
-
     label() {
       return this.t(`rbac.roletemplate.subtypes.${ this.value.subtype }.label`);
     },
@@ -559,13 +550,6 @@ export default {
     @finish="save"
     @cancel="cancel"
   >
-    <Banner
-      v-if="showRestrictedAdminDeprecationBanner"
-      color="warning"
-      class="mb-20"
-    >
-      <span v-clean-html="t('rbac.globalRoles.role.restricted-admin.deprecation', { releaseNotesUrl }, true)" />
-    </Banner>
     <template v-if="isDetail">
       <SortableTable
         key-field="index"

package/components/form/UnitInput.vue

@@ -6,7 +6,7 @@ import { _EDIT } from '@shell/config/query-params';
 export default {
   components: { LabeledInput },
 
-  emits: ['update:value'],
+  emits: ['update:value', 'update:validation', 'change', 'blur'],
 
   props: {
     /**

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

@@ -184,7 +184,7 @@ describe('component: UnitInput', () => {
     input.trigger('blur');
 
     expect(wrapper.emitted('update:value')).toBeTruthy();
-    expect(wrapper.emitted('update:value')[4][0]).toBe(value);
+    expect(wrapper.emitted('update:value')[3][0]).toBe(value);
   });
 
   describe.each([

package/components/nav/TopLevelMenu.vue

@@ -1119,7 +1119,7 @@ export default {
           display: block;
           font-size: $icon-size;
           margin-right: 14px;
-          &.group-icon {
+          &:not(.pin){
             width: 42px;
           }
         }

package/components/nav/WindowManager/ContainerShell.vue

@@ -14,6 +14,7 @@ import Socket, {
   EVENT_CONNECT_ERROR,
 } from '@shell/utils/socket';
 import Window from './Window';
+import dayjs from 'dayjs';
 
 const commands = {
   linux: [
@@ -287,7 +288,7 @@ export default {
 
         // If we had an error message, try connecting with the next command
         if (this.errorMsg) {
-          this.terminal.write(this.errorMsg);
+          this.terminal.writeln(this.errorMsg);
           if (this.backupShells.length && this.retries < 2) {
             this.retries++;
             // we're not really counting on this being a reactive change so there's no need to fire the whole action
@@ -299,7 +300,9 @@ export default {
             this.connect();
           } else {
             // Output an message to let he user know none of the shell commands worked
-            this.terminal.write(this.t('wm.containerShell.failed'));
+            const timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
+
+            this.terminal.writeln(`[${ timestamp }] ${ this.t('wm.containerShell.logLevel.info') }: ${ this.t('wm.containerShell.failed') }`);
           }
         }
       });
@@ -317,10 +320,16 @@ export default {
           }
           this.terminal.write(msg);
         } else {
-          console.error(msg); // eslint-disable-line no-console
+          const timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
+          let customError = `[${ timestamp }] ${ this.t('wm.containerShell.logLevel.error') }: ${ this.container }: ${ msg }`;
+
+          if (msg.includes('stat /bin/sh: no such file or directory')) {
+            customError = `[${ timestamp }] ${ this.t('wm.containerShell.logMessage.containerError', { logLevel: this.t('wm.containerShell.logLevel.error') }) }: ${ msg }`;
+          }
+          console.error(customError); // eslint-disable-line no-console
 
           if (`${ type }` === '3') {
-            this.errorMsg = msg;
+            this.errorMsg = customError;
           }
         }
       });

package/components/nav/WindowManager/__tests__/ContainerShell.test.ts

@@ -29,6 +29,7 @@ describe('component: ContainerShell', () => {
     return { rows: 1 };
   });
   const write = jest.fn();
+  const writeln = jest.fn();
   const reset = jest.fn();
 
   jest.mock(/* webpackChunkName: "xterm" */ 'xterm', () => {
@@ -39,6 +40,7 @@ describe('component: ContainerShell', () => {
         open = open;
         focus = focus;
         write = write;
+        writeln = writeln;
         reset = reset
       }
     };
@@ -277,10 +279,10 @@ describe('component: ContainerShell', () => {
     eventConnected();
     eventMessage({ detail: { data: `3${ errorMessage }` } });
 
-    expect(consoleError.mock.calls[0][0]).toBe(errorMessage);
+    expect(consoleError.mock.calls[0][0]).toContain(errorMessage);
     expect(wrapper.vm.isOpen).toBe(true);
     expect(wrapper.vm.isOpening).toBe(false);
-    expect(wrapper.vm.errorMsg).toBe(errorMessage);
+    expect(wrapper.vm.errorMsg).toContain(errorMessage);
     expect(wrapper.vm.os).toBe('linux');
   });
 
@@ -325,10 +327,10 @@ describe('component: ContainerShell', () => {
 
     eventDisconnected();
 
-    expect(consoleError.mock.calls[0][0]).toBe(errorMessage);
+    expect(consoleError.mock.calls[0][0]).toContain(errorMessage);
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
-    expect(wrapper.vm.errorMsg).toBe('eventMessageError');
+    expect(wrapper.vm.errorMsg).toContain('eventMessageError');
     // the backup shell that was leftover was windows so it became the new os in dataprops
     expect(wrapper.vm.os).toBeUndefined();
     // but we still didn't write it to the pod itself since we don't know if it worked
@@ -370,11 +372,11 @@ describe('component: ContainerShell', () => {
     eventMessage({ detail: { data: `3${ windowsErrorMessage }` } });
     eventDisconnected();
 
-    expect(consoleError.mock.calls[0][0]).toBe(linuxErrorMessage);
-    expect(consoleError.mock.calls[1][0]).toBe(windowsErrorMessage);
+    expect(consoleError.mock.calls[0][0]).toContain(linuxErrorMessage);
+    expect(consoleError.mock.calls[1][0]).toContain(windowsErrorMessage);
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
-    expect(wrapper.vm.errorMsg).toBe(windowsErrorMessage);
+    expect(wrapper.vm.errorMsg).toContain(windowsErrorMessage);
     expect(wrapper.vm.os).toBeUndefined();
     // we never found a shell that worked so we're going to leave the pod os as undefined
     expect(defaultContainerShellParams.propsData.pod.os).toBeUndefined();
@@ -426,11 +428,11 @@ describe('component: ContainerShell', () => {
     eventMessage({ detail: { data: `3${ windowsErrorMessage }` } });
     eventDisconnected();
 
-    expect(consoleError.mock.calls[0][0]).toBe(linuxErrorMessage);
-    expect(consoleError.mock.calls[1][0]).toBe(windowsErrorMessage);
+    expect(consoleError.mock.calls[0][0]).toContain(linuxErrorMessage);
+    expect(consoleError.mock.calls[1][0]).toContain(windowsErrorMessage);
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
-    expect(wrapper.vm.errorMsg).toBe(windowsErrorMessage);
+    expect(wrapper.vm.errorMsg).toContain(windowsErrorMessage);
     expect(wrapper.vm.os).toBeUndefined();
     expect(testUndefinedOsParams.propsData.pod.os).toBeUndefined();
     expect(connect.mock.calls).toHaveLength(3);
@@ -472,13 +474,13 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.backupShells).toHaveLength(1);
     expect(wrapper.vm.os).toBeUndefined();
     expect(testUndefinedOsParams.propsData.pod.os).toBeUndefined();
-    expect(wrapper.vm.errorMsg).toBe(linuxErrorMessage);
+    expect(wrapper.vm.errorMsg).toContain(linuxErrorMessage);
 
     eventConnecting();
     eventConnected();
     eventMessage({ detail: { data: `1${ windowsShellMessage }` } });
 
-    expect(consoleError.mock.calls[0][0]).toBe(linuxErrorMessage);
+    expect(consoleError.mock.calls[0][0]).toContain(linuxErrorMessage);
     expect(consoleError.mock.calls[1]).toBeUndefined();
     expect(wrapper.vm.isOpen).toBe(true);
     expect(wrapper.vm.isOpening).toBe(false);
@@ -532,7 +534,7 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.backupShells).toHaveLength(1);
     expect(wrapper.vm.os).toBe('linux');
     expect(testNodeDefinedOsParams.propsData.pod.os).toBe('linux');
-    expect(wrapper.vm.errorMsg).toBe(linuxErrorMessage);
+    expect(wrapper.vm.errorMsg).toContain(linuxErrorMessage);
 
     eventConnecting();
     eventConnected();
@@ -542,7 +544,7 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.backupShells).toHaveLength(1);
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
-    expect(wrapper.vm.errorMsg).toBe(linuxErrorMessage);
+    expect(wrapper.vm.errorMsg).toContain(linuxErrorMessage);
     expect(wrapper.vm.os).toBe('linux');
     expect(testNodeDefinedOsParams.propsData.pod.os).toBe('linux');
     expect(connect.mock.calls).toHaveLength(3);
@@ -552,13 +554,13 @@ describe('component: ContainerShell', () => {
     eventMessage({ detail: { data: `3${ linuxErrorMessage }` } });
     eventDisconnected();
 
-    expect(consoleError.mock.calls[0][0]).toBe(linuxErrorMessage);
-    expect(consoleError.mock.calls[1][0]).toBe(linuxErrorMessage);
-    expect(consoleError.mock.calls[2][0]).toBe(linuxErrorMessage);
+    expect(consoleError.mock.calls[0][0]).toContain(linuxErrorMessage);
+    expect(consoleError.mock.calls[1][0]).toContain(linuxErrorMessage);
+    expect(consoleError.mock.calls[2][0]).toContain(linuxErrorMessage);
     expect(wrapper.vm.backupShells).toHaveLength(1);
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
-    expect(wrapper.vm.errorMsg).toBe(linuxErrorMessage);
+    expect(wrapper.vm.errorMsg).toContain(linuxErrorMessage);
     expect(wrapper.vm.os).toBe('linux');
     expect(testNodeDefinedOsParams.propsData.pod.os).toBe('linux');
     // at some point we have to stop retying and if we're not burning through backup shells, there's a retry limit of 2 for a total of 3 attempts

package/composables/useLabeledFormElement.ts

@@ -1,4 +1,6 @@
-import { ref, computed, ComputedRef, Ref } from 'vue';
+import {
+  ref, computed, ComputedRef, Ref, defineEmits
+} from 'vue';
 import { _VIEW, _EDIT } from '@shell/config/query-params';
 
 interface LabeledFormElementProps {
@@ -70,7 +72,9 @@ export const labeledFormElementProps = {
   }
 };
 
-export const useLabeledFormElement = (props: LabeledFormElementProps, emit: (event: string, ...args: any[]) => void): UseLabeledFormElement => {
+const labeledFormElementEmits = defineEmits(['update:validation']);
+
+export const useLabeledFormElement = (props: LabeledFormElementProps, emit: typeof labeledFormElementEmits): UseLabeledFormElement => {
   const raised = ref(props.mode === _VIEW || !!`${ props.value }`);
   const focused = ref(false);
   const blurred = ref<number | null>(null);