@rancher/shell 3.0.2-rc.2 → 3.0.2-rc.3

package/rancher-components/RcDropdown/types.ts

@@ -0,0 +1,22 @@
+import { Ref, ref } from 'vue';
+import type { RcButtonType } from '@components/RcButton';
+
+export type DropdownContext = {
+  handleKeydown: () => void;
+  showMenu: (show: boolean) => void;
+  registerTrigger: (triggerRef: RcButtonType | null) => void;
+  dropdownItems: Ref<Element[]>;
+  focusFirstElement: () => void;
+  isMenuOpen: Ref<boolean>;
+  close: () => void;
+}
+
+export const defaultContext: DropdownContext = {
+  handleKeydown:     () => null,
+  showMenu:          (_show: boolean | null) => null,
+  registerTrigger:   (_triggerRef: RcButtonType | null) => null,
+  dropdownItems:     ref([]),
+  focusFirstElement: () => null,
+  isMenuOpen:        ref(false),
+  close:             () => null,
+};

package/rancher-components/RcDropdown/useDropdownCollection.ts

@@ -0,0 +1,45 @@
+import { ref } from 'vue';
+
+/**
+ * Manages a collection of dropdown items. Includes methods for registering
+ * dropdown items and providing the collection to descendant components.
+ *
+ * @returns Dropdown collection methods and state.
+ */
+export const useDropdownCollection = () => {
+  const dropdownItems = ref<Element[]>([]);
+  const dropdownContainer = ref<HTMLElement | null>(null);
+  const firstDropdownItem = ref<HTMLElement | null>(null);
+
+  /**
+   * Registers the dropdown container and initializes dropdown items.
+   * @param target - The dropdown container element.
+   */
+  const registerDropdownCollection = (target: HTMLElement | null) => {
+    dropdownContainer.value = target;
+    if (dropdownContainer.value?.firstElementChild instanceof HTMLElement) {
+      registerDropdownItems();
+      if (dropdownItems.value[0] instanceof HTMLElement) {
+        firstDropdownItem.value = dropdownItems.value[0];
+      }
+    }
+  };
+
+  /**
+   * Registers dropdown items by querying the dropdown container for elements.
+   */
+  const registerDropdownItems = () => {
+    dropdownItems.value = [];
+    const dropdownNodeList = dropdownContainer.value?.querySelectorAll('[dropdown-menu-item]');
+
+    dropdownNodeList?.forEach((element) => {
+      dropdownItems.value.push(element);
+    });
+  };
+
+  return {
+    dropdownItems,
+    firstDropdownItem,
+    registerDropdownCollection,
+  };
+};

package/rancher-components/RcDropdown/useDropdownContext.ts

@@ -0,0 +1,83 @@
+import { ref, provide, nextTick } from 'vue';
+import { useDropdownCollection } from './useDropdownCollection';
+import { RcButtonType } from '@components/RcButton';
+
+/**
+ * Composable that provides the context for a dropdown menu. Includes methods
+ * and state for managing the dropdown's visibility, focus, and keyboard
+ * interactions.
+ *
+ * @param firstDropdownItem - First item in the dropdown menu.
+ * @returns Dropdown context methods and state. Used for programmatic
+ * interactions and setting focus.
+ */
+export const useDropdownContext = () => {
+  const { dropdownItems, firstDropdownItem, registerDropdownCollection } = useDropdownCollection();
+
+  const isMenuOpen = ref(false);
+
+  /**
+   * Controls the visibility of the dropdown menu.
+   * @param show - Whether to show or hide the dropdown menu.
+   */
+  const showMenu = (show: boolean) => {
+    isMenuOpen.value = show;
+  };
+
+  /**
+  * A ref for the dropdown trigger element. Used for programmatic
+  * interactions and setting focus.
+  */
+  const dropdownTrigger = ref<RcButtonType | null>(null);
+
+  /**
+   * Registers the dropdown trigger element.
+   * @param triggerRef - The dropdown trigger element.
+   */
+  const registerTrigger = (triggerRef: RcButtonType) => {
+    dropdownTrigger.value = triggerRef;
+  };
+
+  /**
+   * Returns focus to the dropdown trigger and closes the menu.
+   */
+  const returnFocus = () => {
+    showMenu(false);
+    dropdownTrigger?.value?.focus();
+  };
+
+  /**
+   * Sets focus to the first dropdown item if a keydown event has occurred.
+   */
+  const setFocus = () => {
+    nextTick(() => {
+      firstDropdownItem.value?.focus();
+    });
+  };
+
+  /**
+  * Provides Dropdown Context data and methods to descendants of RcDropdown.
+  * Accessed in descendents with the `inject()` function.
+  */
+  const provideDropdownContext = () => {
+    provide('dropdownContext', {
+      showMenu,
+      registerTrigger,
+      isMenuOpen,
+      dropdownItems,
+      close:             () => returnFocus(),
+      focusFirstElement: () => {
+        setFocus();
+      },
+    });
+  };
+
+  return {
+    isMenuOpen,
+    showMenu,
+    returnFocus,
+    setFocus,
+    provideDropdownContext,
+    registerDropdownCollection,
+  };
+};

package/scripts/test-plugins-build.sh

@@ -141,6 +141,8 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   pushd test-app > /dev/null
 
   yarn install
+  # this is the "same" as doing a yarn dev (in a build sense)
+  # it's to make sure the dev environment is running properly
   FORCE_COLOR=true yarn build | cat
 
   # Add test list component to the test package

package/scripts/typegen.sh

@@ -21,10 +21,12 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/query-params.js --declarat
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/table-headers.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/types.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/labels-annotations.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/version.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
 
 # # store
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/features.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/prefs.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/plugins.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
 
 # # plugins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null

package/store/catalog.js

@@ -57,7 +57,7 @@ export const getters = {
     const clustered = state.clusterRepos || [];
     const namespaced = state.namespacedRepos || [];
 
-    return [...clustered, ...namespaced];
+    return [...clustered, ...namespaced].filter((r) => r.spec?.enabled !== false);
   },
 
   // Raw charts

package/tsconfig.json

@@ -29,7 +29,8 @@
     "./**/*.ts",
     "./**/*.d.ts",
     "./**/*.tsx",
-    "./**/*.vue"
+    "./**/*.vue",
+    "../pkg/rancher-components/src/**/*"
   ],
   "exclude": [
     "node_modules",

package/types/components/paginatedResourceTable.ts

@@ -0,0 +1,25 @@
+import { StorePaginationResult } from '@shell/types/store/pagination.types';
+
+/**
+ * see {@link PagTableFetchSecondaryResources}
+ */
+export type PagTableFetchSecondaryResourcesOpts = { canPaginate: boolean }
+/**
+ * see {@link PagTableFetchSecondaryResources}
+ */
+export type PagTableFetchSecondaryResourcesReturns = Promise<any>
+/**
+ * Function to fetch resources that are required to supplement information needed by rows in a PaginatedResourceTable
+ *
+ * Used in scenarios where ALL resources are expected
+ */
+export type PagTableFetchSecondaryResources = (opts: PagTableFetchSecondaryResourcesOpts) => PagTableFetchSecondaryResourcesReturns
+
+/**
+ * see {@link PagTableFetchPageSecondaryResources}
+ */
+export type PagTableFetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
+/**
+ * Function to fetch resources that are required to supplement information needed by a single page in a PaginatedResourceTable
+ */
+export type PagTableFetchPageSecondaryResources = (opts: PagTableFetchPageSecondaryResourcesOpts) => Promise<any>

package/types/components/resourceLabeledSelect.ts

@@ -0,0 +1,48 @@
+import { LabelSelectPaginationFunctionOptions } from '@shell/components/form/labeled-select-utils/labeled-select.utils';
+import { LabelSelectPaginateFn } from '@shell/types/components/labeledSelect';
+
+type PaginateTypeOverridesFn = (opts: LabelSelectPaginationFunctionOptions) => LabelSelectPaginationFunctionOptions;
+
+interface SharedSettings {
+  /**
+   * Provide specific LabelSelect options for this mode (paginated / not paginated)
+   */
+  labelSelectOptions?: { [key: string]: any },
+  /**
+   * Map, filter, tweak, etc the resources to show in the LabelSelect
+   */
+  updateResources?: (resources: any[]) => any[]
+}
+
+/**
+ * Settings to use when the LabelSelect is paginating
+ */
+export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
+  /**
+   * Override the convenience function which fetches a page of results
+   */
+  overrideRequest?: LabelSelectPaginateFn,
+  /**
+   * Override the default settings used in the convenience function to fetch a page of results
+   */
+  requestSettings?: PaginateTypeOverridesFn,
+}
+
+/**
+ * Settings to use when the LabelSelect is fetching all resources (not paginating)
+ */
+export type ResourceLabeledSelectSettings = SharedSettings
+
+/**
+ * Force a specific mode
+ */
+export enum RESOURCE_LABEL_SELECT_MODE {
+  /**
+   * Fetch all resources
+   */
+  ALL_RESOURCES = 'ALL', // eslint-disable-line no-unused-vars
+  /**
+   * Determine if all resources are fetched given system settings
+   */
+  DYNAMIC = 'DYNAMIC', // eslint-disable-line no-unused-vars
+}

package/types/resources/fleet.d.ts

@@ -24,10 +24,19 @@ export interface BundleNonReadyBundle {
   nonReadyStatus: BundleNonReadyResource[],
 }
 
+export interface Condition {
+  status: string,
+  type: string,
+}
+
 export interface BundleDeploymentStatus {
   resources?: BundleDeploymentResource[],
   modifiedStatus?: BundleModifiedResource[],
   nonReadyStatus?: BundleNonReadyResource[],
+  appliedDeploymentId?: string,
+  ready: boolean
+  nonModified: boolean
+  conditions: Condition[],
 }
 
 export interface BundleStatusSummary {
@@ -38,3 +47,11 @@ export interface BundleStatus {
   resourceKey?: BundleResourceKey[],
   summary?: BundleStatusSummary,
 }
+
+export interface BundleDeployment {
+  spec: {
+    deploymentId: string,
+    stagedDeploymentId: string,
+  }
+  status?: BundleDeploymentStatus
+}

package/types/shell/index.d.ts

@@ -125,6 +125,8 @@ export namespace FLEET {
     export let CLUSTER_DISPLAY_NAME: string;
     export let CLUSTER_NAME: string;
     export let BUNDLE_ID: string;
+    export let BUNDLE_NAME: string;
+    export let BUNDLE_NAMESPACE: string;
     let MANAGED_1: string;
     export { MANAGED_1 as MANAGED };
     let CLUSTER_NAMESPACE_1: string;
@@ -997,6 +999,9 @@ export namespace LAST_SEEN_TIME {
     export { sort_50 as sort };
     export let tooltip: string;
 }
+export namespace EVENT_LAST_SEEN_TIME {
+    let defaultSort: boolean;
+}
 export namespace LAST_HEARTBEAT_TIME {
     let name_58: string;
     export { name_58 as name };
@@ -2203,6 +2208,21 @@ export const DEPRECATED: "Deprecated";
 export const EXPERIMENTAL: "Experimental";
 }
 
+// @shell/config/version
+
+declare module '@shell/config/version' {
+export function isRancherPrime(): boolean;
+export function getVersionData(): {
+    Version: string;
+    RancherPrime: string;
+    GitCommit: string;
+};
+export function setVersionData(v: any): void;
+export function getKubeVersionData(): {};
+export function setKubeVersionData(v: any): void;
+export const CURRENT_RANCHER_VERSION: "2.10";
+}
+
 // @shell/mixins/create-edit-view/impl
 
 declare module '@shell/mixins/create-edit-view/impl' {
@@ -2402,8 +2422,11 @@ export default class ClusterRepo {
     spec: {
         url: string;
     };
+    get _isClusterRepoDisabled(): boolean;
     get _availableActions(): any;
     refresh(): Promise<void>;
+    disableClusterRepo(): Promise<void>;
+    enableClusterRepo(): Promise<void>;
     get isGit(): boolean;
     get isOciType(): any;
     get isRancherSource(): boolean;
@@ -2429,6 +2452,8 @@ export default class ClusterRepo {
         };
     })[];
     get stateObj(): any;
+    get stateDisplay(): any;
+    get stateBackground(): any;
     waitForOperation(operationId: any, timeout: any, interval?: number): any;
 }
 }
@@ -2816,6 +2841,7 @@ export default class Resource {
     get $dispatch(): any;
     get $state(): any;
     get $rootState(): any;
+    get $plugin(): any;
     get customValidationRules(): any[];
     get _key(): any;
     get schema(): any;
@@ -3117,6 +3143,10 @@ export default class SteveModel extends HybridModel {
     set description(value: any);
     get description(): any;
     _description: any;
+    /**
+     * Get all model extensions for this model
+     */
+    get modelExtensions(): any;
     cleanForSave(data: any, forNew: any): any;
 }
 import HybridModel from './hybrid-class';
@@ -3153,6 +3183,31 @@ export namespace actions {
 }
 }
 
+// @shell/store/plugins
+
+declare module '@shell/store/plugins' {
+export function simplify(key: any): any;
+export function configureCredential(name: any, opt: any): void;
+export function mapDriver(name: any, to: any): void;
+export const rke1Supports: string[];
+export const likelyFields: any[];
+export const iffyFields: any[];
+export const fullFields: any[];
+export const prefixFields: any[];
+export const suffixFields: any[];
+export function state(): {};
+export namespace getters {
+    function credentialOptions(): (name: any) => any;
+    function credentialDriverFor(): (name: any) => any;
+    function credentialFieldForDriver(): (name: any) => any;
+    function clusterDrivers(): any[];
+    function schemaForDriver(state: any, getters: any, rootState: any, rootGetters: any): (name: any) => any;
+    function fieldNamesForDriver(state: any, getters: any): (name: any) => Promise<string[]>;
+    function fieldsForDriver(state: any, getters: any): (name: any) => Promise<{}>;
+    function cloudProviderForDriver(): (name: any) => any;
+}
+}
+
 // @shell/store/prefs
 
 declare module '@shell/store/prefs' {
@@ -3440,6 +3495,8 @@ export function filterHiddenLocalCluster(mgmtClusters: any, store: any): any;
  */
 export function abbreviateClusterName(input: string): string;
 export function labelForAddon(store: any, name: any, configuration?: boolean): any;
+export function filterOutDeprecatedPatchVersions(allVersions: any, currentVersion: any): any;
+export function getAllOptionsAfterCurrentVersion(store: any, versions: any, currentVersion: any, defaultVersion: any): any;
 }
 
 // @shell/utils/color
@@ -4502,6 +4559,10 @@ export function containerImages(spec: any, getters: any, errors: any): void;
 
 declare module '@shell/utils/validators/cron-schedule' {
 export function cronSchedule(schedule: string, getters: any, errors: any): void;
+export namespace cronScheduleRule {
+    function validation(text: any): string;
+    let message: string;
+}
 }
 
 // @shell/utils/validators/flow-output

package/utils/auth.js

@@ -116,7 +116,11 @@ export const checkSchemasForFindAllHash = (types, store) => {
     const validSchema = value.schemaValidator ? value.schemaValidator(schema) : !!schema;
 
     if (validSchema) {
-      hash[key] = store.dispatch(`${ value.inStoreType }/findAll`, { type: value.type, opt: value.opt } );
+      const res = store.dispatch(`${ value.inStoreType }/findAll`, { type: value.type, opt: value.opt } );
+
+      if (!value.skipWait) {
+        hash[key] = res;
+      }
     }
   }
 

package/utils/cluster.js

@@ -4,6 +4,8 @@ import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { compare, sortable } from '@shell/utils/version';
+import { sortBy } from '@shell/utils/sort';
 
 /**
  * Combination of paginationFilterHiddenLocalCluster and paginationFilterOnlyKubernetesClusters
@@ -190,3 +192,107 @@ export function labelForAddon(store, name, configuration = true) {
 
   return store.getters['i18n/withFallback'](key, null, fallback);
 }
+
+function getMostRecentPatchVersions(sortedVersions) {
+  // Get the most recent patch version for each Kubernetes minor version.
+  const versionMap = {};
+
+  sortedVersions.forEach((version) => {
+    const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
+
+    if (!versionMap[majorMinor]) {
+      // Because we start with a sorted list of versions, we know the
+      // highest patch version is first in the list, so we only keep the
+      // first of each minor version in the list.
+      versionMap[majorMinor] = version.value;
+    }
+  });
+
+  return versionMap;
+}
+
+export function filterOutDeprecatedPatchVersions(allVersions, currentVersion) {
+  // Get the most recent patch version for each Kubernetes minor version.
+  const mostRecentPatchVersions = getMostRecentPatchVersions(allVersions);
+
+  const filteredVersions = allVersions.filter((version) => {
+    // Always show pre-releases
+    if (semver.prerelease(version.value)) {
+      return true;
+    }
+
+    const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
+
+    // Always show current version, else show if we haven't shown anything for this major.minor version yet
+    if (version.value === currentVersion || mostRecentPatchVersions[majorMinor] === version.value) {
+      return true;
+    }
+
+    return false;
+  });
+
+  return filteredVersions;
+}
+
+export function getAllOptionsAfterCurrentVersion(store, versions, currentVersion, defaultVersion) {
+  const out = (versions || []).filter((obj) => !!obj.serverArgs).map((obj) => {
+    let disabled = false;
+    let experimental = false;
+    let isCurrentVersion = false;
+    let label = obj.id;
+
+    if (currentVersion) {
+      disabled = compare(obj.id, currentVersion) < 0;
+      isCurrentVersion = compare(obj.id, currentVersion) === 0;
+    }
+
+    if (defaultVersion) {
+      experimental = compare(defaultVersion, obj.id) < 0;
+    }
+
+    if (isCurrentVersion) {
+      label = `${ label } ${ store.getters['i18n/t']('cluster.kubernetesVersion.current') }`;
+    }
+
+    if (experimental) {
+      label = `${ label } ${ store.getters['i18n/t']('cluster.kubernetesVersion.experimental') }`;
+    }
+
+    return {
+      label,
+      value:      obj.id,
+      sort:       sortable(obj.id),
+      serverArgs: obj.serverArgs,
+      agentArgs:  obj.agentArgs,
+      charts:     obj.charts,
+      disabled,
+    };
+  });
+
+  if (currentVersion && !out.find((obj) => obj.value === currentVersion)) {
+    out.push({
+      label: `${ currentVersion } ${ store.getters['i18n/t']('cluster.kubernetesVersion.current') }`,
+      value: currentVersion,
+      sort:  sortable(currentVersion),
+    });
+  }
+
+  const sorted = sortBy(out, 'sort:desc');
+
+  const mostRecentPatchVersions = getMostRecentPatchVersions(sorted);
+
+  const sortedWithDeprecatedLabel = sorted.map((optionData) => {
+    const majorMinor = `${ semver.major(optionData.value) }.${ semver.minor(optionData.value) }`;
+
+    if (mostRecentPatchVersions[majorMinor] === optionData.value) {
+      return optionData;
+    }
+
+    return {
+      ...optionData,
+      label: `${ optionData.label } ${ store.getters['i18n/t']('cluster.kubernetesVersion.deprecated') }`
+    };
+  });
+
+  return sortedWithDeprecatedLabel;
+}

package/utils/fleet.ts

@@ -1,11 +1,13 @@
 import {
   BundleDeploymentResource,
   BundleResourceKey,
+  BundleDeployment,
   BundleDeploymentStatus,
   BundleStatus,
+  Condition,
 } from '@shell/types/resources/fleet';
 import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
-import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
+import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
 
 interface Resource extends BundleDeploymentResource {
   state: string,
@@ -28,6 +30,14 @@ function resourceKey(r: BundleResourceKey): string {
   return `${ r.kind }/${ r.namespace }/${ r.name }`;
 }
 
+function conditionIsTrue(conditions: Condition[] | undefined, type: string): boolean {
+  if (!conditions) {
+    return false;
+  }
+
+  return !!conditions.find((c) => c.type === type && c.status.toLowerCase() === 'true');
+}
+
 class Fleet {
   resourceId(r: BundleResourceKey): string {
     return r.namespace ? `${ r.namespace }/${ r.name }` : r.name;
@@ -147,11 +157,33 @@ class Fleet {
   }
 
   clusterIdFromBundleDeploymentLabels(labels?: Labels): string {
-    const clusterNamespace = labels?.[FLEET_ANNOTATIONS.CLUSTER_NAMESPACE];
-    const clusterName = labels?.[FLEET_ANNOTATIONS.CLUSTER];
+    const clusterNamespace = labels?.[FLEET_LABELS.CLUSTER_NAMESPACE];
+    const clusterName = labels?.[FLEET_LABELS.CLUSTER];
 
     return `${ clusterNamespace }/${ clusterName }`;
   }
+
+  bundleIdFromBundleDeploymentLabels(labels?: Labels): string {
+    const bundleNamespace = labels?.[FLEET_LABELS.BUNDLE_NAMESPACE];
+    const bundleName = labels?.[FLEET_LABELS.BUNDLE_NAME];
+
+    return `${ bundleNamespace }/${ bundleName }`;
+  }
+
+  bundleDeploymentState(bd: BundleDeployment): string {
+    // Ported from https://github.com/rancher/fleet/blob/534dbfdd6f74caf97bccd4cf977e42c5009b2432/internal/cmd/controller/summary/summary.go#L89
+    if (bd.status?.appliedDeploymentId !== bd.spec.deploymentId) {
+      return conditionIsTrue(bd.status?.conditions, 'Deployed') ? STATES_ENUM.WAIT_APPLIED : STATES_ENUM.ERR_APPLIED;
+    } else if (!bd.status?.ready) {
+      return STATES_ENUM.NOT_READY;
+    } else if (bd.spec.deploymentId !== bd.spec.stagedDeploymentId) {
+      return STATES_ENUM.OUT_OF_SYNC;
+    } else if (!bd.status?.nonModified) {
+      return STATES_ENUM.MODIFIED;
+    } else {
+      return STATES_ENUM.READY;
+    }
+  }
 }
 
 const instance = new Fleet();