@rancher/shell 3.0.0 → 3.0.1-rc.1

package/pages/c/_cluster/fleet/index.vue

@@ -40,6 +40,7 @@ export default {
       allBundles: {
         inStoreType: 'management',
         type:        FLEET.BUNDLE,
+        opt:         { excludeFields: ['metadata.managedFields', 'spec.resources'] },
       },
       gitRepos: {
         inStoreType: 'management',
@@ -300,7 +301,7 @@ export default {
 </script>
 
 <template>
-  <div class="fleet-dashboard">
+  <div>
     <Loading v-if="$fetchState.pending" />
     <!-- no git repos -->
     <FleetNoWorkspaces
@@ -450,9 +451,6 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-.fleet-dashboard {
-  min-height: 100vh;
-}
 .fleet-empty-dashboard {
   flex: 1;
   display: flex;

package/pages/c/_cluster/settings/brand.vue

@@ -141,6 +141,9 @@ export default {
       const schema = this.$store.getters[`management/schemaFor`](MANAGEMENT.SETTING);
 
       return schema?.resourceMethods?.includes('PUT') ? _EDIT : _VIEW;
+    },
+    customLinkColor() {
+      return { color: this.uiLinkColor };
     }
   },
 
@@ -564,7 +567,7 @@ export default {
           component-testid="link"
         />
         <span class="col link-example">
-          <a>
+          <a :style="customLinkColor">
             {{ t('branding.linkColor.example') }}
           </a>
         </span>

package/pages/prefs.vue

@@ -40,6 +40,11 @@ export default {
     scalingDownPrompt: mapPref(SCALE_POOL_PROMPT),
 
     ...mapGetters(['isSingleProduct']),
+    ...mapGetters({ hasMultipleLocales: 'i18n/hasMultipleLocales' }),
+
+    isHarvester() {
+      return this.isSingleProduct?.productName === 'harvester';
+    },
 
     theme: {
       get() {
@@ -182,7 +187,10 @@ export default {
     </h1>
 
     <!-- Language -->
-    <div class="mt-10 mb-10">
+    <div
+      v-if="hasMultipleLocales && !isHarvester"
+      class="mt-10 mb-10"
+    >
       <h4 v-t="'prefs.language'" />
       <div class="row">
         <div class="col span-4">
@@ -194,7 +202,6 @@ export default {
     </div>
     <!-- Theme -->
     <div class="mt-10 mb-10">
-      <hr>
       <h4 v-t="'prefs.theme.label'" />
       <ButtonGroup
         v-model:value="theme"
@@ -262,7 +269,10 @@ export default {
       </div>
     </div>
     <!-- Confirmation setting -->
-    <div class="col adv-features mt-10 mb-10">
+    <div
+      v-if="!isSingleProduct"
+      class="col adv-features mt-10 mb-10"
+    >
       <hr>
       <h4 v-t="'prefs.confirmationSetting.title'" />
       <Checkbox
@@ -282,13 +292,15 @@ export default {
         :label="t('prefs.advFeatures.viewInApi', {}, true)"
         class="mt-10"
       />
-      <br>
-      <Checkbox
-        v-model:value="allNamespaces"
-        data-testid="prefs__allNamespaces"
-        :label="t('prefs.advFeatures.allNamespaces', {}, true)"
-        class="mt-20"
-      />
+      <template v-if="!isHarvester">
+        <br>
+        <Checkbox
+          v-model:value="allNamespaces"
+          data-testid="prefs__allNamespaces"
+          :label="t('prefs.advFeatures.allNamespaces', {}, true)"
+          class="mt-20"
+        />
+      </template>
       <br>
       <Checkbox
         v-model:value="themeShortcut"

package/plugins/dashboard-store/resource-class.js

@@ -9,7 +9,7 @@ import {
   AS,
   MODE
 } from '@shell/config/query-params';
-import { VIEW_IN_API } from '@shell/store/prefs';
+import { VIEW_IN_API, DEV } from '@shell/store/prefs';
 import { addObject, addObjects, findBy, removeAt } from '@shell/utils/array';
 import CustomValidators from '@shell/utils/custom-validators';
 import { downloadFile, generateZip } from '@shell/utils/download';
@@ -84,6 +84,7 @@ export const STATES_ENUM = {
   DISCONNECTED:     'disconnected',
   DRAINED:          'drained',
   DRAINING:         'draining',
+  ENABLED:          'enabled',
   ERR_APPLIED:      'errapplied',
   ERROR:            'error',
   ERRORING:         'erroring',
@@ -232,6 +233,9 @@ export const STATES = {
   [STATES_ENUM.DRAINING]: {
     color: 'warning', icon: 'tag', label: 'Draining', compoundIcon: 'warning'
   },
+  [STATES_ENUM.ENABLED]: {
+    color: 'success', icon: 'dot-open', label: 'Enabled', compoundIcon: 'checkmark'
+  },
   [STATES_ENUM.ERR_APPLIED]: {
     color: 'error', icon: 'error', label: 'Error Applied', compoundIcon: 'error'
   },
@@ -997,7 +1001,11 @@ export default class Resource {
   }
 
   get canViewInApi() {
-    return this.hasLink('self') && this.$rootGetters['prefs/get'](VIEW_IN_API);
+    try {
+      return this.hasLink('self') && this.$rootGetters['prefs/get'](VIEW_IN_API);
+    } catch {
+      return this.hasLink('self') && this.$rootGetters['prefs/get'](DEV);
+    }
   }
 
   get canYaml() {
@@ -1055,7 +1063,7 @@ export default class Resource {
 
   async doActionGrowl(actionName, body, opt = {}) {
     try {
-      await this.$dispatch('resourceAction', {
+      return await this.$dispatch('resourceAction', {
         resource: this,
         actionName,
         body,

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

@@ -6,7 +6,7 @@ import { uniq } from '@shell/utils/array';
 import {
   CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
-import { Schema } from 'plugins/steve/schema';
+import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
   /**

package/rancher-components/Form/LabeledInput/LabeledInput.vue

@@ -177,11 +177,16 @@ export default defineComponent({
       if (this.type !== 'cron' || !this.value) {
         return;
       }
-      if (typeof this.value === 'string' && !isValidCron(this.value)) {
+      // refer https://github.com/GuillaumeRochat/cron-validator#readme
+      if (!isValidCron(this.value as string, {
+        alias:              true,
+        allowBlankDay:      true,
+        allowSevenAsSunday: true,
+      })) {
         return this.t('generic.invalidCron');
       }
       try {
-        const hint = cronstrue.toString(this.value || '');
+        const hint = cronstrue.toString(this.value as string || '', { verbose: true });
 
         return hint;
       } catch (e) {

package/store/features.js

@@ -35,6 +35,7 @@ export const HARVESTER_CONTAINER = create('harvester-baremetal-container-workloa
 export const FLEET_WORKSPACE_BACK = create('provisioningv2-fleet-workspace-back-population', false);
 export const STEVE_CACHE = create('ui-sql-cache', false);
 export const UIEXTENSION = create('uiextension', true);
+export const PROVISIONING_PRE_BOOTSTRAP = create('provisioningprebootstrap', false);
 
 // Not currently used.. no point defining ones we don't use
 // export const EMBEDDED_CLUSTER_API = create('embedded-cluster-api', true);

package/store/i18n.js

@@ -58,6 +58,10 @@ export const getters = {
     return out;
   },
 
+  hasMultipleLocales(state) {
+    return state.available.length > 1;
+  },
+
   t: (state) => (key, args, language) => {
     if (state.selected === NONE && !language) {
       return `%${ key }%`;
@@ -333,7 +337,7 @@ export const actions = {
 
     commit('setSelected', locale);
 
-    // Ony update the preference if the locale changed
+    // Only update the preference if the locale changed
     if (currentLocale !== locale) {
       dispatch('prefs/set', {
         key:   'locale',

package/store/prefs.js

@@ -233,6 +233,14 @@ export const getters = {
     default:
       return { name: afterLoginRoutePref };
     }
+  },
+
+  dev: (state, getters) => {
+    try {
+      return getters['get'](PLUGIN_DEVELOPER);
+    } catch {
+      return getters['get'](DEV);
+    }
   }
 };
 

package/types/resources/fleet.d.ts

@@ -0,0 +1,40 @@
+export interface BundleResourceKey {
+  kind: string,
+  apiVersion: string,
+  namespace?: string,
+  name: string,
+}
+
+export interface BundleDeploymentResource extends BundleResourceKey {
+  createdAt?: string,
+}
+
+export interface BundleModifiedResource extends BundleResourceKey {
+  missing?: boolean,
+  delete?: boolean,
+  patch: string,
+}
+
+export interface BundleNonReadyResource extends BundleResourceKey {
+  summary: { [state: string]: string }
+}
+
+export interface BundleNonReadyBundle {
+  modifiedStatus: BundleModifiedResource[],
+  nonReadyStatus: BundleNonReadyResource[],
+}
+
+export interface BundleDeploymentStatus {
+  resources?: BundleDeploymentResource[],
+  modifiedStatus?: BundleModifiedResource[],
+  nonReadyStatus?: BundleNonReadyResource[],
+}
+
+export interface BundleStatusSummary {
+  nonReadyResources?: BundleNonReadyBundle[],
+}
+
+export interface BundleStatus {
+  resourceKey?: BundleResourceKey[],
+  summary?: BundleStatusSummary,
+}