@rancher/shell 0.3.10 → 0.3.11

package/components/DetailText.vue

@@ -170,6 +170,7 @@ export default {
     <span
       v-else
       v-clean-html="bodyHtml"
+      data-testid="detail-top_html"
       :class="{'conceal': concealed, 'monospace': monospace && !isBinary}"
     />
 

package/components/ResourceList/index.vue

@@ -8,7 +8,7 @@ import IconMessage from '@shell/components/IconMessage.vue';
 import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
-import { sameContents } from 'utils/array';
+import { sameContents } from '@shell/utils/array';
 
 export default {
   name: ResourceListComponentName,

package/components/SortableTable/THead.vue

@@ -217,6 +217,7 @@ export default {
         <Checkbox
           v-model="isAll"
           class="check"
+          data-testid="sortable-table_check_select_all"
           :indeterminate="isIndeterminate"
           :disabled="noRows || noResults"
         />

package/components/form/ChangePassword.vue

@@ -342,6 +342,7 @@ export default {
         <Password
           v-if="isChange"
           v-model="passwordCurrent"
+          data-testid="account__current_password"
           class="mt-10"
           :required="true"
           :label="t('changePassword.currentPassword.label')"
@@ -368,6 +369,7 @@ export default {
           <div :class="{'col': isCreateEdit, 'span-4': isCreateEdit}">
             <Password
               v-model="passwordNew"
+              data-testid="account__new_password"
               class="mt-10"
               :label="t('changePassword.userGen.newPassword.label')"
               :required="userGeneratedPasswordsRequired"
@@ -377,6 +379,7 @@ export default {
           <div :class="{'col': isCreateEdit, 'span-4': isCreateEdit}">
             <Password
               v-model="passwordConfirm"
+              data-testid="account__confirm_password"
               class="mt-10"
               :label="t('changePassword.userGen.confirmPassword.label')"
               :required="userGeneratedPasswordsRequired"

package/detail/helm.cattle.io.projecthelmchart.vue

@@ -43,8 +43,8 @@ export default {
       };
     },
     monitoringNamespace() {
-      // arbitrarily picking the alertmanagerURL here, they're all going to be the same.
-      return this.pullKeyFromUrl(this.relativeDashboardValues.alertmanagerURL, 'namespaces');
+      // picking the prometheusURL here, they're all going to be the same, but alertmanager and grafana can be deactivated
+      return this.pullKeyFromUrl(this.relativeDashboardValues.prometheusURL, 'namespaces');
     },
     alertServiceEndpoint() {
       return this.pullServiceEndpointFromUrl(this.relativeDashboardValues.alertmanagerURL);

package/edit/token.vue

@@ -273,6 +273,7 @@ export default {
       <div class="right">
         <button
           type="button"
+          data-testid="token_done_create_button"
           class="btn role-primary"
           @click="doneCreate"
         >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/account/index.vue

@@ -159,6 +159,7 @@ export default {
           v-if="canChangePassword"
           type="button"
           class="btn role-primary"
+          data-testid="account_change_password"
           @click="$refs.promptChangePassword.show(true)"
         >
           {{ t("accountAndKeys.account.change") }}
@@ -179,6 +180,7 @@ export default {
       <button
         v-if="apiKeySchema"
         class="btn role-primary add mb-20"
+        data-testid="account_create_api_keys"
         @click="addKey"
       >
         {{ t('accountAndKeys.apiKeys.add.label') }}
@@ -193,6 +195,7 @@ export default {
         :rows="apiKeys"
         :headers="apiKeyheaders"
         key-field="id"
+        data-testid="api_keys_list"
         :search="true"
         :row-actions="true"
         :table-actions="true"

package/plugins/steve/subscribe.js

@@ -43,12 +43,16 @@ const workerQueues = {};
 
 const supportedStores = [STORE.CLUSTER, STORE.RANCHER, STORE.MANAGEMENT];
 
-const waitForSettingsSchema = (store) => {
-  return waitFor(() => !!store.getters['management/byId'](SCHEMA, MANAGEMENT.SETTING));
+const isWaitingForDestroy = (storeName, store) => {
+  return store.$workers[storeName]?.waitingForDestroy && store.$workers[storeName].waitingForDestroy();
 };
 
-const waitForSettings = (store) => {
-  return waitFor(() => !!store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE));
+const waitForSettingsSchema = (storeName, store) => {
+  return waitFor(() => isWaitingForDestroy(storeName, store) || !!store.getters['management/byId'](SCHEMA, MANAGEMENT.SETTING));
+};
+
+const waitForSettings = (storeName, store) => {
+  return waitFor(() => isWaitingForDestroy(storeName, store) || !!store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE));
 };
 
 const isAdvancedWorker = (ctx) => {
@@ -80,18 +84,41 @@ export async function createWorker(store, ctx) {
     // it will simply queue up any messages for the real worker to process when it loads up
     store.$workers[storeName] = {
       postMessage: (msg) => {
+        if (Object.keys(msg)?.[0] === 'destroyWorker') {
+          // The worker has been destroyed before it's been set up. Flag this so we stop waiting for mgmt settings and then can destroy worker.
+          // This can occurr when the user is redirected to the log in page
+          // - workers created (but waiting)
+          // - logout is called
+          // - <store>/unsubscribe is dispatched
+          // - wait for worker object to be destroyed <-- requires initial wait to be unblocked
+          store.$workers[storeName].mode = WORKER_MODES.DESTROY_MOCK;
+
+          return;
+        }
         if (workerQueues[storeName]) {
           workerQueues[storeName].push(msg);
         } else {
           workerQueues[storeName] = [msg];
         }
       },
-      mode: WORKER_MODES.WAITING
+      mode:              WORKER_MODES.WAITING,
+      waitingForDestroy: () => {
+        return store.$workers[storeName]?.mode === WORKER_MODES.DESTROY_MOCK;
+      },
+      destroy: () => {
+        // Similar to workerActions.destroyWorker
+        delete store.$workers[storeName];
+      }
     };
   }
 
-  await waitForSettingsSchema(store);
-  await waitForSettings(store);
+  await waitForSettingsSchema(storeName, store);
+  await waitForSettings(storeName, store);
+  if (store.$workers[storeName].waitingForDestroy()) {
+    store.$workers[storeName].destroy();
+
+    return;
+  }
   const advancedWorker = isAdvancedWorker(ctx);
 
   const workerActions = {

package/plugins/steve/worker/index.js

@@ -4,9 +4,10 @@ import basicWorkerConstructor from '@shell/plugins/steve/worker/web-worker.basic
 import advancedWorkerConstructor from '@shell/plugins/steve/worker/web-worker.advanced.js';
 
 export const WORKER_MODES = {
-  WAITING:  'waiting',
-  BASIC:    'basic',
-  ADVANCED: 'advanced'
+  WAITING:      'waiting',
+  DESTROY_MOCK: 'destroy',
+  BASIC:        'basic',
+  ADVANCED:     'advanced'
 };
 
 export default function storeWorker(mode, options = {}, closures = {}) {