@rancher/shell 0.1.3 → 0.1.21

package/components/nav/TopLevelMenu.vue

@@ -1,11 +1,10 @@
 <script>
 import BrandImage from '@shell/components/BrandImage';
 import ClusterProviderIcon from '@shell/components/ClusterProviderIcon';
-import LocaleSelector from '@shell/components/LocaleSelector';
 import { mapGetters } from 'vuex';
 import $ from 'jquery';
 import { CAPI, MANAGEMENT } from '@shell/config/types';
-import { mapPref, DEV, MENU_MAX_CLUSTERS } from '@shell/store/prefs';
+import { mapPref, MENU_MAX_CLUSTERS } from '@shell/store/prefs';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
 import { KEY } from '@shell/utils/platform';
@@ -13,6 +12,7 @@ import { getVersionInfo } from '@shell/utils/version';
 import { LEGACY } from '@shell/store/features';
 import { SETTING } from '@shell/config/settings';
 import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
+import { isRancherPrime } from '@shell/config/version';
 
 const UNKNOWN = 'unknown';
 const UI_VERSION = process.env.VERSION || UNKNOWN;
@@ -20,9 +20,7 @@ const UI_COMMIT = process.env.COMMIT || UNKNOWN;
 
 export default {
 
-  components: {
-    BrandImage, ClusterProviderIcon, LocaleSelector
-  },
+  components: { BrandImage, ClusterProviderIcon },
 
   data() {
     const { displayVersion, fullVersion } = getVersionInfo(this.$store);
@@ -68,9 +66,10 @@ export default {
     clusters() {
       const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
       let kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all), this.$store);
+      let pClusters = null;
 
       if (this.hasProvCluster) {
-        const pClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
+        pClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
         const available = pClusters.reduce((p, c) => {
           p[c.mgmt] = true;
 
@@ -84,10 +83,12 @@ export default {
       }
 
       return kubeClusters.map((x) => {
+        const pCluster = pClusters?.find(c => c.mgmt.id === x.id);
+
         return {
           id:              x.id,
           label:           x.nameDisplay,
-          ready:           x.isReady,
+          ready:           x.isReady && !pCluster?.hasError,
           osLogo:          x.providerOsLogo,
           providerNavLogo: x.providerMenuLogo,
           badge:           x.badge,
@@ -101,13 +102,11 @@ export default {
 
       const out = search ? this.clusters.filter(item => item.label.toLowerCase().includes(search)) : this.clusters;
 
-      const sorted = sortBy(out, ['ready:desc', 'label']);
+      const sorted = sortBy(out, ['name:desc', 'label']);
 
       return sorted;
     },
 
-    dev: mapPref(DEV),
-
     maxClustersToShow: mapPref(MENU_MAX_CLUSTERS),
 
     multiClusterApps() {
@@ -125,22 +124,7 @@ export default {
     configurationApps() {
       const options = this.options;
 
-      const items = options.filter(opt => opt.category === 'configuration');
-
-      // Add plugin page
-      // Ony when developing for now
-      if (process.env.dev) {
-        items.push({
-          label:   'Plugins',
-          inStore: 'management',
-          icon:    'icon-gear',
-          value:   'plugins',
-          weight:  1,
-          to:      { name: 'plugins' },
-        });
-      }
-
-      return items;
+      return options.filter(opt => opt.category === 'configuration');
     },
 
     options() {
@@ -179,14 +163,14 @@ export default {
     },
 
     hasSupport() {
-      return this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SUPPORTED )?.value === 'true';
+      return isRancherPrime() || this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SUPPORTED )?.value === 'true';
     },
   },
 
   watch: {
     $route() {
       this.shown = false;
-    },
+    }
   },
 
   mounted() {
@@ -349,7 +333,6 @@ export default {
               v-html="displayVersion"
             />
           </div>
-          <LocaleSelector></LocaleSelector>
         </div>
       </div>
     </transition>

package/config/home-links.js

@@ -0,0 +1,155 @@
+import { DOCS_BASE } from '@shell/config/private-label';
+import { MANAGEMENT } from '@shell/config/types';
+import { SETTING } from '@shell/config/settings';
+import { allHash } from '@shell/utils/promise';
+
+const DEFAULT_LINKS = [
+  {
+    key:     'docs',
+    value:   DOCS_BASE,
+    enabled: true,
+  },
+  {
+    key:     'forums',
+    value:   'https://forums.rancher.com/',
+    enabled: true,
+  },
+  {
+    key:     'slack',
+    value:   'https://slack.rancher.io/',
+    enabled: true,
+  },
+  {
+    key:     'issues',
+    value:   'https://github.com/rancher/dashboard/issues/new/choose',
+    enabled: true,
+  },
+  {
+    key:     'getStarted',
+    value:   '/docs/getting-started',
+    enabled: true,
+  },
+];
+
+const SUPPORT_LINK = {
+  key:      'commercialSupport',
+  value:    '/support',
+  enabled:  true,
+  readonly: true
+};
+
+// We add a version attribute to the setting so we know what has been migrated and which version of the setting we have
+export const CUSTOM_LINKS_VERSION = 'v1';
+
+// Fetch the settings required for the links, taking into account legacy settings if we have not migrated
+export async function fetchLinks(store, hasSupport, isSupportPage, t) {
+  let uiLinks = {};
+
+  try {
+    const uiLinksSetting = await store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.UI_CUSTOM_LINKS });
+
+    uiLinks = JSON.parse(uiLinksSetting.value);
+  } catch (e) {
+    console.warn('Could not parse custom link settings', e); // eslint-disable-line no-console
+  }
+
+  // If uiLinks is set and has the correct version, then we are okay, otherwise we need to migrate from the old settings
+  if (uiLinks?.version === CUSTOM_LINKS_VERSION) {
+    // Map out the default settings, as we only store keys of the ones to show
+    if (uiLinks.defaults) {
+      const defaults = [...DEFAULT_LINKS];
+
+      // Map the link name stored to the default link, if it exists
+      defaults.forEach((link) => {
+        const enabled = uiLinks.defaults.find(linkName => linkName === link.key);
+
+        link.enabled = !!enabled;
+      });
+
+      uiLinks.defaults = defaults;
+    }
+
+    return ensureSupportLink(uiLinks, hasSupport, isSupportPage, t);
+  }
+
+  // No new setting, so return the required structure
+  // We don't migrate here, as we may not have permissions to create the setting
+  const links = {
+    version:  CUSTOM_LINKS_VERSION,
+    defaults: [...DEFAULT_LINKS],
+    custom:   []
+  };
+
+  // There are two legacy settings:
+  // SETTING.ISSUES - can specify a custom link to use for 'File an issue'
+  // SETTING.COMMUNITY_LINKS - can specify whether to hide all of the default links (other than 'File an issue')
+  try {
+    const { uiIssuesSetting, uiCommunitySetting } = await allHash({
+      uiIssuesSetting:    store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.ISSUES }),
+      uiCommunitySetting: store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.COMMUNITY_LINKS })
+    });
+
+    // Should we show the default set of links?
+    if (uiCommunitySetting?.value === 'false') {
+      // Hide all of the default links
+      links.defaults.forEach(link => (link.enabled = false));
+    }
+
+    // Do we have a custom 'File an issue' link ?
+    if (uiIssuesSetting?.value) {
+      links.custom.push({
+        label: t ? t('customLinks.defaults.issues') : 'Issues',
+        value: uiIssuesSetting.value
+      });
+
+      // Hide the default 'File an issue' link
+      const issueLink = links.defaults?.find(link => link.key === 'issues');
+
+      if (issueLink) {
+        issueLink.enabled = false;
+        issueLink.readOnly = true;
+      }
+    }
+  } catch (e) {
+    console.warn('Could not parse legacy link settings', e); // eslint-disable-line no-console
+  }
+
+  return ensureSupportLink(links, hasSupport, isSupportPage, t);
+}
+
+// Ensure the support link is added if needed
+function ensureSupportLink(links, hasSupport, isSupportPage, t) {
+  if (!hasSupport && !isSupportPage) {
+    const supportLink = links.defaults?.find(link => link.key === 'commercialSupport');
+
+    if (!supportLink) {
+      links.defaults.push(SUPPORT_LINK);
+    }
+  }
+
+  // Localise the default links
+  links.defaults = links.defaults.map((link) => {
+    return {
+      ...link,
+      label: t(`'customLinks.defaults.${ link.key }`)
+    };
+  });
+
+  // Ensure that if any custom links have the same name as a default link, we use the custom link
+  const customNamesMap = links.custom.reduce((linkMap, link) => {
+    linkMap[link.label] = link;
+
+    return linkMap;
+  }, {});
+
+  // If any custom links have the same name as a default link, then hide and mark readonly the default link
+  // Main use case if the 'File an Issue' link when migrating the old settings
+  links.defaults.forEach((link) => {
+    if (customNamesMap[link.label]) {
+      link.enabled = false;
+      link.readonly = true;
+    }
+  });
+
+  return links;
+}

package/config/labels-annotations.js

@@ -65,6 +65,7 @@ export const CATALOG = {
   EXPERIMENTAL:  'catalog.cattle.io/experimental',
   NAMESPACE:     'catalog.cattle.io/namespace',
   RELEASE_NAME:  'catalog.cattle.io/release-name',
+  FEATURED:      'catalog.cattle.io/featured',
 
   REQUIRES_GVK:     'catalog.cattle.io/requires-gvr',
   PROVIDES:         'catalog.cattle.io/provides-gvr',
@@ -94,7 +95,7 @@ export const CATALOG = {
   DEPLOYED_OS:   'catalog.cattle.io/deploys-on-os',
 
   MIGRATED: 'apps.cattle.io/migrated',
-  MANAGED:  'catalog.cattle.io/managed'
+  MANAGED:  'catalog.cattle.io/managed',
 };
 
 export const FLEET = {

package/config/private-label.js

@@ -7,7 +7,7 @@ export const DOCS_BASE = 'https://rancher.com/docs/rancher/v2.6/en';
 
 const STANDARD_VENDOR = 'Rancher';
 const STANDARD_PRODUCT = 'Explorer';
-const CUSTOM_VENDOR = { suse: 'SUSE Rancher' };
+const CUSTOM_VENDOR = { suse: 'Rancher Prime' };
 
 let mode = STANDARD;
 let vendor = STANDARD_VENDOR;

package/config/product/explorer.js

@@ -58,6 +58,7 @@ export function init(store) {
     'namespaces',
     NODE,
     VIRTUAL_TYPES.CLUSTER_MEMBERS,
+    EVENT,
   ], 'cluster');
   basicType([
     SERVICE,
@@ -142,6 +143,7 @@ export function init(store) {
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: true });
 
   configureType(EVENT, { limit: 500 });
+  weightType(EVENT, -1, true);
 
   // Allow Pods to be grouped by node
   configureType(POD, {
@@ -158,13 +160,12 @@ export function init(store) {
 
   setGroupDefaultType('serviceDiscovery', SERVICE);
 
-  configureType('workload', {
-    displayName: 'Workload',
+  configureType(WORKLOAD, {
+    displayName: store.getters['i18n/t'](`typeLabel.${ WORKLOAD }`, { count: 1 }).trim(),
     location:    {
       name:    'c-cluster-product-resource',
-      params:  { resource: 'workload' },
+      params:  { resource: WORKLOAD },
     },
-    resource: WORKLOAD_TYPES.DEPLOYMENT
   });
 
   headers(PV, [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE]);

package/config/product/legacy.js

@@ -46,16 +46,6 @@ export function init(store) {
     exact:          true
   });
 
-  virtualType({
-    labelKey:       'legacy.cis-scans',
-    name:           'v1-cis-scans',
-    group:          'Root',
-    namespaced:     true,
-    weight:         111,
-    route:          { name: 'c-cluster-legacy-pages-page', params: { page: 'cis' } },
-    exact:          true
-  });
-
   virtualType({
     ifHave:     IF_HAVE.PROJECT,
     labelKey:   'legacy.project.label',
@@ -82,7 +72,6 @@ export function init(store) {
     'v1-alerts',
     'v1-catalogs',
     'v1-notifiers',
-    'v1-cis-scans',
     'v1-project-overview'
   ]);
 
@@ -121,17 +110,6 @@ export function init(store) {
     overview:   false,
   });
 
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.logging',
-    namespaced: true,
-    name:       'project-logging',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'logging' } },
-    exact:      true,
-    overview:   false,
-  });
-
   virtualType({
     ifHave:     IF_HAVE.PROJECT,
     labelKey:   'legacy.monitoring',
@@ -143,28 +121,6 @@ export function init(store) {
     overview:   false,
   });
 
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.istio',
-    namespaced: true,
-    name:       'project-istio',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'istio' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.pipelines',
-    namespaced: true,
-    name:       'project-pipelines',
-    weight:     104,
-    route:      { name: 'c-cluster-legacy-project-pipelines' },
-    exact:      true,
-    overview:   false,
-  });
-
   virtualType({
     ifHave:     IF_HAVE.PROJECT,
     labelKey:   'legacy.secrets',
@@ -192,10 +148,7 @@ export function init(store) {
     'project-alerts',
     'project-catalogs',
     'project-config-maps',
-    'project-logging',
-    'project-istio',
     'project-monitoring',
-    'project-pipelines',
     'project-secrets',
   ], 'Project');
 }

package/config/product/manager.js

@@ -120,8 +120,6 @@ export function init(store) {
   weightType(CAPI.MACHINE, 1, true);
   weightType(CATALOG.CLUSTER_REPO, 0, true);
 
-  configureType(CATALOG.CLUSTER_REPO, { showListMasthead: false });
-
   basicType([
     CAPI.MACHINE_DEPLOYMENT,
     CAPI.MACHINE_SET,

package/config/product/multi-cluster-apps.js

@@ -20,17 +20,6 @@ export function init(store) {
     showWorkspaceSwitcher: false,
   });
 
-  virtualType({
-    labelKey:       'legacy.apps',
-    name:           'mc-apps',
-    group:          'Root',
-    namespaced:     false,
-    weight:         112,
-    icon:           'folder',
-    route:          { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'apps' } },
-    exact:          true
-  });
-
   virtualType({
     labelKey:       'legacy.catalogs',
     name:           'mc-catalogs',
@@ -65,7 +54,6 @@ export function init(store) {
   });
 
   basicType([
-    'mc-apps',
     'mc-catalogs',
     'global-dns-entries',
     'global-dns-providers',

package/config/product/settings.js

@@ -90,12 +90,23 @@ export function init(store) {
     route:          { name: 'c-cluster-settings-performance' }
   });
 
+  virtualType({
+    ifHaveType:     MANAGEMENT.SETTING,
+    labelKey:       'customLinks.label',
+    name:           'links',
+    namespaced:     false,
+    weight:         96,
+    icon:           'folder',
+    route:          { name: 'c-cluster-settings-links' }
+  });
+
   basicType([
     'settings',
     'features',
     'brand',
     'banners',
-    'performance'
+    'performance',
+    'links'
   ]);
 
   configureType(MANAGEMENT.SETTING, {

package/config/product/uiplugins.js

@@ -0,0 +1,17 @@
+import { DSL, IF_HAVE } from '@shell/store/type-map';
+
+export const NAME = 'uiplugins';
+
+export function init(store) {
+  const { product } = DSL(store, NAME);
+
+  // Add a product for UI Plugins - will appear in the top-level menu
+  product({
+    ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
+    inStore:             'management',
+    icon:                'extension',
+    removable:           false,
+    showClusterSwitcher: false,
+    category:            'configuration',
+  });
+}

package/config/settings.js

@@ -1,4 +1,5 @@
 // Settings
+import { GC_DEFAULTS } from '../utils/gc/gc-types';
 import { MANAGEMENT } from './types';
 
 // Adapted from: https://github.com/rancher/ui/blob/08c379a9529f740666a704b52522a468986c3520/lib/shared/addon/utils/constants.js#L564
@@ -55,6 +56,7 @@ export const SETTING = {
   COMMUNITY_LINKS:                      'ui-community-links',
   FAVICON:                              'ui-favicon',
   UI_PERFORMANCE:                       'ui-performance',
+  UI_CUSTOM_LINKS:                      'ui-custom-links',
   /**
    * Allow the backend to force a light/dark theme. Used in non-rancher world and results in the theme used
    * both pre and post log in. If not present defaults to the usual process
@@ -86,7 +88,7 @@ export const ALLOWED_SETTINGS = {
     kind:    'enum',
     options: ['dynamic', 'true', 'false']
   },
-  [SETTING.BRAND]:                          {},
+  [SETTING.BRAND]:                          { canReset: true },
   [SETTING.CLUSTER_TEMPLATE_ENFORCEMENT]:   { kind: 'boolean' },
   [SETTING.TELEMETRY]:                    {
     kind:    'enum',
@@ -104,7 +106,8 @@ export const DEFAULT_PERF_SETTING = {
     enabled:   false,
     threshold: 1500,
   },
-  disableWebsocketNotification: false
+  disableWebsocketNotification: true,
+  garbageCollection:            GC_DEFAULTS
 };
 
 export const fetchOrCreateSetting = async(store, id, val, save = true) => {
@@ -135,3 +138,21 @@ export const setSetting = async(store, id, val) => {
 
   return setting;
 };
+
+export const getPerformanceSetting = (rootGetters) => {
+  const perfSetting = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE);
+  let perfConfig = {};
+
+  if (perfSetting && perfSetting.value) {
+    try {
+      perfConfig = JSON.parse(perfSetting.value);
+    } catch (e) {
+      console.warn('ui-performance setting contains invalid data'); // eslint-disable-line no-console
+    }
+  }
+
+  // Start with the default and overwrite the values from the setting - ensures we have defaults for newly added options
+  perfConfig = Object.assign(DEFAULT_PERF_SETTING, perfConfig);
+
+  return perfConfig;
+};

package/config/types.js

@@ -51,6 +51,7 @@ export const NAMESPACE = 'namespace';
 export const NODE = 'node';
 export const NETWORK_POLICY = 'networking.k8s.io.networkpolicy';
 export const POD = 'pod';
+export const PSP = 'policy.podsecuritypolicy';
 export const PV = 'persistentvolume';
 export const PVC = 'persistentvolumeclaim';
 export const RESOURCE_QUOTA = 'resourcequota';
@@ -80,7 +81,6 @@ export const WORKLOAD_TYPES = {
   STATEFUL_SET:           'apps.statefulset',
   REPLICA_SET:            'apps.replicaset',
   REPLICATION_CONTROLLER: 'replicationcontroller',
-  POD:                    'pod'
 };
 
 const {
@@ -101,6 +101,9 @@ export const CATALOG = {
   REPO:           'catalog.cattle.io.repo',
 };
 
+// UI Plugin type
+export const UI_PLUGIN = 'catalog.cattle.io.uiplugin';
+
 export const HELM = { PROJECTHELMCHART: 'helm.cattle.io.projecthelmchart' };
 
 export const MONITORING = {
@@ -271,6 +274,7 @@ export const HCI = {
   CLUSTER:   'harvesterhci.io.management.cluster',
   DASHBOARD: 'harvesterhci.io.dashboard',
   IMAGE:     'harvesterhci.io.virtualmachineimage',
+  SETTING:   'harvesterhci.io.setting',
 };
 
 export const VIRTUAL_HARVESTER_PROVIDER = 'harvester';