@rancher/shell 3.0.1-rc.4 → 3.0.1

package/plugins/dashboard-store/getters.js

@@ -445,9 +445,12 @@ export default {
     return undefined;
   },
 
-  paginationEnabled: (state, getters, rootState, rootGetters) => (type = null) => {
+  paginationEnabled: (state, getters, rootState, rootGetters) => (args) => {
+    const id = typeof args === 'object' ? args.id : args;
+    const context = typeof args === 'object' ? args.context : undefined;
+
     const store = state.config.namespace;
-    const resource = type ? { id: type } : null;
+    const resource = id || context ? { id, context } : null;
 
     return paginationUtils.isEnabled({ rootGetters }, { store, resource });
   }

package/plugins/dashboard-store/mutations.js

@@ -1,4 +1,4 @@
-import { markRaw, reactive } from 'vue';
+import { reactive } from 'vue';
 import { addObject, addObjects, clear, removeObject } from '@shell/utils/array';
 import { SCHEMA, COUNT } from '@shell/config/types';
 import { normalizeType, keyFieldFor } from '@shell/plugins/dashboard-store/normalize';
@@ -36,7 +36,7 @@ function registerType(state, type) {
       loadCounter:   0,
 
       // Not enumerable so they don't get sent back to the client for SSR
-      map: markRaw(new Map()),
+      map: new Map(),
     };
 
     state.types[type] = cache;
@@ -164,6 +164,8 @@ export function load(state, {
     }
   }
 
+  cache.havePage = false;
+
   return entry;
 }
 

package/plugins/steve/__tests__/mutations.test.ts

@@ -15,9 +15,10 @@ describe('steve-store: mutations', () => {
           list: [new Resource(pod)],
           map:  new Map([
             [pod.id, new Resource(pod)]
-          ])
+          ]),
         }
       };
+      res.expected.types[POD].havePage = false;
 
       return res;
     };

package/plugins/steve/steve-pagination-utils.ts

@@ -4,8 +4,10 @@ import { NAMESPACE_FILTER_ALL_SYSTEM, NAMESPACE_FILTER_ALL_USER, NAMESPACE_FILTE
 import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
+  CAPI,
   CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
+import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -107,8 +109,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     '': [// all types
       { field: 'metadata.name' },
       { field: 'metadata.namespace' },
-      // { field: 'id' }, // Pending API support
-      // { field: 'metadata.state.name' }, // Pending API support
+      { field: 'id' },
+      { field: 'metadata.state.name' },
       { field: 'metadata.creationTimestamp' },
     ],
     [NODE]: [
@@ -122,11 +124,32 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.NODE]: [
       { field: 'status.nodeName' },
     ],
+    [MANAGEMENT.NODE_POOL]: [
+      { field: 'spec.clusterName' },
+    ],
+    [MANAGEMENT.NODE_TEMPLATE]: [
+      { field: 'spec.clusterName' },
+    ],
+    [MANAGEMENT.CLUSTER]: [
+      { field: 'spec.internal' },
+      { field: 'spec.displayName' },
+      // { field: `status.provider` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+
+    ],
     [CONFIG_MAP]: [
       { field: 'metadata.labels[harvesterhci.io/cloud-init-template]' }
     ],
     [NAMESPACE]: [
       { field: 'metadata.labels[field.cattle.io/projectId]' }
+    ],
+    [CAPI.MACHINE]: [
+      { field: 'spec.clusterName' }
+    ],
+    [CAPI.RANCHER_CLUSTER]: [
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
+      { field: `status.provider` },
+      { field: 'status.clusterName' },
     ]
   }
 

package/plugins/steve/subscribe.js

@@ -452,7 +452,7 @@ const sharedActions = {
   },
 
   unwatch(ctx, {
-    type, id, namespace, selector
+    type, id, namespace, selector, all
   }) {
     const { commit, getters, dispatch } = ctx;
 
@@ -467,16 +467,26 @@ const sharedActions = {
         stop: true, // Stops the watch on a type
       };
 
+      const unwatch = (obj) => {
+        if (getters['watchStarted'](obj)) {
+          // Set that we don't want to watch this type
+          // Otherwise, the dispatch to unwatch below will just cause a re-watch when we
+          // detect the stop message from the backend over the web socket
+          commit('setWatchStopped', obj);
+          dispatch('watch', obj); // Ask the backend to stop watching the type
+          // Make sure anything in the pending queue for the type is removed, since we've now removed the type
+          commit('clearFromQueue', type);
+        }
+      };
+
       if (isAdvancedWorker(ctx)) {
         dispatch('watch', obj); // Ask the backend to stop watching the type
+      } else if (all) {
+        getters['watchesOfType'](type).forEach((obj) => {
+          unwatch(obj);
+        });
       } else if (getters['watchStarted'](obj)) {
-        // Set that we don't want to watch this type
-        // Otherwise, the dispatch to unwatch below will just cause a re-watch when we
-        // detect the stop message from the backend over the web socket
-        commit('setWatchStopped', obj);
-        dispatch('watch', obj); // Ask the backend to stop watching the type
-        // Make sure anything in the pending queue for the type is removed, since we've now removed the type
-        commit('clearFromQueue', type);
+        unwatch(obj);
       }
     }
   },
@@ -1025,6 +1035,10 @@ const defaultGetters = {
     return state.inError[keyForSubscribe(obj)];
   },
 
+  watchesOfType: (state) => (type) => {
+    return state.started.filter((entry) => type === (entry.resourceType || entry.type));
+  },
+
   watchStarted: (state) => (obj) => {
     return !!state.started.find((entry) => equivalentWatch(obj, entry));
   },

package/scripts/extension/parse-tag-name

@@ -14,6 +14,7 @@ if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
   if [[ "${GITHUB_RELEASE_TAG}" != "${BASE_EXT}-${EXT_VERSION}" ]]; then
     echo -e "release tag doesn't match catalog tag: release tag -> ${GITHUB_RELEASE_TAG} ::: curr catalog tag -> ${BASE_EXT}-${EXT_VERSION}"
     gh run cancel ${GITHUB_RUN_ID}
+    exit 1
   fi
 # Ensure "chart" workflow release tag name matches some pkg/<pkg-name>
 else
@@ -33,5 +34,6 @@ else
   if [[ "${NO_MATCHES}" == "true" ]]; then
     echo -e "release tag doesn't match any chart tag: ${GITHUB_RELEASE_TAG}. Check your pkg/<!-YOUR-EXT-> folders and corresponding versions to complete the match"
     gh run cancel ${GITHUB_RUN_ID}
+    exit 1
   fi
 fi

package/scripts/test-plugins-build.sh

@@ -226,5 +226,6 @@ clone_repo_test_extension_build "rancher" "elemental-ui" "elemental"
 clone_repo_test_extension_build "neuvector" "manager-ext" "neuvector-ui-ext"
 clone_repo_test_extension_build "rancher" "capi-ui-extension" "capi"
 clone_repo_test_extension_build "StackVista" "rancher-extension-stackstate" "observability"
+clone_repo_test_extension_build "harvester" "harvester-ui-extension" "harvester"
 
 echo "All done"

package/store/index.js

@@ -38,6 +38,7 @@ import semver from 'semver';
 import { STORE, BLANK_CLUSTER } from '@shell/store/store-types';
 import { isDevBuild } from '@shell/utils/version';
 import { markRaw } from 'vue';
+import paginationUtils from '@shell/utils/pagination-utils';
 
 // Disables strict mode for all store instances to prevent warning about changing state outside of mutations
 // because it's more efficient to do that sometimes.
@@ -225,6 +226,13 @@ const updateActiveNamespaceCache = (state, activeNamespaceCache) => {
   }
 };
 
+/**
+ * Are we in the vai enabled world where mgmt clusters are paginated?
+ */
+const paginateClusters = (rootGetters) => {
+  return paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } });
+};
+
 export const state = () => {
   return {
     managementReady:         false,
@@ -780,15 +788,11 @@ export const actions = {
     // The alternative is simpler (fetch features up front) but would add another blocking request in
 
     const promises = {
-      // Clusters guaranteed always available or your money back
-      clusters: dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } }),
-
       // Features checks on its own if they are available
       features: dispatch('features/loadServer'),
     };
 
     const toWatch = [
-      MANAGEMENT.CLUSTER,
       MANAGEMENT.FEATURE,
     ];
 
@@ -823,6 +827,13 @@ export const actions = {
 
     res = await allHash(promises);
 
+    if (!res.settings || !paginateClusters(rootGetters)) {
+      // This introduces a synchronous request, however we need settings to determine if SSP is enabled
+      // Eventually it will be removed when SSP is always on
+      res.clusters = await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
+      toWatch.push(MANAGEMENT.CLUSTER);
+    }
+
     // See comment above. Now that we have feature flags we can watch resources
     toWatch.forEach((type) => {
       dispatch('management/watch', { type });
@@ -879,7 +890,7 @@ export const actions = {
   // - state.clusterId is the old cluster id (or undefined)
   // - id is the new cluster id (or undefined)
   async loadCluster({
-    state, commit, dispatch, getters
+    state, commit, dispatch, getters, rootGetters
   }, {
     id, product, oldProduct, oldPkg, newPkg, targetRoute
   }) {
@@ -983,9 +994,10 @@ export const actions = {
     // Try and wait until the schema exists before proceeding
     await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
 
-    // Similar to above, we're still waiting on loadManagement to fetch required resources
-    // If we don't have all mgmt clusters yet a request to fetch this cluster and then all clusters (in cleanNamespaces) is kicked off
-    await dispatch('management/waitForHaveAll', { type: MANAGEMENT.CLUSTER });
+    // If SSP is on we won't have requested all clusters
+    if (!paginateClusters(rootGetters)) {
+      await dispatch('management/waitForHaveAll', { type: MANAGEMENT.CLUSTER });
+    }
 
     // See if it really exists
     try {
@@ -1082,7 +1094,17 @@ export const actions = {
     commit('updateNamespaces', { filters: ids, getters });
   },
 
-  async cleanNamespaces({ getters, dispatch }) {
+  async cleanNamespaces({ getters, dispatch, rootGetters }) {
+    if (paginateClusters(rootGetters)) {
+      // See https://github.com/rancher/dashboard/issues/12864
+      // old world...
+      // - loadManagement makes a request to fetch all mgmt clusters
+      // - we would block on that that request above before getting here (otherwise x2 requests for all clusters were made)
+      // new world...
+      // - we won't have all mgmt clusters, so this whole function needs updating (see issue)
+      return;
+    }
+
     // Initialise / Remove any filters that the user no-longer has access to
     await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }); // So they can be got byId below
 

package/tsconfig.json

@@ -25,6 +25,12 @@
       "../node_modules/@types"
     ],
   },
+  "include": [
+    "./**/*.ts",
+    "./**/*.d.ts",
+    "./**/*.tsx",
+    "./**/*.vue"
+  ],
   "exclude": [
     "node_modules",
     "dist",
@@ -38,4 +44,4 @@
     "../docusaurus",
     "../**/*.spec.ts"
   ]
-}
+}

package/types/resources/settings.d.ts

@@ -20,7 +20,7 @@ export interface PaginationSettings {
           /**
            * Specific resource type to enable
            */
-          enabled: string[],
+          enabled: (string | { resource: string, context: string[]})[],
           /**
            * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
            */