changes after reviews

Author: richard-cox

cypress/e2e/blueprints/nav/fake-cluster.ts

@@ -2577,7 +2577,7 @@ export function generateFakeClusterDataAndIntercepts({
       statusCode: 200,
       body:       fakeNavClusterData.mgmtClusterObj,
     });
-  }).as('provCluster');
+  }).as('mgmtCluster');
 
   // intercept counts for fake cluster https://github.com/rancher/dashboard/issues/10452
   cy.intercept('GET', `/k8s/clusters/${ fakeMgmtClusterId }/v1/counts?*`, (req) => {

cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po.ts

@@ -42,8 +42,12 @@ export default class ClusterManagerListPagePo extends BaseListPagePo {
       });
     }).as('mgmtCluster');
 
-    // Covers both side bar and cluster list
-    cy.intercept('GET', '/v1/management.cattle.io.clusters?page=1&pagesize=10*', (req) => {
+    // Covers both side bar and any standard cluster list
+    cy.intercept({
+      method:   'GET',
+      pathname: '/v1/management.cattle.io.clusters',
+      query:    { pagesize: '*' }
+    }, (req) => {
       req.reply({
         statusCode: 200,
         body:       mgmtClusterList,

shell/edit/provisioning.cattle.io.cluster/index.vue

@@ -87,7 +87,7 @@ export default {
       await this.$store.dispatch('management/watch', { type: MANAGEMENT.CLUSTER, registerType: true });
       await this.$store.dispatch('management/watch', { type: CAPI.RANCHER_CLUSTER, registerType: true });
     } else {
-      hash.mgmtClusters = this.$store.dispatch('management/find', { type: MANAGEMENT.CLUSTER, id: this.value.mgmtClusterId });
+      hash.mgmtClusters = this.value.waitForMgmt();
     }
 
     // No need to fetch charts when editing an RKE1 cluster

shell/models/cluster.js

@@ -65,10 +65,10 @@ export default class NormanCluster extends NormanModel {
   }
 
   waitForProvisioning(timeout = 60000, interval) {
-    const id = this.provisioningClusterId;
-
     return this.waitForTestFn(() => {
+      const id = this.provisioningClusterId;
+
       return id && !!this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, id);
-    }, this.$rootGetters['i18n/t']('cluster.managementTimeout', { type: CAPI.RANCHER_CLUSTER, name: id }), timeout, interval);
+    }, this.$rootGetters['i18n/t']('cluster.managementTimeout', { type: CAPI.RANCHER_CLUSTER, name: this.provisioningClusterId }), timeout, interval);
   }
 }

shell/models/management.cattle.io.node.js

@@ -103,7 +103,7 @@ export default class MgmtNode extends HybridModel {
   }
 
   get provisioningCluster() {
-    return this.mgmtCluster.provCluster;
+    return this.mgmtCluster?.provCluster;
   }
 
   get doneOverride() {

shell/models/provisioning.cattle.io.cluster.js

@@ -357,22 +357,19 @@ export default class ProvCluster extends SteveModel {
 
   waitForMgmt(timeout = 60000, interval) {
     return this.waitForTestFn(() => {
-      // `this` instance isn't getting updated with `status.clusterName`
-      // Workaround - Get fresh copy from the store
-      const pCluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, this.id);
-      const name = this.status?.clusterName || pCluster?.status?.clusterName;
+      const mgmtId = this.mgmtClusterId;
 
       try {
-        if (name) {
+        if (mgmtId) {
           // Just in case we're not generically watching all mgmt clusters and...
           // thus won't receive new mgmt cluster over socket...
           // fire and forget a request to fetch it (this won't make multiple requests if one is already running)
-          this.$dispatch('find', { type: MANAGEMENT.CLUSTER, id: name });
+          this.$dispatch('find', { type: MANAGEMENT.CLUSTER, id: mgmtId });
         }
       } catch {}
 
-      return name && !!this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, name);
-    }, this.$rootGetters['i18n/t']('cluster.managementTimeout', { type: MANAGEMENT.CLUSTER, name }), timeout, interval);
+      return mgmtId && !!this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, mgmtId);
+    }, this.$rootGetters['i18n/t']('cluster.managementTimeout', { type: MANAGEMENT.CLUSTER, name: this.mgmtClusterId }), timeout, interval);
   }
 
   get provisioner() {

shell/pages/diagnostic.vue

@@ -24,7 +24,7 @@ export default {
     clusterForCounts.forEach((mgmtCluster, i) => {
       finalCounts.push({
         id:             mgmtCluster.id,
-        name:           mgmtCluster.spec.displayName,
+        name:           mgmtCluster.spec.displayName || mgmtCluster.metadata?.name,
         namespace:      mgmtCluster.provClusterNamespace,
         counts:         null,
         isTableVisible: !!(i === 0 && clusterForCounts.length === 1)

shell/plugins/steve/subscribe.js

@@ -570,9 +570,11 @@ const sharedActions = {
       } else if (mode !== STEVE_WATCH_MODE.RESOURCE_CHANGES) {
         // - If we continue and open up a watch whenever we receive a `resource.` notification we go to queueChanges (bar resource.changes mode).
         // - queueChanges ignores any change that's for a type that hasn't been registered
-        // - So here we're just existing early, avoiding the watch --> queueChanges --> ignore loop
+        // - So here we're just exiting early, avoiding the watch --> queueChanges --> ignore loop
         //
-        // Interestingly this is hit quite a few times (on cluster create screens theres token, cluster, project, projectRoleTemplateBinding, etc)
+        // Interestingly this is hit quite a few times (on cluster create screens there's token, cluster, project, projectRoleTemplateBinding, etc)
+        state.debugSocket && console.info('Will not Watch (type is not registered)', JSON.stringify(params)); // eslint-disable-line no-console
+
         return;
       }
     }