@rancher/shell 0.1.3 → 0.1.4

package/layouts/home.vue

@@ -3,7 +3,7 @@ import Header from '@shell/components/nav/Header';
 import Brand from '@shell/mixins/brand';
 import FixedBanner from '@shell/components/FixedBanner';
 import GrowlManager from '@shell/components/GrowlManager';
-import { mapPref, DEV } from '@shell/store/prefs';
+import { mapPref, THEME_SHORTCUT } from '@shell/store/prefs';
 import AwsComplianceBanner from '@shell/components/AwsComplianceBanner';
 import AzureWarning from '@shell/components/auth/AzureWarning';
 import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
@@ -26,12 +26,13 @@ export default {
   data() {
     return {
       // Assume home pages have routes where the name is the key to use for string lookup
-      name: this.$route.name
+      name:             this.$route.name,
+      noLocaleShortcut: process.env.dev || false
     };
   },
 
   computed: {
-    dev: mapPref(DEV),
+    themeShortcut: mapPref(THEME_SHORTCUT),
     ...mapState(['managementReady']),
   },
 
@@ -39,6 +40,9 @@ export default {
     toggleTheme() {
       this.$store.dispatch('prefs/toggleTheme');
     },
+    toggleNoneLocale() {
+      this.$store.dispatch('i18n/toggleNone');
+    },
   }
 
 };
@@ -59,7 +63,8 @@ export default {
     </div>
     <FixedBanner :footer="true" />
     <GrowlManager />
-    <button v-if="dev" v-shortkey.once="['shift','t']" class="hide" @shortkey="toggleTheme()" />
+    <button v-if="themeShortcut" v-shortkey.once="['shift','t']" class="hide" @shortkey="toggleTheme()" />
+    <button v-if="noLocaleShortcut" v-shortkey.once="['shift','l']" class="hide" @shortkey="toggleNoneLocale()" />
   </div>
 </template>
 

package/layouts/plain.vue

@@ -1,5 +1,5 @@
 <script>
-import { mapPref, DEV } from '@shell/store/prefs';
+import { mapPref, THEME_SHORTCUT } from '@shell/store/prefs';
 import ActionMenu from '@shell/components/ActionMenu';
 import Header from '@shell/components/nav/Header';
 import PromptRemove from '@shell/components/PromptRemove';
@@ -33,16 +33,20 @@ export default {
   data() {
     return {
       // Assume home pages have routes where the name is the key to use for string lookup
-      name: this.$route.name,
+      name:             this.$route.name,
+      noLocaleShortcut: process.env.dev || false,
     };
   },
 
-  computed: { dev: mapPref(DEV) },
+  computed: { themeShortcut: mapPref(THEME_SHORTCUT) },
 
   methods: {
     toggleTheme() {
       this.$store.dispatch('prefs/toggleTheme');
-    }
+    },
+    toggleNoneLocale() {
+      this.$store.dispatch('i18n/toggleNone');
+    },
   }
 };
 </script>
@@ -62,7 +66,8 @@ export default {
         <ActionMenu />
         <PromptRemove />
         <AssignTo />
-        <button v-if="dev" v-shortkey.once="['shift','t']" class="hide" @shortkey="toggleTheme()" />
+        <button v-if="themeShortcut" v-shortkey.once="['shift','t']" class="hide" @shortkey="toggleTheme()" />
+        <button v-if="noLocaleShortcut" v-shortkey.once="['shift','l']" class="hide" @shortkey="toggleNoneLocale()" />
       </main>
     </div>
 

package/list/management.cattle.io.setting.vue

@@ -4,13 +4,13 @@ import { MANAGEMENT } from '@shell/config/types';
 import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import { Banner } from '@components/Banner';
 import Loading from '@shell/components/Loading';
-import { DEV } from '@shell/store/prefs';
+import { VIEW_IN_API } from '@shell/store/prefs';
 
 export default {
   components: { Banner, Loading },
 
   async fetch() {
-    const isDev = this.$store.getters['prefs/get'](DEV);
+    const viewInApi = this.$store.getters['prefs/get'](VIEW_IN_API);
     const rows = await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.SETTING });
     const t = this.$store.getters['i18n/t'];
     // Map settings from array to object keyed by id
@@ -51,7 +51,7 @@ export default {
       }
       // There are only 2 actions that can be enabled - Edit Setting or View in API
       // If neither is available for this setting then we hide the action menu button
-      s.hasActions = (!s.readOnly || isDev) && setting.availableActions?.length;
+      s.hasActions = (!s.readOnly || viewInApi) && setting.availableActions?.length;
       settings.push(s);
     }
 

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

@@ -149,7 +149,7 @@ export default {
       <template #cell:explorer="{row}">
         <span v-if="row.mgmt && row.mgmt.isHarvester"></span>
         <n-link
-          v-else-if="row.mgmt && row.mgmt.isReady"
+          v-else-if="row.mgmt && row.mgmt.isReady && !row.hasError"
           data-testid="cluster-manager-list-explore-management"
           class="btn btn-sm role-secondary"
           :to="{name: 'c-cluster', params: {cluster: row.mgmt.id}}"

package/machine-config/harvester.vue

@@ -170,8 +170,10 @@ export default {
           };
         });
 
-        (res.namespaces.value.data || []).forEach((namespace) => {
-          if (!namespace.isSystem) {
+        (res.namespaces.value.data || []).forEach(async(namespace) => {
+          const proxyNamespace = await this.$store.dispatch('cluster/create', namespace);
+
+          if (!proxyNamespace.isSystem && namespace.links.update) {
             const value = namespace.metadata.name;
             const label = namespace.metadata.name;
 
@@ -519,7 +521,7 @@ export default {
             :options="imageOptions"
             :required="true"
             :searchable="true"
-            :disabled="disabledEdit"
+            :disabled="disabled"
             label-key="cluster.credential.harvester.image"
             :placeholder="t('cluster.harvester.machinePool.image.placeholder')"
             @on-open="onOpen"

package/models/catalog.cattle.io.uiplugin.js

@@ -0,0 +1,34 @@
+import SteveModel from '@shell/plugins/steve/steve-class';
+
+const CACHED_STATUS = 'cached';
+
+export default class UIPlugin extends SteveModel {
+  get name() {
+    return this.spec?.plugin?.name;
+  }
+
+  get description() {
+    return this.spec?.plugin?.description;
+  }
+
+  get version() {
+    return this.spec?.plugin?.version;
+  }
+
+  get willBeCached() {
+    return this.spec?.plugin?.noCache === false;
+  }
+
+  // Has the plugin been cached?
+  get isCached() {
+    return !this.willBeCached || (this.willBeCached && this.status?.cacheState === CACHED_STATUS);
+  }
+
+  get pluginMetadata() {
+    return this.spec?.plugin?.metadata || {};
+  }
+
+  get isDeveloper() {
+    return this.pluginMetadata?.developer === 'true';
+  }
+}

package/models/cluster/node.js

@@ -153,6 +153,14 @@ export default class ClusterNode extends SteveModel {
   }
 
   get cpuUsage() {
+    /*
+      With EKS nodes that have been migrated from norman,
+      cpu/memory usage is by the annotation `management.cattle.io/pod-requests`
+    */
+    if ( this.isFromNorman && this.provider === 'eks' ) {
+      return parseSi(this.podRequests.cpu || '0');
+    }
+
     return parseSi(this.$rootGetters['cluster/byId'](METRIC.NODE, this.id)?.usage?.cpu || '0');
   }
 
@@ -165,6 +173,10 @@ export default class ClusterNode extends SteveModel {
   }
 
   get ramUsage() {
+    if ( this.isFromNorman && this.provider === 'eks' ) {
+      return parseSi(this.podRequests.memory || '0');
+    }
+
     return parseSi(this.$rootGetters['cluster/byId'](METRIC.NODE, this.id)?.usage?.memory || '0');
   }
 
@@ -192,6 +204,10 @@ export default class ClusterNode extends SteveModel {
     return this.pods.length;
   }
 
+  get podRequests() {
+    return JSON.parse(this.metadata.annotations['management.cattle.io/pod-requests'] || '{}');
+  }
+
   get isPidPressureOk() {
     return this.isCondition('PIDPressure', 'False');
   }
@@ -368,14 +384,13 @@ export default class ClusterNode extends SteveModel {
   }
 
   get canDelete() {
-    const provider = this.$rootGetters['currentCluster'].provisioner.toLowerCase();
     const cloudProviders = [
       'aks', 'azureaks', 'azurekubernetesservice',
       'eks', 'amazoneks',
       'gke', 'googlegke'
     ];
 
-    return !cloudProviders.includes(provider);
+    return !cloudProviders.includes(this.provider);
   }
 
   // You need to preload CAPI.MACHINEs to use this
@@ -389,6 +404,14 @@ export default class ClusterNode extends SteveModel {
 
     return null;
   }
+
+  get isFromNorman() {
+    return (this.$rootGetters['currentCluster'].metadata.labels || {})['cattle.io/creator'] === 'norman';
+  }
+
+  get provider() {
+    return this.$rootGetters['currentCluster'].provisioner.toLowerCase();
+  }
 }
 
 function calculatePercentage(allocatable, capacity) {

package/models/fleet.cattle.io.bundle.js

@@ -18,7 +18,7 @@ export default class FleetBundle extends SteveModel {
   }
 
   get lastUpdateTime() {
-    return this.status.conditions[0].lastUpdateTime;
+    return this.status?.conditions?.[0].lastUpdateTime;
   }
 
   get bundleType() {

package/models/harvesterhci.io.management.cluster.js

@@ -79,11 +79,11 @@ export default class HciCluster extends ProvCluster {
     const pkgName = `${ HARVESTER_NAME }-1.0.3`;
 
     if (uiOfflinePreferred === 'true') {
-      // Embedded (aka give me the version of the embedded plugin that was in the last release)
-      const embeddedPath = `dashboard/${ pkgName }/${ pkgName }.umd.min.js`;
+      // Embedded (aka give me the embedded plugin that was in the last rancher release)
+      const embeddedPath = `${ pkgName }/${ pkgName }.umd.min.js`;
 
       return {
-        pkgUrl: process.env.dev ? `${ process.env.api }/${ embeddedPath }` : embeddedPath,
+        pkgUrl: process.env.dev ? `${ process.env.api }/dashboard/${ embeddedPath }` : embeddedPath,
         pkgName
       };
     }
@@ -111,15 +111,21 @@ export default class HciCluster extends ProvCluster {
    * Determine the harvester plugin's package name and url for clusters that provide the plugin
    */
   _supportedClusterPkgDetails(uiInfo, clusterId) {
-    const pkgName = `${ HARVESTER_NAME }-${ uiInfo['ui-plugin-bundled-version'] }`;
+    let pkgName = `${ HARVESTER_NAME }-${ uiInfo['ui-plugin-bundled-version'] }`;
     const fileName = `${ pkgName }.umd.min.js`;
     let pkgUrl;
 
     if (uiInfo['ui-source'] === 'bundled' ) { // offline bundled
-      pkgUrl = `k8s/clusters/${ clusterId }/v1/harvester/plugin-assets/${ fileName }`;
+      pkgUrl = `/k8s/clusters/${ clusterId }/v1/harvester/plugin-assets/${ fileName }`;
     } else if (uiInfo['ui-source'] === 'external') {
       if (uiInfo['ui-plugin-index']) {
         pkgUrl = uiInfo['ui-plugin-index'];
+
+        // When using an external address, the pkgName should also be get from the url
+        const names = pkgUrl.split('/');
+        const jsName = names[names.length - 1];
+
+        pkgName = jsName?.split('.umd.min.js')[0];
       } else {
         throw new Error('Harvester cluster requested the plugin at `ui-plugin-index` is used, however did not provide a value for it');
       }

package/models/provisioning.cattle.io.cluster.js

@@ -197,12 +197,10 @@ export default class ProvCluster extends SteveModel {
     return super.canEditYaml;
   }
 
-  get isAKS() {
-    return this.provisioner === 'AKS';
-  }
+  get isHostedKubernetesProvider() {
+    const providers = ['AKS', 'EKS', 'GKE'];
 
-  get isEKS() {
-    return this.provisioner === 'EKS';
+    return providers.includes(this.provisioner);
   }
 
   get isImported() {
@@ -230,13 +228,17 @@ export default class ProvCluster extends SteveModel {
   get isImportedK3s() {
     // As of Rancher v2.6.7, this returns false for imported K3s clusters,
     // in which this.provisioner is `k3s`.
-    return this.isImported && this.mgmt?.status?.provider === 'k3s';
+    return this.isImported && this.isK3s;
   }
 
   get isImportedRke2() {
     return this.isImported && this.mgmt?.status?.provider?.startsWith('rke2');
   }
 
+  get isK3s() {
+    return this.mgmt?.status?.provider === 'k3s';
+  }
+
   get isRke2() {
     return !!this.spec?.rkeConfig;
   }
@@ -764,4 +766,8 @@ export default class ProvCluster extends SteveModel {
       await this.$dispatch('ws.resource.remove', { data: this });
     }
   }
+
+  get hasError() {
+    return this.status?.conditions?.some(condition => condition.error === true);
+  }
 }

package/models/workload.js

@@ -218,7 +218,7 @@ export default class Workload extends WorkloadService {
         path:           'metadata.name',
         required:       true,
         translationKey: 'generic.name',
-        type:           'dnsLabel',
+        type:           'subDomain',
       },
       {
         nullable:       false,
@@ -405,7 +405,7 @@ export default class Workload extends WorkloadService {
     case WORKLOAD_TYPES.CRON_JOB:
       out.push(detailItem.endpoint);
       break;
-    case WORKLOAD_TYPES.POD:
+    case POD:
       out.push(detailItem.ready);
       break;
     default: break;
@@ -612,8 +612,10 @@ export default class Workload extends WorkloadService {
 
   async matchingPods() {
     const all = await this.$dispatch('findAll', { type: POD });
+    const allInNamespace = all.filter(pod => pod.metadata.namespace === this.metadata.namespace);
+
     const selector = convertSelectorObj(this.spec.selector);
 
-    return matching(all, selector);
+    return matching(allInNamespace, selector);
   }
 }

package/nuxt.config.js

@@ -185,8 +185,6 @@ export default function(dir, _appConfig) {
 
   // Serve up the dist-pkg folder under /pkg
   serverMiddleware.push({ path: `/pkg/`, handler: serveStatic(`${ dir }/dist-pkg/`) });
-  // Endpoint to download and unpack a tgz from the local verdaccio rgistry (dev)
-  serverMiddleware.push(path.resolve(dir, SHELL, 'server', 'verdaccio-middleware'));
   // Add the standard dashboard server middleware after the middleware added to serve up UI packages
   serverMiddleware.push(path.resolve(dir, SHELL, 'server', 'server-middleware'));
 
@@ -202,6 +200,8 @@ export default function(dir, _appConfig) {
     process.env.DRONE_VERSION ||
     require('./package.json').version;
 
+  const prime = process.env.PRIME;
+
   const dev = (process.env.NODE_ENV !== 'production');
   const devPorts = dev || process.env.DEV_PORTS === 'true';
   const pl = process.env.PL || STANDARD;
@@ -496,7 +496,8 @@ export default function(dir, _appConfig) {
         plugins: [
           // TODO: Browser support
           // ['@babel/plugin-transform-modules-commonjs'],
-          ['@babel/plugin-proposal-private-property-in-object', { loose: true }]
+          ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
+          'babel-plugin-istanbul'
         ],
       }
     },
@@ -554,7 +555,7 @@ export default function(dir, _appConfig) {
     plugins: [
       // Extensions
       path.relative(dir, path.join(SHELL, 'core/plugins.js')),
-      path.relative(dir, path.join(SHELL, 'core/plugins-loader.js')),
+      path.relative(dir, path.join(SHELL, 'core/plugins-loader.js')), // Load builtin plugins
 
       // Third-party
       path.join(NUXT_SHELL, 'plugins/axios'),
@@ -578,33 +579,33 @@ export default function(dir, _appConfig) {
       { src: path.join(NUXT_SHELL, 'plugins/nuxt-client-init'), ssr: false },
       path.join(NUXT_SHELL, 'plugins/replaceall'),
       path.join(NUXT_SHELL, 'plugins/back-button'),
-      { src: path.join(NUXT_SHELL, 'plugins/plugin'), ssr: false },
+      { src: path.join(NUXT_SHELL, 'plugins/plugin'), ssr: false }, // Load dyanmic plugins
       { src: path.join(NUXT_SHELL, 'plugins/codemirror-loader'), ssr: false },
+      { src: path.join(NUXT_SHELL, 'plugins/formatters'), ssr: false }, // Populate formatters cache for sorted table
     ],
 
     // Proxy: https://github.com/nuxt-community/proxy-module#options
     proxy: {
-      '/k8s':          proxyWsOpts(api), // Straight to a remote cluster (/k8s/clusters/<id>/)
-      '/pp':           proxyWsOpts(api), // For (epinio) standalone API
-      '/api':          proxyWsOpts(api), // Management k8s API
-      '/apis':         proxyWsOpts(api), // Management k8s API
-      '/v1':           proxyWsOpts(api), // Management Steve API
-      '/v3':           proxyWsOpts(api), // Rancher API
-      '/v3-public':    proxyOpts(api), // Rancher Unauthed API
-      '/api-ui':       proxyOpts(api), // Browser API UI
-      '/meta':         proxyMetaOpts(api), // Browser API UI
-      '/v1-*':         proxyOpts(api), // SAML, KDM, etc
+      '/k8s':            proxyWsOpts(api), // Straight to a remote cluster (/k8s/clusters/<id>/)
+      '/pp':             proxyWsOpts(api), // For (epinio) standalone API
+      '/api':            proxyWsOpts(api), // Management k8s API
+      '/apis':           proxyWsOpts(api), // Management k8s API
+      '/v1':             proxyWsOpts(api), // Management Steve API
+      '/v3':             proxyWsOpts(api), // Rancher API
+      '/v3-public':      proxyOpts(api), // Rancher Unauthed API
+      '/api-ui':         proxyOpts(api), // Browser API UI
+      '/meta':           proxyMetaOpts(api), // Browser API UI
+      '/rancherversion': proxyPrimeOpts(api), // Rancher version endpoint
+      '/v1-*':           proxyOpts(api), // SAML, KDM, etc
       // These are for Ember embedding
-      '/c/*/edit':     proxyOpts('https://127.0.0.1:8000'), // Can't proxy all of /c because that's used by Vue too
-      '/k/':           proxyOpts('https://127.0.0.1:8000'),
-      '/g/':           proxyOpts('https://127.0.0.1:8000'),
-      '/n/':           proxyOpts('https://127.0.0.1:8000'),
-      '/p/':           proxyOpts('https://127.0.0.1:8000'),
-      '/assets':       proxyOpts('https://127.0.0.1:8000'),
-      '/translations': proxyOpts('https://127.0.0.1:8000'),
-      '/engines-dist': proxyOpts('https://127.0.0.1:8000'),
-      // Plugin dev
-      '/verdaccio/':   proxyOpts('http://127.0.0.1:4873/-'),
+      '/c/*/edit':       proxyOpts('https://127.0.0.1:8000'), // Can't proxy all of /c because that's used by Vue too
+      '/k/':             proxyOpts('https://127.0.0.1:8000'),
+      '/g/':             proxyOpts('https://127.0.0.1:8000'),
+      '/n/':             proxyOpts('https://127.0.0.1:8000'),
+      '/p/':             proxyOpts('https://127.0.0.1:8000'),
+      '/assets':         proxyOpts('https://127.0.0.1:8000'),
+      '/translations':   proxyOpts('https://127.0.0.1:8000'),
+      '/engines-dist':   proxyOpts('https://127.0.0.1:8000'),
     },
 
     // Nuxt server
@@ -663,6 +664,49 @@ export default function(dir, _appConfig) {
     };
   }
 
+  // Intercept the /rancherversion API call wnad modify the 'RancherPrime' value
+  // if configured to do so by the environment variable PRIME
+  function proxyPrimeOpts(target) {
+    const opts = proxyOpts(target);
+
+    // Don't intercept if the PRIME environment variable is not set
+    if (!prime?.length) {
+      return opts;
+    }
+
+    opts.onProxyRes = (proxyRes, req, res) => {
+      const _end = res.end;
+      let body = '';
+
+      proxyRes.on( 'data', (data) => {
+        data = data.toString('utf-8');
+        body += data;
+      });
+
+      res.write = () => {};
+
+      res.end = () => {
+        let output = body;
+
+        try {
+          const out = JSON.parse(body);
+
+          out.RancherPrime = prime;
+          output = JSON.stringify(out);
+        } catch (err) {}
+
+        res.setHeader('content-length', output.length );
+        res.setHeader('content-type', 'application/json' );
+        res.setHeader('transfer-encoding', '');
+        res.setHeader('cache-control', 'no-cache');
+        res.writeHead(proxyRes.statusCode);
+        _end.apply(res, [output]);
+      };
+    };
+
+    return opts;
+  }
+
   function onProxyRes(proxyRes, req, res) {
     if (devPorts) {
       proxyRes.headers['X-Frame-Options'] = 'ALLOWALL';