@rancher/shell 3.0.2-rc.5 → 3.0.2

package/components/templates/default.vue

@@ -20,14 +20,12 @@ import AwsComplianceBanner from '@shell/components/AwsComplianceBanner';
 import AzureWarning from '@shell/components/auth/AzureWarning';
 import DraggableZone from '@shell/components/DraggableZone';
 import { MANAGEMENT } from '@shell/config/types';
-import isEqual from 'lodash/isEqual';
 import { markSeenReleaseNotes } from '@shell/utils/version';
 import PageHeaderActions from '@shell/mixins/page-actions';
 import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import { getClusterFromRoute, getProductFromRoute } from '@shell/utils/router';
 import { BOTTOM } from '@shell/utils/position';
 import SideNav from '@shell/components/SideNav';
-import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 const SET_LOGIN_ACTION = 'set-as-login';
 
@@ -85,8 +83,8 @@ export default {
 
       if (canSetAsHome) {
         pageActions.push({
-          labelKey: 'nav.header.setLoginPage',
-          action:   SET_LOGIN_ACTION
+          label:  this.t('nav.header.setLoginPage'),
+          action: SET_LOGIN_ACTION
         });
       }
 
@@ -115,35 +113,6 @@ export default {
 
   },
 
-  watch: {
-    clusterId(a, b) {
-      if ( !isEqual(a, b) ) {
-        // Store the last visited route when the cluster changes
-        this.setClusterAsLastRoute();
-      }
-    },
-
-    async currentProduct(a, b) {
-      if ( !isEqual(a, b) ) {
-        if ((a.inStore !== b.inStore || a.inStore !== 'cluster') && this.clusterId && a.name) {
-          const route = {
-            name:   'c-cluster-product',
-            params: {
-              cluster: this.clusterId,
-              product: a.name,
-            }
-          };
-
-          await this.$store.dispatch('prefs/setLastVisited', route);
-        }
-      }
-    },
-  },
-
-  async created() {
-    await this.$store.dispatch('prefs/setLastVisited', this.$route);
-  },
-
   mounted() {
     this.wmPin = window.localStorage.getItem('wm-pin') || BOTTOM;
 
@@ -159,20 +128,6 @@ export default {
   },
 
   methods: {
-    async setClusterAsLastRoute() {
-      if (!this.clusterId || this.clusterId === BLANK_CLUSTER) {
-        return;
-      }
-      const route = {
-        name:   this.$route.name,
-        params: {
-          ...this.$route.params,
-          cluster: this.clusterId,
-        }
-      };
-
-      await this.$store.dispatch('prefs/setLastVisited', route);
-    },
 
     handlePageAction(action) {
       if (action.action === SET_LOGIN_ACTION) {

package/config/features.js

@@ -3,3 +3,4 @@ export const ONE_WAY = [
 ];
 
 export const HARVESTER_NAME = 'harvester';
+export const SCHEDULING_CUSTOMIZATION = 'cluster-agent-scheduling-customization';

package/config/labels-annotations.js

@@ -16,6 +16,7 @@ export const RESOURCE_QUOTA = 'field.cattle.io/resourceQuota';
 export const AZURE_MIGRATED = 'auth.cattle.io/azuread-endpoint-migrated';
 export const WORKSPACE_ANNOTATION = 'objectset.rio.cattle.io/id';
 export const NODE_ARCHITECTURE = 'kubernetes.io/arch';
+export const IMPORTED_CLUSTER_VERSION_MANAGEMENT = 'rancher.io/imported-cluster-version-management';
 
 export const KUBERNETES = {
   SERVICE_ACCOUNT_UID:  'kubernetes.io/service-account.uid',
@@ -55,6 +56,12 @@ export const CAPI = {
   MACHINE_NAME:         'cluster.x-k8s.io/machine',
   DELETE_MACHINE:       'cluster.x-k8s.io/delete-machine',
   PROVIDER:             'provider.cattle.io',
+  /**
+   * RKE2 - metadata.name is human name
+   * RKE1 and some others - metadata.name is v1 mgmt id and it's the v1 mgmt cluster that contains human name
+   * This label ensures something is in the v1 prov cluster that can be sorted/filtered on
+   */
+  HUMAN_NAME:           'provisioning.cattle.io/management-cluster-display-name',
   SECRET_AUTH:          'v2prov-secret-authorized-for-cluster',
   SECRET_WILL_DELETE:   'v2prov-authorized-secret-deletes-on-cluster-removal',
   /**
@@ -109,6 +116,7 @@ export const CATALOG = {
 };
 
 export const FLEET = {
+  REPO_NAME:            'fleet.cattle.io/repo-name',
   CLUSTER_DISPLAY_NAME: 'management.cattle.io/cluster-display-name',
   CLUSTER_NAME:         'management.cattle.io/cluster-name',
   BUNDLE_ID:            'fleet.cattle.io/bundle-id',
@@ -116,7 +124,9 @@ export const FLEET = {
   BUNDLE_NAMESPACE:     'fleet.cattle.io/bundle-namespace',
   MANAGED:              'fleet.cattle.io/managed',
   CLUSTER_NAMESPACE:    'fleet.cattle.io/cluster-namespace',
-  CLUSTER:              'fleet.cattle.io/cluster'
+  CLUSTER:              'fleet.cattle.io/cluster',
+  CREATED_BY_USER_ID:   'fleet.cattle.io/created-by-user-id',
+  CREATED_BY_USER_NAME: 'fleet.cattle.io/created-by-display-name',
 };
 
 export const RBAC = { PRODUCT: 'management.cattle.io/ui-product' };

package/config/router/navigation-guards/index.js

@@ -1,4 +1,5 @@
 import { install as installLoadInitialSettings } from '@shell/config/router/navigation-guards/load-initial-settings';
+import { install as installRecordLastRoute } from '@shell/config/router/navigation-guards/record-last-route';
 import { install as installAttemptFirstLogin } from '@shell/config/router/navigation-guards/attempt-first-login';
 import { install as installAuthentication } from '@shell/config/router/navigation-guards/authentication';
 import { install as installRuntimeExtensionRoute } from '@shell/config/router/navigation-guards/runtime-extension-route';
@@ -16,7 +17,7 @@ export function installNavigationGuards(router, context) {
   // NOTE: the order of the installation matters.
   // Be intentional when adding, removing or modifying the guards that are installed.
 
-  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installServerUpgradeGrowl];
+  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installRecordLastRoute, installServerUpgradeGrowl];
 
   navigationGuardInstallers.forEach((installer) => installer(router, context));
 }

package/config/router/navigation-guards/record-last-route.js

@@ -0,0 +1,24 @@
+export function install(router, context) {
+  router.beforeEach(async(to, from, next) => await recordLastRoute(to, from, next, context));
+}
+
+export async function recordLastRoute(to, from, next, { store }) {
+  try {
+    // - We don't want to record for auth because these handle logging in and logging out
+    // - We don't want to record for index or home because these are the default pages on login and they handle the redirect given the route recorded here.
+    //   If we record then we never actually redirect outside of the home page
+    if (to && !to.name.includes('auth') && to.name !== 'home' && to.name !== 'index') {
+      const route = {
+        name:   to.name,
+        params: to.params,
+
+      };
+
+      store.dispatch('prefs/setLastVisited', route);
+    }
+  } catch (e) {
+    console.error('Failed record last route', e); // eslint-disable-line no-console
+  }
+
+  next();
+}

package/config/settings.ts

@@ -1,16 +1,6 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import {
-  CAPI, MANAGEMENT, EVENT, CATALOG, HPA, INGRESS, SERVICE,
-  CONFIG_MAP,
-  SECRET,
-  POD, NODE,
-  STORAGE_CLASS,
-  PVC,
-  PV,
-  WORKLOAD_TYPES
-} from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -51,73 +41,76 @@ export const SETTING = {
   CA_CERTS: 'cacerts',
 
   // Allow the local cluster to be hidden
-  HIDE_LOCAL_CLUSTER:                   'hide-local-cluster',
-  AUTH_TOKEN_MAX_TTL_MINUTES:           'auth-token-max-ttl-minutes',
-  KUBECONFIG_GENERATE_TOKEN:            'kubeconfig-generate-token',
-  KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES: 'kubeconfig-default-token-ttl-minutes',
-  ENGINE_URL:                           'engine-install-url',
-  ENGINE_ISO_URL:                       'engine-iso-url',
-  FIRST_LOGIN:                          'first-login',
-  INGRESS_IP_DOMAIN:                    'ingress-ip-domain',
-  SERVER_URL:                           'server-url',
-  RKE_METADATA_CONFIG:                  'rke-metadata-config',
-  EULA_AGREED:                          'eula-agreed',
-  AUTH_USER_INFO_MAX_AGE_SECONDS:       'auth-user-info-max-age-seconds',
-  AUTH_USER_SESSION_TTL_MINUTES:        'auth-user-session-ttl-minutes',
-  AUTH_USER_INFO_RESYNC_CRON:           'auth-user-info-resync-cron',
-  AUTH_LOCAL_VALIDATE_DESC:             'auth-password-requirements-description',
-  PASSWORD_MIN_LENGTH:                  'password-min-length', // CATTLE_PASSWORD_MIN_LENGTH
-  CLUSTER_TEMPLATE_ENFORCEMENT:         'cluster-template-enforcement',
-  UI_INDEX:                             'ui-index',
-  UI_DASHBOARD_INDEX:                   'ui-dashboard-index',
-  UI_DASHBOARD_HARVESTER_LEGACY_PLUGIN: 'ui-dashboard-harvester-legacy-plugin',
-  UI_OFFLINE_PREFERRED:                 'ui-offline-preferred',
-  SYSTEM_DEFAULT_REGISTRY:              'system-default-registry',
-  UI_ISSUES:                            'ui-issues',
-  PL:                                   'ui-pl',
-  PL_RANCHER_VALUE:                     'rancher',
-  SUPPORTED:                            'has-support',
-  BANNERS:                              'ui-banners',
-  ISSUES:                               'ui-issues',
-  BRAND:                                'ui-brand',
-  LOGO_LIGHT:                           'ui-logo-light',
-  LOGO_DARK:                            'ui-logo-dark',
-  BANNER_LIGHT:                         'ui-banner-light',
-  BANNER_DARK:                          'ui-banner-dark',
-  LOGIN_BACKGROUND_LIGHT:               'ui-login-background-light',
-  LOGIN_BACKGROUND_DARK:                'ui-login-background-dark',
-  PRIMARY_COLOR:                        'ui-primary-color',
-  LINK_COLOR:                           'ui-link-color',
-  COMMUNITY_LINKS:                      'ui-community-links',
-  FAVICON:                              'ui-favicon',
-  UI_PERFORMANCE:                       'ui-performance',
-  UI_CUSTOM_LINKS:                      'ui-custom-links',
-  UI_SUPPORTED_K8S_VERSIONS:            'ui-k8s-supported-versions-range',
+  HIDE_LOCAL_CLUSTER:                            'hide-local-cluster',
+  AUTH_TOKEN_MAX_TTL_MINUTES:                    'auth-token-max-ttl-minutes',
+  KUBECONFIG_GENERATE_TOKEN:                     'kubeconfig-generate-token',
+  KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES:          'kubeconfig-default-token-ttl-minutes',
+  ENGINE_URL:                                    'engine-install-url',
+  ENGINE_ISO_URL:                                'engine-iso-url',
+  FIRST_LOGIN:                                   'first-login',
+  INGRESS_IP_DOMAIN:                             'ingress-ip-domain',
+  SERVER_URL:                                    'server-url',
+  RKE_METADATA_CONFIG:                           'rke-metadata-config',
+  EULA_AGREED:                                   'eula-agreed',
+  AUTH_USER_INFO_MAX_AGE_SECONDS:                'auth-user-info-max-age-seconds',
+  AUTH_USER_SESSION_TTL_MINUTES:                 'auth-user-session-ttl-minutes',
+  AUTH_USER_INFO_RESYNC_CRON:                    'auth-user-info-resync-cron',
+  AUTH_LOCAL_VALIDATE_DESC:                      'auth-password-requirements-description',
+  PASSWORD_MIN_LENGTH:                           'password-min-length', // CATTLE_PASSWORD_MIN_LENGTH
+  CLUSTER_TEMPLATE_ENFORCEMENT:                  'cluster-template-enforcement',
+  UI_INDEX:                                      'ui-index',
+  UI_DASHBOARD_INDEX:                            'ui-dashboard-index',
+  UI_DASHBOARD_HARVESTER_LEGACY_PLUGIN:          'ui-dashboard-harvester-legacy-plugin',
+  UI_OFFLINE_PREFERRED:                          'ui-offline-preferred',
+  SYSTEM_DEFAULT_REGISTRY:                       'system-default-registry',
+  UI_ISSUES:                                     'ui-issues',
+  PL:                                            'ui-pl',
+  PL_RANCHER_VALUE:                              'rancher',
+  SUPPORTED:                                     'has-support',
+  BANNERS:                                       'ui-banners',
+  ISSUES:                                        'ui-issues',
+  BRAND:                                         'ui-brand',
+  LOGO_LIGHT:                                    'ui-logo-light',
+  LOGO_DARK:                                     'ui-logo-dark',
+  BANNER_LIGHT:                                  'ui-banner-light',
+  BANNER_DARK:                                   'ui-banner-dark',
+  LOGIN_BACKGROUND_LIGHT:                        'ui-login-background-light',
+  LOGIN_BACKGROUND_DARK:                         'ui-login-background-dark',
+  PRIMARY_COLOR:                                 'ui-primary-color',
+  LINK_COLOR:                                    'ui-link-color',
+  COMMUNITY_LINKS:                               'ui-community-links',
+  FAVICON:                                       'ui-favicon',
+  UI_PERFORMANCE:                                'ui-performance',
+  UI_CUSTOM_LINKS:                               'ui-custom-links',
+  UI_SUPPORTED_K8S_VERSIONS:                     'ui-k8s-supported-versions-range',
   /**
    * Allow the backend to force a light/dark theme. Used in non-rancher world and results in the theme used
    * both pre and post log in. If not present defaults to the usual process
    */
-  THEME:                                'ui-theme',
-  SYSTEM_NAMESPACES:                    'system-namespaces',
+  THEME:                                         'ui-theme',
+  SYSTEM_NAMESPACES:                             'system-namespaces',
   /**
    * Cluster Agent configuration
    */
-  CLUSTER_AGENT_DEFAULT_AFFINITY:       'cluster-agent-default-affinity',
-  FLEET_AGENT_DEFAULT_AFFINITY:         'fleet-agent-default-affinity',
+  CLUSTER_AGENT_DEFAULT_AFFINITY:                'cluster-agent-default-affinity',
+  FLEET_AGENT_DEFAULT_AFFINITY:                  'fleet-agent-default-affinity',
   /**
    * manage rancher repositories in extensions (official, partners repos)
   */
-  ADD_EXTENSION_REPOS_BANNER_DISPLAY:   'display-add-extension-repos-banner',
-  AGENT_TLS_MODE:                       'agent-tls-mode',
+  ADD_EXTENSION_REPOS_BANNER_DISPLAY:            'display-add-extension-repos-banner',
+  AGENT_TLS_MODE:                                'agent-tls-mode',
   /**
    * User retention settings
    */
-  USER_RETENTION_CRON:                  'user-retention-cron',
-  USER_RETENTION_DRY_RUN:               'user-retention-dry-run',
-  USER_LAST_LOGIN_DEFAULT:              'user-last-login-default',
-  DISABLE_INACTIVE_USER_AFTER:          'disable-inactive-user-after',
-  DELETE_INACTIVE_USER_AFTER:           'delete-inactive-user-after',
-  K3S_UPGRADER_UNINSTALL_CONCURRENCY:   'k3s-based-upgrader-uninstall-concurrency'
+  USER_RETENTION_CRON:                           'user-retention-cron',
+  USER_RETENTION_DRY_RUN:                        'user-retention-dry-run',
+  USER_LAST_LOGIN_DEFAULT:                       'user-last-login-default',
+  DISABLE_INACTIVE_USER_AFTER:                   'disable-inactive-user-after',
+  DELETE_INACTIVE_USER_AFTER:                    'delete-inactive-user-after',
+  K3S_UPGRADER_UNINSTALL_CONCURRENCY:            'k3s-based-upgrader-uninstall-concurrency',
+  IMPORTED_CLUSTER_VERSION_MANAGEMENT:           'imported-cluster-version-management',
+  CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS:          'cluster-agent-default-priority-class',
+  CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget'
 } as const;
 
 // These are the settings that are allowed to be edited via the UI
@@ -174,9 +167,14 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY]: {
     kind:    'integer',
     ruleSet: [{ name: 'minValue', factoryArg: 1 }]
-  }
+  },
+  [SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT]:           { kind: 'boolean' },
+  [SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS]:          { kind: 'json' },
+  [SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]: { kind: 'json' }
+
 };
 
+export const PROVISIONING_SETTINGS = ['engine-iso-url', 'engine-install-url', 'imported-cluster-version-management', 'cluster-agent-default-priority-class', 'cluster-agent-default-pod-disruption-budget'];
 /**
  * Settings on how to handle warnings returning in api responses, specifically which to show as growls
  */
@@ -253,38 +251,8 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
     }
   },
   serverPagination: {
-    enabled: false,
-    stores:  {
-      cluster: {
-        resources: {
-          enableAll:  false,
-          enableSome: {
-            // if a resource list is shown by a custom resource list component or has specific list headers then it's not generically shown
-            // and must be included here.
-            enabled: [
-              NODE, EVENT,
-              WORKLOAD_TYPES.CRON_JOB, WORKLOAD_TYPES.DAEMON_SET, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.STATEFUL_SET, POD,
-              CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
-              HPA, INGRESS, SERVICE,
-              PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
-              WORKLOAD_TYPES.REPLICA_SET, WORKLOAD_TYPES.REPLICATION_CONTROLLER
-            ],
-            generic: true,
-          }
-        }
-      },
-      management: {
-        resources: {
-          enableAll:  false,
-          enableSome: {
-            enabled: [
-              { resource: CAPI.RANCHER_CLUSTER, context: ['home', 'side-bar'] },
-              { resource: MANAGEMENT.CLUSTER, context: ['side-bar'] },
-            ],
-            generic: false,
-          }
-        }
-      }
-    }
+    enabled:          false,
+    useDefaultStores: true,
+    stores:           undefined,
   }
 };

package/config/version.js

@@ -30,4 +30,4 @@ export function setKubeVersionData(v) {
   _kubeVersionData = JSON.parse(JSON.stringify(v));
 }
 
-export const CURRENT_RANCHER_VERSION = '2.10';
+export const CURRENT_RANCHER_VERSION = '2.11';

package/core/types-provisioning.ts

@@ -150,6 +150,13 @@ export interface IClusterProvisioner {
    * Text to show top right on the cluster provider card. For example `Experimental`
    */
   tag?: string;
+  /**
+   * Hide the provider card in the cluster creation flow.
+   * By default we show providers in create wizard, however, there are some providers we want to only show on import.
+   * For that case, we should set hideCreate to true and showImport to true.
+   * If not set, the card will be shown in the cluster creation page
+   */
+  hideCreate?: boolean
 
   /**
    * Also show the provider card in the cluster importing flow

package/detail/fleet.cattle.io.bundle.vue

@@ -1,4 +1,5 @@
 <script>
+import { MANAGEMENT } from '@shell/config/types';
 import FleetBundleResources from '@shell/components/fleet/FleetBundleResources.vue';
 import FleetUtils from '@shell/utils/fleet';
 
@@ -13,6 +14,12 @@ export default {
     }
   },
 
+  async fetch() {
+    if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
+      await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.USER }, { root: true });
+    }
+  },
+
   computed: {
     bundleResources() {
       return FleetUtils.resourcesFromBundleStatus(this.value?.status);

package/detail/fleet.cattle.io.cluster.vue

@@ -49,9 +49,6 @@ export default {
   },
 
   computed: {
-    allBundleDeployments() {
-      return this.value.bundleDeployments;
-    },
     clusterId() {
       return this.value.id;
     },

package/detail/fleet.cattle.io.gitrepo.vue

@@ -5,10 +5,9 @@ import FleetSummary from '@shell/components/fleet/FleetSummary';
 import { Banner } from '@components/Banner';
 import FleetResources from '@shell/components/fleet/FleetResources';
 import Tab from '@shell/components/Tabbed/Tab';
-import { FLEET } from '@shell/config/types';
+import { FLEET, MANAGEMENT } from '@shell/config/types';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import FleetBundles from '@shell/components/fleet/FleetBundles.vue';
-import { resourceCounts } from '@shell/components/ResourceSummary.vue';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 
 export default {
@@ -35,14 +34,13 @@ export default {
 
   data() {
     return {
-      allFleetClusters:     [],
-      allBundles:           [],
-      allBundleDeployments: [],
+      allFleetClusters: [],
+      allBundles:       [],
     };
   },
   computed: {
     gitRepoHasClusters() {
-      return this.value.status.desiredReadyClusters;
+      return this.value.status?.desiredReadyClusters;
     },
     clusterSchema() {
       return this.$store.getters['management/schemaFor'](FLEET.CLUSTER);
@@ -58,9 +56,6 @@ export default {
 
       return harvester;
     },
-    bundleCounts() {
-      return resourceCounts(this.$store, FLEET.BUNDLE);
-    },
     bundles() {
       const harvester = this.harvesterClusters;
 
@@ -86,11 +81,6 @@ export default {
         opt:         { excludeFields: ['metadata.managedFields', 'spec.resources'] },
       },
 
-      allBundleDeployments: {
-        inStoreType: 'management',
-        type:        FLEET.BUNDLE_DEPLOYMENT
-      },
-
       allFleetClusters: {
         inStoreType: 'management',
         type:        FLEET.CLUSTER
@@ -101,7 +91,10 @@ export default {
       }
     }, this.$store);
 
-    this.allBundleDeployments = allDispatches.allBundleDeployments || [];
+    if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
+      await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.USER }, { root: true });
+    }
+
     this.allBundles = allDispatches.allBundles || [];
     this.allFleetClusters = allDispatches.allFleetClusters || [];
   },

package/detail/provisioning.cattle.io.cluster.vue

@@ -745,6 +745,12 @@ export default {
       color="error"
       :label="$fetchState.error"
     />
+
+    <Banner
+      v-if="value.isRke1"
+      color="warning"
+      label-key="cluster.banner.rke1DeprecationMessage"
+    />
     <ResourceTabs
       :value="value"
       :default-tab="defaultTab"
@@ -766,11 +772,11 @@ export default {
           :schema="machineSchema"
           :headers="machineHeaders"
           default-sort-by="name"
-          :groupable="false"
           :group-by="value.isCustom ? null : 'poolId'"
           group-ref="pool"
           :group-sort="['pool.nameDisplay']"
           :sort-generation-fn="machineSortGenerationFn"
+          :hide-grouping-controls="true"
         >
           <template #main-row:isFake="{fullColspan}">
             <tr class="main-row">
@@ -853,11 +859,11 @@ export default {
           :schema="mgmtNodeSchema"
           :headers="mgmtNodeSchemaHeaders"
           :rows="nodes"
-          :groupable="false"
           :group-by="value.isCustom ? null : 'spec.nodePoolName'"
           group-ref="pool"
           :group-sort="['pool.nameDisplay']"
           :sort-generation-fn="nodeSortGenerationFn"
+          :hide-grouping-controls="true"
         >
           <template #main-row:isFake="{fullColspan}">
             <tr class="main-row">

package/dialog/DeactivateDriverDialog.vue

@@ -31,15 +31,15 @@ export default {
   },
   computed: {
     formattedText() {
-      const namesSliced = this.drivers.map((obj) => obj.nameDisplay).slice(0, 5);
-      const remaining = this.drivers.length - namesSliced.length;
+      const namesSliced = this.drivers.map((obj) => obj.nameDisplay);
+      const count = namesSliced.length;
+      const remaining = namesSliced.length > 5 ? namesSliced.length - 5 : 0;
 
       const plusMore = this.t('drivers.deactivate.andOthers', { count: remaining });
-      const names = resourceNames(namesSliced, plusMore, this.t);
-      const count = remaining || namesSliced.length;
+      const names = resourceNames(namesSliced, this.t, { plusMore, endString: false });
       const warningDrivers = this.t('drivers.deactivate.warningDrivers', { names, count });
 
-      return this.t('drivers.deactivate.warning', { warningDrivers, count: namesSliced.length });
+      return this.t('drivers.deactivate.warning', { warningDrivers, count });
     },
     ...mapGetters({ t: 'i18n/t' }),
   },