@rancher/shell 0.3.20 → 0.3.22

package/components/form/ResourceQuota/ProjectRow.vue

@@ -27,37 +27,58 @@ export default {
     }
   },
 
-  computed: { ...ROW_COMPUTED },
+  computed: {
+    ...ROW_COMPUTED,
+
+    resourceQuotaLimit: {
+      get() {
+        return this.value.spec.resourceQuota?.limit || {};
+      },
+    },
+
+    namespaceDefaultResourceQuotaLimit: {
+      get() {
+        return this.value.spec.namespaceDefaultResourceQuota?.limit || {};
+      },
+    }
+  },
 
   methods: {
     updateType(type) {
-      if (typeof this.value.spec.resourceQuota.limit[this.type] !== 'undefined') {
+      if (typeof this.value.spec.resourceQuota?.limit[this.type] !== 'undefined') {
         this.$delete(this.value.spec.resourceQuota.limit, this.type);
       }
-
-      if (typeof this.value.spec.namespaceDefaultResourceQuota.limit[this.type] !== 'undefined') {
+      if (typeof this.value.spec.namespaceDefaultResourceQuota?.limit[this.type] !== 'undefined') {
         this.$delete(this.value.spec.namespaceDefaultResourceQuota.limit, this.type);
       }
 
       this.$emit('type-change', type);
+    },
+
+    updateQuotaLimit(prop, type, val) {
+      if (!this.value.spec[prop]) {
+        this.value.spec[prop] = { limit: { } };
+      }
+
+      this.value.spec[prop].limit[type] = val;
     }
   },
 };
 </script>
 <template>
-  <div
-    v-if="typeOption"
-    class="row"
+  <div
+    v-if="typeOption"
+    class="row"
   >
-    <Select
-      class="mr-10"
-      :mode="mode"
-      :value="type"
-      :options="types"
-      @input="updateType($event)"
+    <Select
+      class="mr-10"
+      :mode="mode"
+      :value="type"
+      :options="types"
+      @input="updateType($event)"
     />
     <UnitInput
-      v-model="value.spec.resourceQuota.limit[type]"
+      :value="resourceQuotaLimit[type]"
       class="mr-10"
       :mode="mode"
       :placeholder="typeOption.placeholder"
@@ -65,15 +86,17 @@ export default {
       :input-exponent="typeOption.inputExponent"
       :base-unit="typeOption.baseUnit"
       :output-modifier="true"
+      @input="updateQuotaLimit('resourceQuota', type, $event)"
     />
     <UnitInput
-      v-model="value.spec.namespaceDefaultResourceQuota.limit[type]"
+      :value="namespaceDefaultResourceQuotaLimit[type]"
       :mode="mode"
       :placeholder="typeOption.placeholder"
       :increment="typeOption.increment"
       :input-exponent="typeOption.inputExponent"
       :base-unit="typeOption.baseUnit"
       :output-modifier="true"
+      @input="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
     />
   </div>
 </template>

package/components/form/UnitInput.vue

@@ -224,6 +224,7 @@ export default {
     :required="required"
     :placeholder="placeholder"
     :hide-arrows="hideArrows"
+    @change="update($event.target.value)"
     @blur="update($event.target.value)"
   >
     <template #suffix>

package/components/form/__tests__/KeyValue.test.ts

@@ -19,7 +19,8 @@ describe('component: KeyValue', () => {
   it('should display a markdown-multiline field with new lines visible', () => {
     const wrapper = mount(KeyValue, {
       propsData: {
-        value:                  'test',
+        value:
+            { value: 'test' },
         valueMarkdownMultiline: true,
       },
       mocks:      { $store: { getters: { 'i18n/t': jest.fn() } } },

package/components/form/__tests__/UnitInput.test.ts

@@ -10,13 +10,13 @@ describe('component: UnitInput', () => {
     expect(wrapper.isVisible()).toBe(true);
   });
 
-  it('should emit input event on value change', async() => {
+  it.each(['blur', 'change'])('should emit input event when "%p" is fired', async(event) => {
     const wrapper = mount(UnitInput, { propsData: { value: 1, delay: 0 } });
     const input = wrapper.find('input');
 
     await input.setValue(2);
     await input.setValue(4);
-    input.trigger('blur');
+    input.trigger(event);
 
     expect(wrapper.emitted('input')).toHaveLength(1);
   });

package/components/formatter/ClusterProvider.vue

@@ -7,14 +7,20 @@ export default {
     },
   },
   data(props) {
+    const mgmt = props.row?.mgmt;
+
     return {
       // The isImported getter on the provisioning cluster
       // model doesn't work for imported K3s clusters, in
       // which case it returns 'k3s' instead of 'imported.'
       // This is the workaround.
-      isImported: props.row?.mgmt?.providerForEmberParam === 'import' ||
-        // when imported cluster is Google GKE
-        props.row?.mgmt?.spec?.gkeConfig?.imported
+      isImported: mgmt?.providerForEmberParam === 'import' ||
+        // when imported cluster is GKE
+        !!mgmt?.spec?.gkeConfig?.imported ||
+        // or AKS
+        !!mgmt?.spec?.aksConfig?.imported ||
+        // or EKS
+        !!mgmt?.spec?.eksConfig?.imported
     };
   },
 };

package/components/formatter/LinkName.vue

@@ -1,5 +1,6 @@
 <script>
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
+import { canViewResource } from '@shell/utils/auth';
 
 export default {
   props: {
@@ -41,6 +42,10 @@ export default {
       };
 
       return { name, params };
+    },
+
+    canViewResource() {
+      return canViewResource(this.$store, this.type);
     }
   }
 };
@@ -48,8 +53,14 @@ export default {
 
 <template>
   <span v-if="value">
-    <nuxt-link :to="url">
+    <nuxt-link
+      v-if="canViewResource"
+      :to="url"
+    >
       {{ value }}
     </nuxt-link>
+    <template v-else>
+      {{ value }}
+    </template>
   </span>
 </template>

package/components/formatter/__tests__/ClusterProvider.test.ts

@@ -3,15 +3,19 @@ import ClusterProvider from '@shell/components/formatter/ClusterProvider.vue';
 
 describe('component: ClusterProvider', () => {
   const importedGkeClusterInfo = { mgmt: { spec: { gkeConfig: { imported: true } } } };
+  const importedAksClusterInfo = { mgmt: { spec: { aksConfig: { imported: true } } } };
+  const importedEksClusterInfo = { mgmt: { spec: { eksConfig: { imported: true } } } };
   const notImportedGkeClusterInfo = { mgmt: { spec: { gkeConfig: { imported: false } } } };
   const importedClusterInfoWithProviderForEmberParam = { mgmt: { providerForEmberParam: 'import' } };
 
   describe('isImported', () => {
     const testCases = [
       [importedGkeClusterInfo, true],
+      [importedAksClusterInfo, true],
+      [importedEksClusterInfo, true],
       [notImportedGkeClusterInfo, false],
       [importedClusterInfoWithProviderForEmberParam, true],
-      [{}, undefined],
+      [{}, false],
     ];
 
     it.each(testCases)('should return the isImported value properly based on the props data', (row, expected) => {

package/components/nav/Header.vue

@@ -335,6 +335,7 @@ export default {
 <template>
   <header
     ref="header"
+    data-testid="header"
   >
     <div>
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />

package/components/nav/WorkspaceSwitcher.vue

@@ -84,7 +84,10 @@ export default {
 </script>
 
 <template>
-  <div class="filter">
+  <div
+    class="filter"
+    data-testid="workspace-switcher"
+  >
     <Select
       ref="select"
       v-model="value"

package/config/settings.ts

@@ -1,5 +1,5 @@
 // Settings
-import { GC_DEFAULTS } from '../utils/gc/gc-types';
+import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -148,7 +148,47 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.HIDE_LOCAL_CLUSTER]: { kind: 'boolean' },
 };
 
-export const DEFAULT_PERF_SETTING = {
+/**
+ * Settings on how to handle warnings returning in api responses, specifically which to show as growls
+ */
+export interface PerfSettingsWarningHeaders {
+  /**
+   * Warning is a string containing multiple entries. This determines how they are split up
+   *
+   * See https://github.com/kubernetes/enhancements/tree/master/keps/sig-api-machinery/1693-warnings#design-details
+   */
+  separator: string,
+  /**
+   * Show warnings in a notification if they're not in this block list
+   */
+  notificationBlockList: string[]
+}
+
+export interface PerfSettingsKubeApi {
+  /**
+   * Settings related to the response header `warnings` value
+   */
+  warningHeader: PerfSettingsWarningHeaders
+}
+
+export interface PerfSettings {
+  inactivity: {
+      enabled: boolean;
+      threshold: number;
+  };
+  incrementalLoading: {
+      enabled: boolean;
+      threshold: number;
+  };
+  manualRefresh: {};
+  disableWebsocketNotification: boolean;
+  garbageCollection: GC_PREFERENCES;
+  forceNsFilterV2: any;
+  advancedWorker: {};
+  kubeAPI: PerfSettingsKubeApi;
+}
+
+export const DEFAULT_PERF_SETTING: PerfSettings = {
   inactivity: {
     enabled:   false,
     threshold: 900,
@@ -165,4 +205,21 @@ export const DEFAULT_PERF_SETTING = {
   garbageCollection:            GC_DEFAULTS,
   forceNsFilterV2:              { enabled: false },
   advancedWorker:               { enabled: false },
+  kubeAPI:                      {
+    /**
+     * Settings related to the response header `warnings` value
+     */
+    warningHeader: {
+      /**
+       * Warning is a string containing multiple entries. This determines how they are split up
+       *
+       * See https://github.com/kubernetes/enhancements/tree/master/keps/sig-api-machinery/1693-warnings#design-details
+       */
+      separator:             '299 - ',
+      /**
+       * Show warnings in a notification if they're not in this block list
+       */
+      notificationBlockList: ['299 - unknown field']
+    }
+  }
 };

package/config/types.js

@@ -311,3 +311,5 @@ export const AUTH_TYPE = {
   _SSH:   '_ssh',
   _S3:    '_S3'
 };
+
+export const LOCAL_CLUSTER = 'local';

package/core/plugin-helpers.js

@@ -58,6 +58,7 @@ function checkExtensionRouteBinding($route, locationConfig, context) {
     'id',
     'mode',
     'path',
+    'hash',
     // url query params
     'queryParam',
     // Custom context specific params provided by the extension, not to be confused with location params
@@ -76,8 +77,10 @@ function checkExtensionRouteBinding($route, locationConfig, context) {
         const locationConfigParam = asArray[x];
 
         if (locationConfigParam) {
+          if (param === 'hash') {
+            res = $route.hash ? $route.hash.includes(locationConfigParam) : false;
           // handle "product" in a separate way...
-          if (param === 'product') {
+          } else if (param === 'product') {
             res = checkRouteProduct($route, locationConfigParam);
           // also handle "mode" in a separate way because it mainly depends on query params
           } else if (param === 'mode') {

package/core/types.ts

@@ -139,6 +139,7 @@ export type LocationConfig = {
   cluster?: string[],
   id?: string[],
   mode?: string[],
+  hash?: string[],
   /**
    * path match from URL (excludes host address)
    */

package/creators/pkg/files/.github/workflows/build-extension-catalog.yml

@@ -0,0 +1,28 @@
+name: Build and Release Extension Catalog
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  build-extension-catalog:
+    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@master
+    permissions:
+      actions: write
+      contents: read
+      packages: write
+    with:
+      registry_target: ghcr.io
+      registry_user: ${{ github.actor }}
+    secrets: 
+      registry_token: ${{ secrets.GITHUB_TOKEN }}

package/creators/pkg/files/.github/workflows/build-extension-charts.yml

@@ -0,0 +1,26 @@
+name: Build and Release Extension Charts
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  build-extension-charts:
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
+    permissions:
+      actions: write
+      contents: write
+      deployments: write
+      pages: write
+    with:
+      target_branch: gh-pages

package/creators/pkg/init

@@ -2,6 +2,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const https = require('https');
 
 const targets = {
   dev:  './node_modules/.bin/nuxt dev',
@@ -16,9 +17,10 @@ const files = [
 ];
 
 const topLevelScripts = {
-  'build-pkg':    './node_modules/@rancher/shell/scripts/build-pkg.sh',
-  'serve-pkgs':   './node_modules/@rancher/shell/scripts/serve-pkgs',
-  'publish-pkgs': './node_modules/@rancher/shell/scripts/extension/publish',
+  'build-pkg':      './node_modules/@rancher/shell/scripts/build-pkg.sh',
+  'serve-pkgs':     './node_modules/@rancher/shell/scripts/serve-pkgs',
+  'publish-pkgs':   './node_modules/@rancher/shell/scripts/extension/publish',
+  'parse-tag-name': './node_modules/@rancher/shell/scripts/extension/parse-tag-name'
 };
 
 const typeFolders = [
@@ -88,11 +90,68 @@ Object.keys(targets).forEach((target) => {
   }
 });
 
+// Add annotation for the latest Rancher version by default
+function fetchLatestVersion() {
+  console.log('  Fetching latest Rancher Version');
+  const options = { headers: { 'User-Agent': 'nodejs' } };
+
+  https.get('https://api.github.com/repos/rancher/rancher/releases/latest', options, (res) => {
+    const { statusCode } = res;
+    const contentType = res.headers['content-type'];
+
+    let error;
+
+    if ( statusCode !== 200 ) {
+      error = new Error('  Request Failed.\n' +
+                        `  Status Code: ${ statusCode }`);
+    } else if ( !/^application\/json/.test(contentType) ) {
+      error = new Error('  Invalid content-type.\n' +
+                        `  Expected application/json but received ${ contentType }`);
+    }
+
+    if ( error ) {
+      console.log(error.message);
+
+      res.resume();
+
+      return;
+    }
+
+    res.setEncoding('utf8');
+    let rawData = '';
+
+    res.on('data', (chunk) => {
+      rawData += chunk;
+    });
+    res.on('end', () => {
+      try {
+        const release = JSON.parse(rawData);
+
+        if ( release.tag_name ) {
+          console.log(`  Adding rancher-version annotation '>= ${ release.tag_name }' to package.json`);
+
+          pkg.rancher = { annotations: { 'catalog.cattle.io/rancher-version': `>= ${ release.tag_name }` } };
+          writePackageJson();
+        }
+      } catch (e) {
+        console.log('  Error parsing release data', e);
+      }
+    });
+  }).on('error', (e) => {
+    console.log('  Error fetching latest Rancher Version', e);
+  });
+}
+
+fetchLatestVersion();
+writePackageJson();
+
 // Add dependencies
 // pkg.dependencies['@rancher/shell'] = '^0.6.2';
 // pkg.dependencies['core-js'] = '3.18.3';
 
-fs.writeFileSync(path.join(pkgFolder, 'package.json'), JSON.stringify(pkg, null, 2));
+function writePackageJson() {
+  fs.writeFileSync(path.join(pkgFolder, 'package.json'), JSON.stringify(pkg, null, 2));
+}
 
 // Create type folders if needed
 if (addTypeFolders) {

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

@@ -250,8 +250,10 @@ export default {
 
   computed: {
     defaultTab() {
-      if (this.showRegistration && !this.machines?.length) {
-        return 'registration';
+      if (this.showRegistration) {
+        if (this.value.isRke2 ? !this.machines?.length : !this.nodes?.length) {
+          return 'registration';
+        }
       }
 
       if (this.showMachines) {

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

@@ -1,4 +1,5 @@
 <script>
+import Vue from 'vue';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { mapGetters } from 'vuex';
 import {
@@ -81,6 +82,10 @@ export default {
 
     this.tlsMode = tls;
 
+    if (this.value.spec.correctDrift === undefined) {
+      Vue.set(this.value.spec, 'correctDrift', { enabled: false });
+    }
+
     this.updateTargets();
   },
 
@@ -536,6 +541,7 @@ export default {
         </div>
         <div class="col span-6">
           <InputWithSelect
+            :data-testid="`gitrepo-${ref}`"
             :mode="mode"
             :select-label="t('fleet.gitRepo.ref.label')"
             :select-value="ref"
@@ -563,6 +569,7 @@ export default {
       />
 
       <SelectOrCreateAuthSecret
+        data-testid="gitrepo-helm-auth"
         :value="value.spec.helmSecretName"
         :register-before-hook="registerBeforeHook"
         :namespace="value.metadata.namespace"
@@ -637,6 +644,7 @@ export default {
       <h2 v-t="'fleet.gitRepo.paths.label'" />
       <ArrayList
         v-model="value.spec.paths"
+        data-testid="gitRepo-paths"
         :mode="mode"
         :initial-empty-row="false"
         :value-placeholder="t('fleet.gitRepo.paths.placeholder')"

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -792,10 +792,10 @@ export default {
       const names = [];
       const cni = this.serverConfig.cni;
 
-      if ( cni ) {
-        const parts = cni.split(',').map((x) => `rke2-${ x }`);
-
-        names.push(...parts);
+      if (typeof cni === 'string') {
+        names.push(...cni.split(',').map((x) => `rke2-${ x }`));
+      } else if (Array.isArray(cni)) {
+        names.push(...cni.map((x) => `rke2-${ x }`));
       }
 
       if (this.showCloudProvider) { // Shouldn't be removed such that changes to it will re-trigger this watch