@rancher/shell 3.0.5-rc.5 → 3.0.5-rc.7

package/utils/fleet.ts

@@ -1,3 +1,4 @@
+import { isEmpty, isEqual } from 'lodash';
 import {
   BundleDeploymentResource,
   BundleResourceKey,
@@ -6,10 +7,10 @@ import {
   Condition,
 } from '@shell/types/resources/fleet';
 import { mapStateToEnum, STATES_ENUM, STATES } from '@shell/plugins/dashboard-store/resource-class';
-import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
+import { FLEET as FLEET_LABELS, CAPI } from '@shell/config/labels-annotations';
 import { NAME as EXPLORER_NAME } from '@shell/config/product/explorer';
-import { FleetDashboardState, FleetResourceState } from '@shell/types/fleet';
-import { FLEET } from '@shell/config/types';
+import { FleetDashboardState, FleetResourceState, Target, TargetMode } from '@shell/types/fleet';
+import { FLEET, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 
 interface Resource extends BundleDeploymentResource {
   state: string,
@@ -19,17 +20,6 @@ type Labels = {
   [key: string]: string,
 }
 
-interface KeyRef {
-  key: string;
-  name: string;
-  namespace?: string;
-}
-
-interface ValueFrom {
-  configMapKeyRef?: KeyRef;
-  secretKeyRef?: KeyRef;
-}
-
 function resourceKey(r: BundleResourceKey): string {
   return `${ r.kind }/${ r.namespace }/${ r.name }`;
 }
@@ -42,64 +32,63 @@ function conditionIsTrue(conditions: Condition[] | undefined, type: string): boo
   return !!conditions.find((c) => c.type === type && c.status.toLowerCase() === 'true');
 }
 
-class HelmOp {
-  fromValuesFrom(data: ValueFrom[]): { valueFrom: ValueFrom }[] {
-    return (data || []).map((elem) => {
-      const out = {} as any;
+class Application {
+  excludeHarvesterRule = {
+    clusterSelector: {
+      matchExpressions: [{
+        key:      CAPI.PROVIDER,
+        operator: 'NotIn',
+        values:   [
+          VIRTUAL_HARVESTER_PROVIDER
+        ],
+      }],
+    },
+  };
+
+  getTargetMode(targets: Target[], namespace: string): TargetMode {
+    if (namespace === 'fleet-local') {
+      return 'local';
+    }
 
-      const cm = elem.configMapKeyRef;
+    if (!targets.length) {
+      return 'none';
+    }
 
-      if (cm) {
-        out.valueFrom = {
-          configMapKeyRef: {
-            key:  cm.key || '',
-            name: cm.name || '',
-          }
-        };
+    let mode: TargetMode = 'all';
+
+    for (const target of targets) {
+      const {
+        clusterName,
+        clusterSelector,
+        clusterGroup,
+        clusterGroupSelector,
+      } = target;
+
+      if (clusterGroup || clusterGroupSelector) {
+        return 'advanced';
       }
 
-      const sc = elem.secretKeyRef;
+      if (clusterName) {
+        mode = 'clusters';
+      }
 
-      if (sc) {
-        out.valueFrom = {
-          secretKeyRef: {
-            key:  sc.key || '',
-            name: sc.name || '',
-          }
-        };
+      if (!isEmpty(clusterSelector)) {
+        mode = 'clusters';
       }
+    }
 
-      return out;
+    const normalized = [...targets].map((target) => {
+      delete target.name;
+
+      return target;
     });
-  }
 
-  toValuesFrom(data: { valueFrom: ValueFrom }[], namespace: string): ValueFrom[] {
-    return (data || [])
-      .filter((f) => f.valueFrom?.configMapKeyRef || f.valueFrom?.secretKeyRef)
-      .map(({ valueFrom }) => {
-        const cm = valueFrom.configMapKeyRef;
-        const sc = valueFrom.secretKeyRef;
-
-        const out = {} as ValueFrom;
-
-        if (cm?.name) {
-          out.configMapKeyRef = {
-            key:  cm.key,
-            name: cm.name,
-            namespace
-          };
-        }
-
-        if (sc?.name) {
-          out.secretKeyRef = {
-            key:  sc.key,
-            name: sc.name,
-            namespace
-          };
-        }
-
-        return out;
-      });
+    // Check if targets contains only harvester rule after name normalizing
+    if (isEqual(normalized, [this.excludeHarvesterRule])) {
+      mode = 'all';
+    }
+
+    return mode;
   }
 }
 
@@ -142,14 +131,14 @@ class Fleet {
     {
       index:           3,
       id:              'info',
-      label:           'InProgress',
+      label:           'Pending',
       color:           '#3d98d3',
       icon:            'icon icon-warning',
       stateBackground: 'bg-info'
     },
   ];
 
-  HelmOp = new HelmOp();
+  Application = new Application();
 
   GIT_HTTPS_REGEX = /^https?:\/\/github\.com\/(.*?)(\.git)?\/*$/;
   GIT_SSH_REGEX = /^git@github\.com:.*\.git$/;

package/utils/object.js

@@ -527,3 +527,39 @@ export function mergeWithReplace(
     }
   });
 }
+/**
+ * Converts Object into a string of a format "key1, val1, key2, val2"
+ * @param {Object} input - KV object to convert
+ * @returns string
+ */
+export const convertKVToString = (input) => {
+  if (!input || typeof input !== 'object') return '';
+
+  return Object.entries(input)
+    .flatMap(([key, value]) => [key, String(value)])
+    .join(',');
+};
+
+/**
+ * Converts kv string into object
+ * @param {string} input - a string of a format "key1, val1, key2, val2"
+ * @returns
+ */
+export const convertStringToKV = ( input ) => {
+  if (!input?.trim()) return {};
+
+  const parts = input.split(',').map((part) => part.trim());
+  const result = {};
+
+  for (let i = 0; i < parts.length - 1; i += 2) {
+    const key = parts[i];
+    const value = parts[i + 1];
+
+    // Accept empty keys but ignore undefined values
+    if (typeof key === 'string') {
+      result[key] = value ?? '';
+    }
+  }
+
+  return result;
+};

package/utils/pagination-utils.ts

@@ -15,6 +15,7 @@ import { isEqual } from '@shell/utils/object';
 import { STEVE_CACHE } from '@shell/store/features';
 import { getPerformanceSetting } from '@shell/utils/settings';
 import { PAGINATION_SETTINGS_STORE_DEFAULTS } from '@shell/plugins/steve/steve-pagination-utils';
+import { MANAGEMENT } from '@shell/config/types';
 
 /**
  * Helper functions for server side pagination
@@ -23,7 +24,7 @@ class PaginationUtils {
   /**
    * In places where we're using paginated features but not in a page... this is what the max results should be
    */
-  readonly defaultPageSize = 10000;
+  readonly defaultPageSize = 100000;
   /**
    * When a ns filter isn't one or more projects/namespaces... what are the valid values?
    *
@@ -54,6 +55,23 @@ class PaginationUtils {
     return rootGetters['features/get']?.(STEVE_CACHE);
   }
 
+  /**
+   * Determine if the downstream cluster has vai enabled
+   *
+   * Almost all the time the downstream cluster vai state will align with upstream (it manages it)
+   * ... unless it's harvester then weird things happen
+   */
+  async isDownstreamSteveCacheEnabled({ dispatch }: any, clusterId: string): Promise<boolean> {
+    const url = `/k8s/clusters/${ clusterId }/v1/${ MANAGEMENT.FEATURE }s/${ STEVE_CACHE }`;
+    const entry = await dispatch('cluster/request', { url });
+
+    if (entry.status.lockedValue !== null) {
+      return entry.status.lockedValue;
+    }
+
+    return (entry.spec.value !== null) ? entry.spec.value : entry.status.default;
+  }
+
   /**
    * Is pagination enabled at a global level or for a specific resource
    */

package/utils/release-notes.ts

@@ -0,0 +1,48 @@
+import { getVersionData } from '@shell/config/version';
+import { READ_WHATS_NEW } from '@shell/store/prefs';
+import { NotificationLevel } from '@shell/types/notifications';
+
+export async function addReleaseNotesNotification(dispatch: any, getters: any) {
+  const rancherVersion = getVersionData().Version.split('-')[0];
+  const prefix = 'release-notes-';
+  const id = `${ prefix }${ rancherVersion }`;
+  let found = false;
+  const all = getters['notifications/all'];
+  const lastReadVersion = getters['prefs/get'](READ_WHATS_NEW) || '';
+  const t = getters['i18n/t'];
+  const releaseNotesUrl = getters['releaseNotesUrl'];
+
+  // Delete notification(s) for old release notes
+  for (let i = 0; i < all.length; i++) {
+    const notification = all[i];
+
+    if (notification.id.startsWith(prefix)) {
+      if (notification.id === id) {
+        found = true;
+      } else {
+        await dispatch('notifications/delete', notification.id);
+      }
+    }
+  }
+
+  // Also use pref, so if we expired it, we don't add it back
+  if (!found && lastReadVersion !== rancherVersion) {
+    // Register notification
+    const notification = {
+      id,
+      level:      NotificationLevel.Info,
+      title:      t('landing.whatsNew.title', { version: rancherVersion }),
+      message:    t('landing.whatsNew.message'),
+      preference: {
+        key:   READ_WHATS_NEW,
+        value: rancherVersion
+      },
+      primaryAction: {
+        label:  t('landing.whatsNew.link'),
+        target: releaseNotesUrl
+      }
+    };
+
+    await dispatch('notifications/add', notification);
+  }
+}

package/utils/selector-typed.ts

@@ -34,7 +34,7 @@ export async function matching({
   $store,
   inScopeCount = undefined,
   namespace = undefined,
-  transient = false,
+  transient = true,
 }: {
   /**
    * Standard kube label selector object.
@@ -101,7 +101,12 @@ export async function matching({
   const filterByNamespaceButNoNamespace = isNamespaced && !!namespace && (!safeNamespaces || safeNamespaces.length === 0);
   const explicityNullLabelSelector = labelSelector === null || (labelSelector?.matchLabels === null && !labelSelector.matchExpressions === null);
 
-  if (noCandidates || filterByNamespaceButNoNamespace || explicityNullLabelSelector) {
+  // If we have matchLabels or matchExpression entries they must have a key
+  const matchLabelKeys = Object.keys(labelSelector.matchLabels || {});
+  const invalidMatchLabelKeys = matchLabelKeys.length && matchLabelKeys.filter((k) => !k).length;
+  const invalidMatchExpressionKeys = labelSelector?.matchExpressions?.length && labelSelector.matchExpressions.filter((me) => !me.key).length;
+
+  if (noCandidates || filterByNamespaceButNoNamespace || explicityNullLabelSelector || invalidMatchLabelKeys || invalidMatchExpressionKeys) {
     return generateMatchingResponse([], inScopeCount || 0);
   }
 

package/utils/string.js

@@ -358,3 +358,27 @@ export function isBase64(value) {
 export function generateRandomAlphaString(length) {
   return Array.from({ length }, () => String.fromCharCode(97 + Math.random() * 26 | 0)).join('');
 }
+
+/**
+ * Generate a key-value nested object from a list of paths that represents a directory tree.
+ *
+ * Each key is a subpath
+ * Each value contains the children of the subpath
+ */
+export function pathArrayToTree(paths) {
+  const result = [];
+  const level = { result };
+
+  paths.forEach((path) => {
+    path?.split('/').reduce((r, name) => {
+      if (!r[name]) {
+        r[name] = { result: [] };
+        r.result.push({ name, children: r[name].result });
+      }
+
+      return r[name];
+    }, level);
+  });
+
+  return result;
+}

package/utils/{time.js → time.ts}

@@ -1,4 +1,7 @@
 import day from 'dayjs';
+import { escapeHtml } from '@shell/utils/string';
+import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
+import { type Store } from 'vuex';
 
 const FACTORS = [60, 60, 24];
 const LABELS = ['sec', 'min', 'hour', 'day'];
@@ -6,7 +9,7 @@ const LABELS = ['sec', 'min', 'hour', 'day'];
 // Diff two dates and return an object with values for presentation
 // If 't' is also passed, 'string' property is set on the return object with the diff formatted as a string
 // e.g. formats a date difference to return '1 day', '20 hours' etc
-export function diffFrom(value, from, t) {
+export function diffFrom(value: any, from: any, t: any) {
   const now = day();
 
   from = from || now;
@@ -15,7 +18,7 @@ export function diffFrom(value, from, t) {
   let absDiff = Math.abs(diff);
 
   let next = 1;
-  let label = '?';
+  let label: any = '?';
 
   let i = 0;
 
@@ -30,7 +33,7 @@ export function diffFrom(value, from, t) {
   } else {
     label = Math.floor(absDiff);
   }
-  const ret = {
+  const ret: any = {
     diff,
     absDiff,
     label,
@@ -47,7 +50,7 @@ export function diffFrom(value, from, t) {
   return ret;
 }
 
-export function safeSetTimeout(timeout, callback, that) {
+export function safeSetTimeout(timeout: any, callback: any, that: any) {
   if (timeout <= 2147483647) {
     // Max value setTimeout can take is max 32 bit int (about 24.9 days)
     return setTimeout(() => {
@@ -56,7 +59,7 @@ export function safeSetTimeout(timeout, callback, that) {
   }
 }
 
-export function getSecondsDiff(startDate, endDate) {
+export function getSecondsDiff(startDate: any, endDate: any) {
   return Math.round(
     Math.abs(Date.parse(endDate) - Date.parse(startDate)) / 1000
   );
@@ -68,7 +71,7 @@ export function getSecondsDiff(startDate, endDate) {
  * diff:  update frequency in seconds
  * label: content of the cell's column
  */
-export function elapsedTime(seconds) {
+export function elapsedTime(seconds: any) {
   if (!seconds) {
     return {};
   }
@@ -119,3 +122,19 @@ export function elapsedTime(seconds) {
     label: `${ hours }h${ minutes - (hours * 60) }m`,
   };
 }
+
+/**
+   * Format date and time using user preferences
+   * @param value Date string to format
+   * @returns Formatted date string
+   */
+export const dateTimeFormat = (value: string | undefined, store: Store<any>): string => {
+  if (!value) return '';
+
+  const dateFormat = escapeHtml( store.getters['prefs/get'](DATE_FORMAT));
+  const timeFormat = escapeHtml( store.getters['prefs/get'](TIME_FORMAT));
+
+  const format = `${ dateFormat } ${ timeFormat }`;
+
+  return day(value).format(format);
+};

package/utils/uiplugins.ts

@@ -321,3 +321,25 @@ export async function getHelmChart(store: any, repository: any, chartName: strin
     await new Promise((resolve) => setTimeout(resolve, RETRY_WAIT));
   }
 }
+
+export async function onExtensionsReady(store: any) {
+  const alreadyReady = store.getters['uiplugins/ready'];
+
+  if (alreadyReady) {
+    return;
+  }
+
+  const extensions = store.getters['uiplugins/plugins'] || [];
+
+  for (let i = 0; i < extensions.length; i++) {
+    const ext = extensions[i];
+
+    try {
+      await ext.onLogIn(store);
+    } catch (e) {
+      console.error(`Exception caught in onReady for extension ${ ext.name }`, e); // eslint-disable-line no-console
+    }
+  }
+
+  await store.dispatch('uiplugins/setReady', true);
+}

package/utils/validators/formRules/index.ts

@@ -170,6 +170,8 @@ export default function(
 
   const url: Validator = (val: string) => val && !isUrl(val) ? t('validation.setting.serverUrl.url') : undefined;
 
+  const genericUrl: Validator = (val: string) => val && !isUrl(val) ? t('validation.genericUrl') : undefined;
+
   const urlRepository: Validator = (url: string) => {
     const regexPart1 = /^((http|git|ssh|http(s)|file|\/?)|(git@[\w\.]+))(:(\/\/)?)/gm;
     const regexPart2 = /^([\w\.@\:\/\-]+)([\d\/\w.-]+?)(.git){0,1}(\/)?$/gm;
@@ -542,6 +544,7 @@ export default function(
     localhost,
     trailingForwardSlash,
     url,
+    genericUrl,
     matching,
     maxLength,
     maxValue,

package/components/Resource/Detail/TitleBar/composable.ts

@@ -1,31 +0,0 @@
-import { TitleBarProps } from '@shell/components/Resource/Detail/TitleBar/index.vue';
-import { computed, Ref, toValue } from 'vue';
-import { useRoute } from 'vue-router';
-import { useStore } from 'vuex';
-
-export const useDefaultTitleBarData = (resource: any): Ref<TitleBarProps> => {
-  const route = useRoute();
-  const store = useStore();
-
-  const resourceValue = toValue(resource);
-
-  return computed(() => ({
-    resourceTypeLabel: store.getters['type-map/labelFor']({ id: resourceValue.type }),
-    resourceTo:        {
-      name:   'c-cluster-product-resource',
-      params: {
-        product:   'explorer',
-        cluster:   route.params.cluster,
-        namespace: resourceValue.namespace,
-        resource:  resourceValue.type
-      }
-    },
-    resourceName:       resourceValue.nameDisplay,
-    actionMenuResource: resourceValue,
-    badge:              {
-      color: resourceValue.stateBackground,
-      label: resourceValue.stateDisplay
-    },
-    onShowConfiguration: () => resourceValue.goToEdit()
-  }));
-};

package/config/product/legacy.js

@@ -1,62 +0,0 @@
-import { LEGACY } from '@shell/store/features';
-import { DSL, IF_HAVE } from '@shell/store/type-map';
-
-export const NAME = 'legacy';
-
-export function init(store) {
-  const {
-    product,
-    basicType,
-    virtualType,
-    setGroupDefaultType,
-  } = DSL(store, NAME);
-
-  product({
-    weight:              80,
-    ifFeature:           LEGACY,
-    showNamespaceFilter: true,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.NO_PROJECT,
-    labelKey:   'legacy.project.label',
-    namespaced: true,
-    name:       'v1-project-overview',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project' },
-    exact:      true,
-    overview:   false,
-  });
-
-  basicType(['v1-project-overview']);
-
-  // Project Pages
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.secrets',
-    namespaced: true,
-    name:       'project-secrets',
-    weight:     104,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'secrets' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.configMaps',
-    namespaced: true,
-    name:       'project-config-maps',
-    weight:     104,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'config-maps' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  basicType([
-    'project-config-maps',
-    'project-secrets',
-  ], 'Project');
-  setGroupDefaultType('project-config-maps', 'Project');
-}

package/models/etcdbackup.js

@@ -1,45 +0,0 @@
-import NormanModel from '@shell/plugins/steve/norman-class';
-import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
-
-export default class Rke1EtcdBackup extends NormanModel {
-  get _availableActions() {
-    const restore = {
-      action:  'promptRestore',
-      enabled: this.state === STATES_ENUM.ACTIVE,
-      icon:    'icon icon-fw icon-backup-restore',
-      label:   'Restore'
-    };
-
-    const baseActions = super._availableActions;
-    const actions = [
-      restore
-    ];
-
-    if (baseActions.length) {
-      actions.push({ divider: true });
-      actions.push(...baseActions);
-    }
-
-    return actions;
-  }
-
-  promptRestore() {
-    this.$dispatch('promptRestore', [this]);
-  }
-
-  get createdAt() {
-    return this.created;
-  }
-
-  get rke2() {
-    return false;
-  }
-
-  get nameDisplay() {
-    return this.name;
-  }
-
-  get backupLocation() {
-    return !!this.backupConfig.s3BackupConfig ? this.t('cluster.snapshot.rke1.s3') : this.t('cluster.snapshot.rke1.local');
-  }
-}

package/pages/c/_cluster/legacy/pages/_page.vue

@@ -1,29 +0,0 @@
-<script>
-import EmberPage from '@shell/components/EmberPage';
-
-const PAGES = {
-  monitoring: 'monitoring/cluster-setting',
-  cis:        'cis/scan',
-  istio:      'istio/cluster-setting',
-  snapshots:  'backups',
-};
-
-export default {
-  components: { EmberPage },
-
-  data() {
-    const cluster = this.$store.getters['currentCluster'];
-    const page = this.$route.params.page;
-    const p = PAGES[page] || page;
-
-    return { src: `/k/${ cluster.id }/${ p }` };
-  }
-};
-</script>
-
-<template>
-  <EmberPage
-    v-if="src"
-    :src="src"
-  />
-</template>