@rancher/shell 0.1.2 → 0.1.4

package/components/form/KeyValue.vue

@@ -12,6 +12,8 @@ import { _EDIT, _VIEW } from '@shell/config/query-params';
 import { asciiLike } from '@shell/utils/string';
 
 export default {
+  name: 'KeyValue',
+
   components: {
     Select,
     TextAreaAutoGrow,
@@ -22,6 +24,10 @@ export default {
       type:     [Array, Object],
       default: null,
     },
+    defaultValue: {
+      type:     [Array, Object],
+      default: null,
+    },
     // If the user supplies this array, then it indicates which keys should be shown as binary
     binaryValueKeys: {
       type:    [Array, Object],
@@ -223,68 +229,13 @@ export default {
     }
   },
   data() {
-    const rows = [];
-
-    if ( this.asMap ) {
-      const input = this.value || {};
-
-      Object.keys(input).forEach((key) => {
-        let value = input[key];
-        const decodedValue = base64Decode(input[key]);
-        const asciiValue = asciiLike(decodedValue);
-
-        if ( this.handleBase64 && asciiValue) {
-          value = base64Decode(value);
-        }
-
-        rows.push({
-          key,
-          value,
-          binary:    this.displayValuesAsBinary || (this.handleBase64 && !asciiValue),
-          canEncode: this.handleBase64 && asciiValue,
-          supported: true,
-        });
-      });
-    } else {
-      const input = this.value || [];
-
-      for ( const row of input ) {
-        let value = row[this.valueName] || '';
-        const decodedValue = base64Decode(row[this.valueName]);
-        const asciiValue = asciiLike(decodedValue);
-
-        if ( this.handleBase64 && asciiValue) {
-          value = base64Decode(value);
-        }
-        const entry = {
-          [this.keyName]:   row[this.keyName] || '',
-          [this.valueName]: value,
-          binary:           this.displayValuesAsBinary || (this.handleBase64 && !asciiValue),
-          canEncode:        this.handleBase64 && asciiValue,
-          supported:        this.supported(row),
-        };
-
-        this.preserveKeys?.map((k) => {
-          if ( typeof row[k] !== 'undefined' ) {
-            entry[k] = row[k];
-          }
-        });
-        rows.push(entry);
-      }
-    }
-    if ( !rows.length && this.initialEmptyRow ) {
-      rows.push({
-        [this.keyName]:   '',
-        [this.valueName]: '',
-        binary:           false,
-        canEncode:        this.handleBase64,
-        supported:        true
-      });
-    }
+    const rows = this.getRows(this.value);
 
     return { rows };
   },
+
   computed: {
+
     isView() {
       return this.mode === _VIEW;
     },
@@ -315,7 +266,78 @@ export default {
   created() {
     this.queueUpdate = debounce(this.update, 500);
   },
+  watch: {
+    defaultValue(neu) {
+      if (Array.isArray(neu)) {
+        this.rows = this.getRows(neu);
+        this.$emit('input', neu);
+      }
+    }
+  },
   methods: {
+    getRows(value) {
+      const rows = [];
+
+      if ( this.asMap ) {
+        const input = value || {};
+
+        Object.keys(input).forEach((key) => {
+          let value = input[key];
+          const decodedValue = base64Decode(input[key]);
+          const asciiValue = asciiLike(decodedValue);
+
+          if ( this.handleBase64 && asciiValue) {
+            value = base64Decode(value);
+          }
+
+          rows.push({
+            key,
+            value,
+            binary:    this.displayValuesAsBinary || (this.handleBase64 && !asciiValue),
+            canEncode: this.handleBase64 && asciiValue,
+            supported: true,
+          });
+        });
+      } else {
+        const input = value || [];
+
+        for ( const row of input ) {
+          let value = row[this.valueName] || '';
+          const decodedValue = base64Decode(row[this.valueName]);
+          const asciiValue = asciiLike(decodedValue);
+
+          if ( this.handleBase64 && asciiValue) {
+            value = base64Decode(value);
+          }
+          const entry = {
+            [this.keyName]:   row[this.keyName] || '',
+            [this.valueName]: value,
+            binary:           this.displayValuesAsBinary || (this.handleBase64 && !asciiValue),
+            canEncode:        this.handleBase64 && asciiValue,
+            supported:        this.supported(row),
+          };
+
+          this.preserveKeys?.map((k) => {
+            if ( typeof row[k] !== 'undefined' ) {
+              entry[k] = row[k];
+            }
+          });
+          rows.push(entry);
+        }
+      }
+      if ( !rows.length && this.initialEmptyRow ) {
+        rows.push({
+          [this.keyName]:   '',
+          [this.valueName]: '',
+          binary:           false,
+          canEncode:        this.handleBase64,
+          supported:        true
+        });
+      }
+
+      return rows;
+    },
+
     add(key = '', value = '') {
       const obj = {
         ...this.defaultAddData,

package/components/form/NameNsDescription.vue

@@ -5,7 +5,7 @@ import { get, set } from '@shell/utils/object';
 import { sortBy } from '@shell/utils/sort';
 import { NAMESPACE } from '@shell/config/types';
 import { DESCRIPTION } from '@shell/config/labels-annotations';
-import { _VIEW, _EDIT } from '@shell/config/query-params';
+import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 
@@ -208,7 +208,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['isVirtualCluster', 'currentCluster']),
+    ...mapGetters(['currentProduct', 'currentCluster']),
     namespaceReallyDisabled() {
       return (
         !!this.forceNamespace || this.namespaceDisabled || this.mode === _EDIT
@@ -224,17 +224,21 @@ export default {
       const namespaces = this.namespacesOverride || this.$store.getters[`${ currentStore }/all`](this.namespaceType);
 
       const filtered = namespaces.filter( this.namespaceFilter || ((namespace) => {
-        const isSettingSystemNamespace = this.$store.getters['systemNamespaces'].includes(namespace.metadata.name);
+        // By default, include the namespace in the dropdown.
+        let out = true;
 
-        if (this.isVirtualCluster) {
-          // For virtual clusters, filter out the namespace
+        if (this.currentProduct?.hideSystemResources) {
+          // Filter out the namespace
           // if it is a system namespace or if it is managed by
           // Fleet.
-          return !namespace.isSystem && !namespace.isFleetManaged && !isSettingSystemNamespace;
+          out = !namespace.isSystem && !namespace.isFleetManaged;
         }
 
-        // By default, include the namespace in the dropdown.
-        return true;
+        if (this.mode === _CREATE) {
+          out = out && !!namespace.links.update;
+        }
+
+        return out;
       }));
 
       const withLabels = filtered.map(this.namespaceMapper || ((obj) => {

package/components/form/NodeScheduling.vue

@@ -3,7 +3,7 @@ import { mapGetters } from 'vuex';
 import { RadioGroup } from '@components/Form/Radio';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import NodeAffinity from '@shell/components/form/NodeAffinity';
-import { NAME as VIRTUAL } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as VIRTUAL } from '@shell/config/product/harvester-manager';
 import { _VIEW } from '@shell/config/query-params';
 import { isEmpty } from '@shell/utils/object';
 import { HOSTNAME } from '@shell/config/labels-annotations';

package/components/form/ResourceTabs/index.vue

@@ -85,7 +85,11 @@ export default {
     showConditions() {
       const inStore = this.$store.getters['currentStore'](this.value.type);
 
-      return this.isView && this.needConditions && this.value?.type && this.$store.getters[`${ inStore }/pathExistsInSchema`](this.value.type, 'status.conditions');
+      if ( this.$store.getters[`${ inStore }/schemaFor`](this.value.type) ) {
+        return this.isView && this.needConditions && this.value?.type && this.$store.getters[`${ inStore }/pathExistsInSchema`](this.value.type, 'status.conditions');
+      }
+
+      return false;
     },
     showEvents() {
       return this.isView && this.needEvents && this.hasEvents && (this.events.length || this.alwaysShowEvents);

package/components/form/WorkloadPorts.vue

@@ -8,7 +8,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { HCI as HCI_LABELS_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 import { CAPI, SERVICE } from '@shell/config/types';
 
 export default {

package/components/formatter/ClusterLink.vue

@@ -25,12 +25,8 @@ export default {
       return this.row?.detailLocation;
     },
 
-    clusterHasIssues() {
-      return this.row.status?.conditions?.some(condition => condition.error === true);
-    },
-
     statusErrorConditions() {
-      if (this.clusterHasIssues) {
+      if (this.row.hasError) {
         return this.row?.status.conditions.filter(condition => condition.error === true);
       }
 
@@ -38,7 +34,7 @@ export default {
     },
 
     formattedConditions() {
-      if (this.clusterHasIssues) {
+      if (this.row.hasError) {
         const filteredConditions = this.statusErrorConditions;
         const formattedTooltip = [];
 
@@ -69,7 +65,7 @@ export default {
       class="template-upgrade-icon icon-alert icon"
     />
     <i
-      v-if="clusterHasIssues"
+      v-if="row.hasError"
       v-tooltip="{ content: `<div>${formattedConditions}</div>`, html: true }"
       class="conditions-alert-icon icon-error icon-lg"
     />

package/components/formatter/WorkloadHealthScale.vue

@@ -2,7 +2,7 @@
 import Vue from 'vue';
 import ProgressBarMulti from '@shell/components/ProgressBarMulti';
 import PlusMinus from '@shell/components/form/PlusMinus';
-import { SCALABLE_WORKLOAD_TYPES } from '~shell/config/types';
+import { SCALABLE_WORKLOAD_TYPES } from '@shell/config/types';
 import { ucFirst } from '@shell/utils/string';
 
 const SCALABLE_TYPES = Object.values(SCALABLE_WORKLOAD_TYPES);

package/components/nav/Header.vue

@@ -2,7 +2,6 @@
 import { mapGetters } from 'vuex';
 import debounce from 'lodash/debounce';
 import { NORMAN, STEVE } from '@shell/config/types';
-import { NAME as VIRTUAL } from '@shell/config/product/harvester';
 import { ucFirst } from '@shell/utils/string';
 import { isMac } from '@shell/utils/platform';
 import Import from '@shell/components/Import';
@@ -13,7 +12,6 @@ import ClusterBadge from '@shell/components/ClusterBadge';
 import { LOGGED_OUT } from '@shell/config/query-params';
 import NamespaceFilter from './NamespaceFilter';
 import WorkspaceSwitcher from './WorkspaceSwitcher';
-import HarvesterUpgrade from './HarvesterUpgrade.vue';
 import TopLevelMenu from './TopLevelMenu';
 import Jump from './Jump';
 import { allHash } from '@shell/utils/promise';
@@ -31,7 +29,6 @@ export default {
     BrandImage,
     ClusterBadge,
     ClusterProviderIcon,
-    HarvesterUpgrade
   },
 
   props: {
@@ -51,14 +48,14 @@ export default {
       kubeConfigCopying: false,
       searchShortcut,
       shellShortcut,
-      VIRTUAL,
       LOGGED_OUT,
+      navHeaderRight:         null
     };
   },
 
   computed: {
     ...mapGetters(['clusterReady', 'isExplorer', 'isMultiCluster', 'isRancher', 'currentCluster',
-      'currentProduct', 'backToRancherLink', 'backToRancherGlobalLink', 'pageActions', 'isSingleProduct', 'isVirtualCluster']),
+      'currentProduct', 'backToRancherLink', 'backToRancherGlobalLink', 'pageActions', 'isSingleProduct']),
     ...mapGetters('type-map', ['activeProducts']),
 
     appName() {
@@ -94,12 +91,12 @@ export default {
     },
 
     showPreferencesLink() {
-      return (this.$store.getters['management/schemaFor'](STEVE.PREFERENCE)?.resourceMethods || []).includes('PUT');
+      return (this.$store.getters['management/schemaFor'](STEVE.PREFERENCE, false, false)?.resourceMethods || []).includes('PUT');
     },
 
     showAccountAndApiKeyLink() {
       // Keep this simple for the moment and only check if the user can see tokens... plus the usual isRancher/isSingleProduct
-      const canSeeTokens = this.$store.getters['rancher/schemaFor'](NORMAN.TOKEN);
+      const canSeeTokens = this.$store.getters['rancher/schemaFor'](NORMAN.TOKEN, false, false);
 
       return canSeeTokens && (this.isRancher || this.isSingleProduct);
     },
@@ -152,6 +149,7 @@ export default {
         }
       };
     },
+
   },
 
   watch: {
@@ -168,6 +166,8 @@ export default {
     window.addEventListener('resize', this.debouncedLayoutHeader);
 
     this.$nextTick(() => this.layoutHeader(null, true));
+
+    this.navHeaderRight = this.$plugin?.getDynamic('component', 'NavHeaderRight');
   },
 
   beforeDestroy() {
@@ -329,7 +329,8 @@ export default {
     <div class="spacer"></div>
 
     <div class="rd-header-right">
-      <HarvesterUpgrade v-if="isVirtualCluster && currentProduct.name === VIRTUAL" />
+      <component :is="navHeaderRight" />
+
       <div
         v-if="(currentCluster || (currentProduct && currentProduct.customNamespaceFilter)) && !simple && (currentProduct.showNamespaceFilter || currentProduct.showWorkspaceSwitcher)"
         class="top"
@@ -457,7 +458,6 @@ export default {
       </div>
 
       <div class="header-spacer"></div>
-
       <div
         v-if="showUserMenu"
         class="user user-menu"

package/components/nav/NamespaceFilter.vue

@@ -1,10 +1,9 @@
 <script>
 import { mapGetters } from 'vuex';
-import { NAMESPACE_FILTERS, DEV } from '@shell/store/prefs';
+import { NAMESPACE_FILTERS, ALL_NAMESPACES } from '@shell/store/prefs';
 import { NAMESPACE, MANAGEMENT } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { isArray, addObjects, findBy, filterBy } from '@shell/utils/array';
-
 import {
   NAMESPACE_FILTER_SPECIAL as SPECIAL,
   NAMESPACE_FILTER_ALL_USER as ALL_USER,
@@ -29,7 +28,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['isVirtualCluster', 'isMultiVirtualCluster', 'currentProduct']),
+    ...mapGetters(['currentProduct']),
 
     hasFilter() {
       return this.filter.length > 0;
@@ -97,7 +96,7 @@ export default {
         });
       }
 
-      if (!this.isVirtualCluster) {
+      if (!this.currentProduct?.hideSystemResources) {
         out = [
           {
             id:    ALL,
@@ -137,12 +136,16 @@ export default {
 
       namespaces = this.filterNamespaces(namespaces);
 
-      if (this.$store.getters['isRancher'] || this.isMultiVirtualCluster) {
+      // isRancher = mgmt schemas are loaded and there's a project schema
+      if (this.$store.getters['isRancher']) {
         const cluster = this.$store.getters['currentCluster'];
         let projects = this.$store.getters['management/all'](
           MANAGEMENT.PROJECT
         );
 
+        projects = projects.filter((p) => {
+          return this.currentProduct?.hideSystemResources ? !p.isSystem && p.spec.clusterName === cluster.id : p.spec.clusterName === cluster.id;
+        });
         projects = sortBy(filterBy(projects, 'spec.clusterName', cluster.id), [
           'nameDisplay',
         ]);
@@ -319,8 +322,8 @@ export default {
 
   methods: {
     filterNamespaces(namespaces) {
-      if (this.$store.getters['prefs/get'](DEV)) {
-        // If developer tools are turned on in the user preferences,
+      if (this.$store.getters['prefs/get'](ALL_NAMESPACES)) {
+        // If all namespaces options are turned on in the user preferences,
         // return all namespaces including system namespaces and RBAC
         // management namespaces.
         return namespaces;

package/components/nav/TopLevelMenu.vue

@@ -4,7 +4,7 @@ import ClusterProviderIcon from '@shell/components/ClusterProviderIcon';
 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';
@@ -46,7 +46,6 @@ export default {
     ...mapGetters(['clusterId']),
     ...mapGetters(['clusterReady', 'isRancher', 'currentCluster', 'currentProduct']),
     ...mapGetters('type-map', ['activeProducts']),
-    ...mapGetters('i18n', ['selectedLocaleLabel', 'availableLocales']),
     ...mapGetters({ features: 'features/get' }),
 
     value: {
@@ -66,9 +65,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;
 
@@ -82,10 +82,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,
@@ -99,23 +101,13 @@ 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),
 
-    showLocale() {
-      return Object.keys(this.availableLocales).length > 1 || this.dev;
-    },
-
-    showNone() {
-      return !!process.env.dev && this.dev;
-    },
-
     multiClusterApps() {
       const options = this.options;
 
@@ -131,27 +123,12 @@ 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() {
       const cluster = this.clusterId || this.$store.getters['defaultClusterId'];
-
+      // TODO plugin routes
       const entries = this.activeProducts.map((p) => {
         // Try product-specific index first
         const to = p.to || {
@@ -192,7 +169,7 @@ export default {
   watch: {
     $route() {
       this.shown = false;
-    },
+    }
   },
 
   mounted() {
@@ -232,10 +209,6 @@ export default {
         this.setClusterListHeight(this.maxClustersToShow);
       });
     },
-
-    switchLocale(locale) {
-      this.$store.dispatch('i18n/switchTo', locale);
-    },
   }
 };
 </script>
@@ -359,34 +332,6 @@ export default {
               v-html="displayVersion"
             />
           </div>
-          <div v-if="showLocale">
-            <v-popover
-              popover-class="localeSelector"
-              placement="top"
-              trigger="click"
-            >
-              <a
-                data-testid="locale-selector"
-                class="locale-chooser"
-              >
-                {{ selectedLocaleLabel }}
-              </a>
-
-              <template slot="popover">
-                <ul class="list-unstyled dropdown" style="margin: -1px;">
-                  <li v-if="showNone" v-t="'locale.none'" class="hand" @click="switchLocale('none')" />
-                  <li
-                    v-for="(label, name) in availableLocales"
-                    :key="name"
-                    class="hand"
-                    @click="switchLocale(name)"
-                  >
-                    {{ label }}
-                  </li>
-                </ul>
-              </template>
-            </v-popover>
-          </div>
         </div>
       </div>
     </transition>

package/components/nav/WindowManager/ContainerLogs.vue

@@ -13,7 +13,7 @@ import Select from '@shell/components/form/Select';
 import day from 'dayjs';
 
 import { escapeHtml, escapeRegex } from '@shell/utils/string';
-import { NAME as VIRTUAL } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as VIRTUAL } from '@shell/config/product/harvester-manager';
 
 import Socket, {
   EVENT_CONNECTED,

package/config/footer.js

@@ -1,19 +1,18 @@
 import { DOCS_BASE } from '@shell/config/private-label';
 
-export function options(issues, hideRancher) {
-  if (!issues) {
-    if (hideRancher) {
-      return { };
-    }
-    issues = 'https://github.com/rancher/dashboard/issues/new';
-  } else if (hideRancher) {
-    return { 'footer.issue': issues };
+// Deprecated
+export function options(isSupport, issuesUrl) {
+  const links = {
+    docs:        DOCS_BASE,
+    forums:     'https://forums.rancher.com/',
+    slack:      'https://slack.rancher.io',
+    issues:     !!issuesUrl ? issuesUrl : 'https://github.com/rancher/dashboard/issues/new',
+    getStarted: '/docs/getting-started'
+  };
+
+  if (!isSupport) {
+    links['commercialSupport'] = '/support';
   }
 
-  return {
-    'footer.docs':    DOCS_BASE,
-    'footer.forums': 'https://forums.rancher.com/',
-    'footer.slack':  'https://slack.rancher.io',
-    'footer.issue':  issues,
-  };
+  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 = {