@rancher/shell 0.3.14 → 0.3.15

package/pages/c/_cluster/uiplugins/SetupUIPlugins.vue

@@ -1,11 +1,11 @@
 <script>
-import AsyncButton from '@shell/components/AsyncButton';
+import AsyncButton, { ASYNC_BUTTON_STATES } from '@shell/components/AsyncButton';
 import IconMessage from '@shell/components/IconMessage.vue';
 import { CATALOG, MANAGEMENT } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import Dialog from '@shell/components/Dialog.vue';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
-import { ASYNC_BUTTON_STATES } from '@shell/components/AsyncButton.vue';
+
 import {
   UI_PLUGIN_NAMESPACE,
   UI_PLUGIN_CHARTS,
@@ -30,7 +30,7 @@ export default {
     const found = [];
 
     UI_PLUGIN_CHARTS.forEach((c) => {
-      const f = charts.find(chart => chart.repoName === UI_PLUGIN_OPERATOR_REPO_NAME & chart.chartName === c);
+      const f = charts.find((chart) => chart.repoName === UI_PLUGIN_OPERATOR_REPO_NAME & chart.chartName === c);
 
       if (f) {
         found.push(f);
@@ -72,7 +72,7 @@ export default {
       // Look to see if the Rancher UI Plugins repository is already installed
       const repos = this.$store.getters['catalog/repos'];
 
-      return !!repos.find(r => r.name === UI_PLUGINS_REPO_NAME);
+      return !!repos.find((r) => r.name === UI_PLUGINS_REPO_NAME);
     }
   },
 
@@ -143,7 +143,7 @@ export default {
 
         await this.installPluginCharts();
 
-        await new Promise(resolve => setTimeout(resolve, 5000));
+        await new Promise((resolve) => setTimeout(resolve, 5000));
 
         this.buttonState = this.errors.length > 0 ? ASYNC_BUTTON_STATES.ERROR : ASYNC_BUTTON_STATES.ACTION;
 
@@ -183,7 +183,7 @@ export default {
         }
       }
 
-      return new Promise(resolve => setTimeout(resolve, 2000));
+      return new Promise((resolve) => setTimeout(resolve, 2000));
     }
   }
 };

package/pages/c/_cluster/uiplugins/UninstallDialog.vue

@@ -44,9 +44,9 @@ export default {
       const pluginApps = apps.filter((app) => {
         if (plugin.catalog && app.namespace === UI_PLUGIN_NAMESPACE) {
           // Find the related apps from the deployed helm repository
-          const charts = this.allCharts.filter(chart => chart.repoName === plugin.repo?.metadata?.name);
+          const charts = this.allCharts.filter((chart) => chart.repoName === plugin.repo?.metadata?.name);
 
-          return charts.some(chart => chart.chartName === app.metadata.name);
+          return charts.some((chart) => chart.chartName === app.metadata.name);
         }
 
         if (app.namespace === UI_PLUGIN_NAMESPACE && app.name === plugin.name) {
@@ -62,7 +62,7 @@ export default {
 
       if (pluginApps.length) {
         try {
-          pluginApps.forEach(app => app.remove());
+          pluginApps.forEach((app) => app.remove());
         } catch (e) {
           this.$store.dispatch('growl/error', {
             title:   this.t('plugins.error.generic'),
@@ -93,7 +93,7 @@ export default {
 
         for (const resource of Object.keys(hash)) {
           if (hash[resource]) {
-            hash[resource].forEach(r => r.remove());
+            hash[resource].forEach((r) => r.remove());
           }
         }
       }

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

@@ -87,7 +87,7 @@ export default {
       }
     }
 
-    hash.load = await this.$store.dispatch('catalog/load');
+    hash.load = await this.$store.dispatch('catalog/load', { reset: true });
 
     if (this.$store.getters['management/schemaFor'](CATALOG.OPERATION)) {
       hash.helmOps = await this.$store.dispatch('management/findAll', { type: CATALOG.OPERATION });
@@ -175,11 +175,11 @@ export default {
 
       switch (this.view) {
       case 'installed':
-        return all.filter(p => !!p.installed || !!p.installing);
+        return all.filter((p) => !!p.installed || !!p.installing);
       case 'updates':
         return this.updates;
       case 'available':
-        return all.filter(p => !p.installed);
+        return all.filter((p) => !p.installed);
       default:
         return all;
       }
@@ -195,14 +195,14 @@ export default {
     },
 
     updates() {
-      return this.available.filter(plugin => !!plugin.upgrade);
+      return this.available.filter((plugin) => !!plugin.upgrade);
     },
 
     available() {
-      let all = this.charts.filter(c => isUIPlugin(c));
+      let all = this.charts.filter((c) => isUIPlugin(c));
 
       // Filter out hidden charts
-      all = all.filter(c => !uiPluginHasAnnotation(c, CATALOG_ANNOTATIONS.HIDDEN, 'true'));
+      all = all.filter((c) => !uiPluginHasAnnotation(c, CATALOG_ANNOTATIONS.HIDDEN, 'true'));
 
       all = all.map((chart) => {
         // Label can be overridden by chart annotation
@@ -223,13 +223,13 @@ export default {
         item.chart = chart;
 
         // Filter the versions available to install (plugins-api version and current dashboard version)
-        item.installableVersions = item.versions.filter(version => isSupportedChartVersion(version) && isChartVersionAvailableForInstall(version, this.rancherVersion));
+        item.installableVersions = item.versions.filter((version) => isSupportedChartVersion(version) && isChartVersionAvailableForInstall(version, this.rancherVersion));
 
         // add prop to version object if version is compatible with the current dashboard version
-        item.versions = item.versions.map(version => isChartVersionAvailableForInstall(version, this.rancherVersion, true));
+        item.versions = item.versions.map((version) => isChartVersionAvailableForInstall(version, this.rancherVersion, true));
 
         const latestCompatible = item.installableVersions?.[0];
-        const latestNotCompatible = item.versions.find(version => !version.isCompatibleWithUi);
+        const latestNotCompatible = item.versions.find((version) => !version.isCompatibleWithUi);
 
         if (latestCompatible) {
           item.displayVersion = latestCompatible.version;
@@ -251,11 +251,11 @@ export default {
       });
 
       // Remove charts with no installable versions
-      all = all.filter(c => c.versions.length > 0);
+      all = all.filter((c) => c.versions.length > 0);
 
       // Check that all of the loaded plugins are represented
       this.uiplugins.forEach((p) => {
-        const chart = all.find(c => c.name === p.name);
+        const chart = all.find((c) => c.name === p.name);
 
         if (!chart) {
           // A plugin is loaded, but there is no chart, so add an item so that it shows up
@@ -279,7 +279,7 @@ export default {
 
       // Go through the CRs for the plugins and wire them into the catalog
       this.plugins.forEach((p) => {
-        const chart = all.find(c => c.name === p.name);
+        const chart = all.find((c) => c.name === p.name);
 
         // Plugin is a container image, do not add to charts
         if (p.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE]) {
@@ -319,7 +319,7 @@ export default {
 
       // Merge in the plugin load errors
       Object.keys(this.uiErrors).forEach((e) => {
-        const chart = all.find(c => c.name === e);
+        const chart = all.find((c) => c.name === e);
 
         if (chart) {
           const error = this.uiErrors[e];
@@ -334,7 +334,7 @@ export default {
 
       // Merge in the plugin load errors from help ops
       Object.keys(this.errors).forEach((e) => {
-        const chart = all.find(c => c.name === e);
+        const chart = all.find((c) => c.name === e);
 
         if (chart) {
           chart.helmError = !!this.errors[e];
@@ -353,7 +353,7 @@ export default {
     },
 
     pluginsFromCatalogImage() {
-      return this.plugins.filter(p => p.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE]);
+      return this.plugins.filter((p) => p.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE]);
     }
   },
 
@@ -368,7 +368,7 @@ export default {
 
       // Go through the installed plugins
       (this.available || []).forEach((plugin) => {
-        const op = pluginOps.find(o => o.status?.releaseName === plugin.name);
+        const op = pluginOps.find((o) => o.status?.releaseName === plugin.name);
 
         if (op) {
           const active = op.metadata.state?.transitioning;
@@ -395,7 +395,7 @@ export default {
 
     plugins(neu, old) {
       const installed = this.$store.getters['uiplugins/plugins'];
-      const shouldHaveLoaded = (installed || []).filter(p => !this.uiErrors[p.name] && !p.builtin);
+      const shouldHaveLoaded = (installed || []).filter((p) => !this.uiErrors[p.name] && !p.builtin);
       let changes = 0;
 
       // Did the user remove an extension
@@ -404,7 +404,7 @@ export default {
       }
 
       neu.forEach((plugin) => {
-        const existing = installed.find(p => !p.removed && p.name === plugin.name && p.version === plugin.version);
+        const existing = installed.find((p) => !p.removed && p.name === plugin.name && p.version === plugin.version);
         const isCustomImage = plugin.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE];
 
         if (!existing && plugin.isCached) {
@@ -435,7 +435,7 @@ export default {
 
   methods: {
     async refreshCharts() {
-      await this.$store.dispatch('catalog/load');
+      await this.$store.dispatch('catalog/load', { reset: true });
       const c = this.$store.getters['catalog/rawCharts'];
 
       this.charts = Object.values(c);
@@ -1013,6 +1013,9 @@ export default {
       color: #888;
       width: 44px;
       height: 44px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
       &.dark-mode {
         border-radius: calc(2 * var(--border-radius));

package/pages/diagnostic.vue

@@ -14,8 +14,8 @@ export default {
 
   async fetch() {
     const provClusters = await this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
-    const readyClusters = provClusters.filter(c => c.mgmt?.isReady);
-    const clusterForCounts = filterHiddenLocalCluster(filterOnlyKubernetesClusters(readyClusters), this.$store);
+    const readyClusters = provClusters.filter((c) => c.mgmt?.isReady);
+    const clusterForCounts = filterHiddenLocalCluster(filterOnlyKubernetesClusters(readyClusters, this.$store), this.$store);
     const finalCounts = [];
     const promises = [];
     const topFifteenForResponseTime = [];
@@ -181,8 +181,8 @@ export default {
     setResourceResponseTiming(responseTimes) {
       responseTimes?.forEach((res) => {
         if ( res.outcome === 'success' ) {
-          const cluster = this.finalCounts.find(c => c.capiId === res.item.capiId);
-          const countIndex = cluster?.counts?.findIndex(c => c.resource === res.item.resource);
+          const cluster = this.finalCounts.find((c) => c.capiId === res.item.capiId);
+          const countIndex = cluster?.counts?.findIndex((c) => c.resource === res.item.resource);
 
           if ( (countIndex && countIndex !== -1) || countIndex === 0 ) {
             this.$set(cluster?.counts[countIndex], 'durationMs', res.durationMs);
@@ -196,13 +196,13 @@ export default {
     },
 
     nodeCount(counts) {
-      const resource = counts.findIndex(c => c.resource === 'node');
+      const resource = counts.findIndex((c) => c.resource === 'node');
 
       return counts[resource]?.count;
     },
 
     toggleTable(area) {
-      const itemIndex = this.finalCounts.findIndex(item => item.id === area);
+      const itemIndex = this.finalCounts.findIndex((item) => item.id === area);
 
       this.finalCounts[itemIndex].isTableVisible = !this.finalCounts[itemIndex].isTableVisible;
     },

package/pages/home.vue

@@ -103,7 +103,7 @@ export default {
     canCreateCluster() {
       const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
 
-      return !!schema?.collectionMethods.find(x => x.toLowerCase() === 'post');
+      return !!schema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
     },
 
     manageLocation() {
@@ -160,7 +160,7 @@ export default {
           value:         'nameDisplay',
           sort:          ['nameSort'],
           canBeVariable: true,
-          getValue:      row => row.mgmt?.nameDisplay
+          getValue:      (row) => row.mgmt?.nameDisplay
         },
         {
           label:     this.t('landing.clusters.provider'),
@@ -206,7 +206,7 @@ export default {
     ...mapGetters(['currentCluster', 'defaultClusterId']),
 
     kubeClusters() {
-      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || []), this.$store);
+      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
     }
   },
 

package/pages/prefs.vue

@@ -131,7 +131,7 @@ export default {
     perPageOptions() {
       const t = this.$store.getters['i18n/t'];
 
-      return this.$store.getters['prefs/options'](ROWS_PER_PAGE).map(count => ({
+      return this.$store.getters['prefs/options'](ROWS_PER_PAGE).map((count) => ({
         label: t('prefs.perPage.value', { count }),
         value: count
       }));
@@ -140,7 +140,7 @@ export default {
     menuClusterOptions() {
       const t = this.$store.getters['i18n/t'];
 
-      return this.$store.getters['prefs/options'](MENU_MAX_CLUSTERS).map(count => ({
+      return this.$store.getters['prefs/options'](MENU_MAX_CLUSTERS).map((count) => ({
         label: t('prefs.clusterToShow.value', { count }),
         value: count
       }));

package/pages/rio/mesh.vue

@@ -95,13 +95,13 @@ async function loadData(store) {
 
   const known = {};
 
-  data.nodes = data.nodes.filter(x => !!x.app && !!x.namespace);
+  data.nodes = data.nodes.filter((x) => !!x.app && !!x.namespace);
   data.nodes.forEach((x) => {
     x.id = nodeIdFor(x);
     known[x.id] = true;
   });
 
-  data.edges = data.edges.filter(x => known[fromId(x)] && known[toId(x)]);
+  data.edges = data.edges.filter((x) => known[fromId(x)] && known[toId(x)]);
 
   return data;
 }
@@ -329,7 +329,7 @@ export default {
         g.setParent(id, nsId);
       }
 
-      const rpses = this.displayEdges.map(x => x.stats.rps);
+      const rpses = this.displayEdges.map((x) => x.stats.rps);
       const min = Math.min(...rpses);
       const max = Math.max(...rpses);
 

package/pages/support/index.vue

@@ -8,6 +8,7 @@ import { SETTING } from '@shell/config/settings';
 import { findBy } from '@shell/utils/array';
 import { addParam } from '@shell/utils/url';
 import { isRancherPrime } from '@shell/config/version';
+import { generateSupportLink } from '@shell/utils/version';
 
 export default {
   layout: 'home',
@@ -47,6 +48,7 @@ export default {
     this.brandSetting = await fetchOrCreateSetting(SETTING.BRAND, '');
     this.serverUrlSetting = await fetchOrCreateSetting(SETTING.SERVER_URL, '');
     this.uiIssuesSetting = await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.ISSUES });
+    this.settings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
   },
 
   data() {
@@ -57,6 +59,7 @@ export default {
       brandSetting:    null,
       uiIssuesSetting: null,
       serverSetting:   null,
+      settings:        null,
       promos:          [
         'support.promos.one',
         'support.promos.two',
@@ -103,6 +106,12 @@ export default {
 
     sccLink() {
       return this.hasAWSSupport ? addParam('https://scc.suse.com', 'from_marketplace', '1') : 'https://scc.suse.com';
+    },
+
+    supportLink() {
+      const version = this.settings?.find((s) => s.id === SETTING.VERSION_RANCHER)?.value;
+
+      return generateSupportLink(version);
     }
   },
 
@@ -124,7 +133,7 @@ export default {
               <div class="support-link">
                 <a
                   class="support-link"
-                  href="https://rancher.com/support-maintenance-terms"
+                  :href="supportLink"
                   target="_blank"
                   rel="noopener noreferrer nofollow"
                 >{{ t('support.community.learnMore') }}</a>

package/pkg/auto-import.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const contextFolders = ['chart', 'cloud-credential', 'content', 'detail', 'edit', 'list', 'machine-config', 'models', 'promptRemove', 'l10n', 'windowComponents', 'dialog', 'formatters'];
+const contextFolders = ['chart', 'cloud-credential', 'content', 'detail', 'edit', 'list', 'machine-config', 'models', 'promptRemove', 'l10n', 'windowComponents', 'dialog', 'formatters', 'login'];
 const contextMap = contextFolders.reduce((map, obj) => {
   map[obj] = true;
 

package/pkg/tsconfig.json

@@ -18,6 +18,7 @@
       "webpack-env",
       "@types/node",
       "@types/jest",
+      "@nuxt/types"
     ],
     "lib": [
       "esnext",

package/pkg/vue.config.js

@@ -41,7 +41,7 @@ module.exports = function(dir) {
       context
         .plugin('webpack-bundle-analyzer')
         .use(BundleAnalyzerPlugin)
-        .init(Plugin => new Plugin(options));
+        .init((Plugin) => new Plugin(options));
     },
 
     configureWebpack: (config) => {

package/plugins/axios.js

@@ -41,7 +41,7 @@ export default function({
         delete opt.name;
         delete opt.value;
 
-        opt.encode = x => x;
+        opt.encode = (x) => x;
         opt.sameSite = true;
         opt.path = '/';
         opt.secure = true;

package/plugins/clean-html-directive.js

@@ -17,7 +17,7 @@ const ALLOWED_TAGS = [
   'strong',
 ];
 
-export const purifyHTML = value => DOMPurify.sanitize(value, { ALLOWED_TAGS });
+export const purifyHTML = (value) => DOMPurify.sanitize(value, { ALLOWED_TAGS });
 
 export const cleanHtmlDirective = {
   inserted(el, binding) {

package/plugins/dashboard-store/__tests__/mutations.spec.js

@@ -4,14 +4,14 @@ import Resource from '@shell/plugins/dashboard-store/resource-class';
 
 describe('dashboard-store: mutations', () => {
   const ctx = {
-    rootGetters: { 'type-map/optionsFor': type => ({}) },
+    rootGetters: { 'type-map/optionsFor': (type) => ({}) },
     getters:     {
-      classify:      resource => Resource,
+      classify:      (resource) => Resource,
       cleanResource: (existing, resource) => resource
     }
   };
 
-  const create = type => ({
+  const create = (type) => ({
     id: '1',
     type
   });
@@ -25,7 +25,7 @@ describe('dashboard-store: mutations', () => {
 
   const createPodResource = (props = {}) => createResource(POD, props);
 
-  const createCache = props => ({
+  const createCache = (props) => ({
     generation:    0,
     haveAll:       false,
     haveNamespace: undefined,

package/plugins/dashboard-store/actions.js

@@ -537,7 +537,7 @@ export default {
   },
 
   createMany(ctx, data) {
-    return data.map(d => classify(ctx, d));
+    return data.map((d) => classify(ctx, d));
   },
 
   createPopulated(ctx, userData) {
@@ -556,8 +556,8 @@ export default {
   // Remove all entries for that type and stop watching it
   forgetType({ commit, dispatch, state }, type) {
     state.started
-      .filter(entry => entry.type === type)
-      .forEach(entry => dispatch('unwatch', entry));
+      .filter((entry) => entry.type === type)
+      .forEach((entry) => dispatch('unwatch', entry));
 
     commit('forgetType', type);
   },
@@ -616,7 +616,7 @@ export default {
         if (tries === SCHEMA_CHECK_RETRY_LOG) {
           console.warn(`Schema for ${ type } not available... retrying...`); // eslint-disable-line no-console
         }
-        await new Promise(resolve => setTimeout(resolve, 1000));
+        await new Promise((resolve) => setTimeout(resolve, 1000));
         tries--;
       }
     }

package/plugins/dashboard-store/getters.js

@@ -69,7 +69,7 @@ export default {
 
     // Filter first by namespace if one is provided, since this is efficient
     if (namespace) {
-      all = all.filter(obj => obj.namespace === namespace);
+      all = all.filter((obj) => obj.namespace === namespace);
     }
 
     garbageCollect.gcUpdateLastAccessed({

package/plugins/dashboard-store/index.js

@@ -116,7 +116,7 @@ export default (vuexModule, config, init) => {
             }
           }
         } else {
-          return obj.map(x => recurse(x));
+          return obj.map((x) => recurse(x));
         }
       } else if ( obj && typeof obj === 'object' ) {
         if ( obj.__rehydrate ) {

package/plugins/dashboard-store/mutations.js

@@ -279,7 +279,7 @@ export function loadAll(state, {
   }
 
   const keyField = getters.keyFieldForType(type);
-  const proxies = data.map(x => classify(ctx, x));
+  const proxies = data.map((x) => classify(ctx, x));
   const cache = registerType(state, type);
 
   clear(cache.list);
@@ -356,7 +356,7 @@ export default {
       });
     });
     cache.list.forEach((entry) => {
-      if (!allLatest.find(toLoadEntry => toLoadEntry.id === entry.id)) {
+      if (!allLatest.find((toLoadEntry) => toLoadEntry.id === entry.id)) {
         commit('remove', entry);
       }
     });

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

@@ -939,7 +939,7 @@ export default class Resource {
   }
 
   get canCreate() {
-    if ( this.schema && !this.schema?.collectionMethods.find(x => x.toLowerCase() === 'post') ) {
+    if ( this.schema && !this.schema?.collectionMethods.find((x) => x.toLowerCase() === 'post') ) {
       return false;
     }
 
@@ -955,7 +955,7 @@ export default class Resource {
   }
 
   get canEditYaml() {
-    return this.schema?.resourceMethods?.find(x => x === 'blocked-PUT') ? false : this.canUpdate;
+    return this.schema?.resourceMethods?.find((x) => x === 'blocked-PUT') ? false : this.canUpdate;
   }
 
   // ------------------------------------------------------------------
@@ -1489,7 +1489,7 @@ export default class Resource {
     const rules = [];
 
     const customValidationRulesets = this?.customValidationRules
-      .filter(rule => !!rule.validators || !!rule.required)
+      .filter((rule) => !!rule.validators || !!rule.required)
       .map((rule) => {
         const formRules = formRulesGenerator(this.t, { displayKey: rule?.translationKey ? this.t(rule.translationKey) : 'Value' });
 
@@ -1510,10 +1510,10 @@ export default class Resource {
               return formRules[rule];
             }
             )
-            .filter(rule => !!rule)
+            .filter((rule) => !!rule)
         };
       })
-      .filter(ruleset => ruleset.rules.length > 0);
+      .filter((ruleset) => ruleset.rules.length > 0);
 
     rules.push(...customValidationRulesets);
 
@@ -1530,7 +1530,7 @@ export default class Resource {
         customValidationRules = customValidationRules();
       }
 
-      customValidationRules.filter(rule => !ignorePaths.includes(rule.path)).forEach((rule) => {
+      customValidationRules.filter((rule) => !ignorePaths.includes(rule.path)).forEach((rule) => {
         const {
           path,
           requiredIf: requiredIfPath,
@@ -1714,7 +1714,7 @@ export default class Resource {
         const allOfResourceType = this.$rootGetters['cluster/all']( type );
 
         this.ownersByType[kind].forEach((resource, idx) => {
-          const resourceInstance = allOfResourceType.find(resourceByType => resourceByType?.metadata?.uid === resource.uid);
+          const resourceInstance = allOfResourceType.find((resourceByType) => resourceByType?.metadata?.uid === resource.uid);
 
           if (resourceInstance) {
             owners.push(resourceInstance);
@@ -1737,7 +1737,7 @@ export default class Resource {
       details.push({
         label:     this.t('resourceDetail.detailTop.ownerReferences', { count: this.owners.length }),
         formatter: 'ListLinkDetail',
-        content:   this.owners.map(owner => ({
+        content:   this.owners.map((owner) => ({
           key:   owner.id,
           row:   owner,
           col:   {},

package/plugins/i18n.js

@@ -9,7 +9,7 @@ function stringFor(store, key, args, raw = false, escapehtml = true) {
   if ( translation !== undefined ) {
     out = translation;
   } else if ( args && Object.keys(args).length ) {
-    const argStr = Object.keys(args).map(k => `${ k }: ${ args[k] }`).join(', ');
+    const argStr = Object.keys(args).map((k) => `${ k }: ${ args[k] }`).join(', ');
 
     out = `%${ key }(${ argStr })%`;
     raw = true;

package/plugins/plugin.js

@@ -3,6 +3,10 @@ import { allHashSettled } from '@shell/utils/promise';
 import { shouldNotLoadPlugin, UI_PLUGIN_BASE_URL } from '@shell/config/uiplugins';
 
 export default async function(context) {
+  if (process.env.excludeOperatorPkg === 'true') {
+    return;
+  }
+
   const hash = {};
 
   // Provide a mechanism to load the UI without the plugins loaded - in case there is a problem
@@ -30,7 +34,7 @@ export default async function(context) {
         const entries = res.entries || res.Entries || {};
 
         Object.values(entries).forEach((plugin) => {
-          const shouldNotLoad = shouldNotLoadPlugin(plugin, rancherVersion); // Error key string or boolean
+          const shouldNotLoad = shouldNotLoadPlugin(plugin, rancherVersion, context.store.getters['uiplugins/plugins'] || []); // Error key string or boolean
 
           if (!shouldNotLoad) {
             hash[plugin.name] = context.$plugin.loadPluginAsync(plugin);

package/plugins/steve/actions.js

@@ -224,7 +224,7 @@ export default {
     if ( opt.load !== false && res.type === 'collection' ) {
       await dispatch('loadMulti', res.data);
 
-      return res.data.map(x => getters.byId(x.type, x.id) || x);
+      return res.data.map((x) => getters.byId(x.type, x.id) || x);
     } else if ( opt.load !== false && res.type && res.id ) {
       return dispatch('load', { data: res });
     } else {
@@ -256,7 +256,7 @@ export default {
     if ( opt.load !== false && res.type === 'collection' ) {
       await dispatch('loadMulti', res.data);
 
-      return res.data.map(x => getters.byId(x.type, x.id) || x);
+      return res.data.map((x) => getters.byId(x.type, x.id) || x);
     } else if ( opt.load !== false && res.type && res.id ) {
       return dispatch('load', { data: res });
     } else {
@@ -349,7 +349,7 @@ export default {
 
     dropKeys(obj, rootKeys);
     dropKeys(obj?.metadata, metadataKeys);
-    (obj?.status?.conditions || []).forEach(condition => dropKeys(condition, conditionKeys));
+    (obj?.status?.conditions || []).forEach((condition) => dropKeys(condition, conditionKeys));
 
     return jsyaml.dump(obj);
   }