@rancher/shell 0.3.26 → 0.3.28

package/pages/auth/setup.vue

@@ -18,6 +18,10 @@ import Password from '@shell/components/form/Password';
 import { applyProducts } from '@shell/store/type-map';
 import BrandImage from '@shell/components/BrandImage';
 import { waitFor } from '@shell/utils/async';
+import { Banner } from '@components/Banner';
+import FormValidation from '@shell/mixins/form-validation';
+import isUrl from 'is-url';
+import { isLocalhost } from '@shell/utils/validators/setting';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -36,11 +40,18 @@ const calcMustChangePassword = async(store) => {
 export default {
   layout: 'unauthenticated',
 
+  mixins: [FormValidation],
+
   data() {
     return {
       passwordOptions: [
         { label: this.t('setup.useRandom'), value: true },
         { label: this.t('setup.useManual'), value: false }],
+      fvFormRuleSets: [{
+        path:       'serverUrl',
+        rootObject: this,
+        rules:      ['required', 'https', 'url', 'trailingForwardSlash']
+      }]
     };
   },
 
@@ -78,7 +89,7 @@ export default {
   },
 
   components: {
-    AsyncButton, LabeledInput, CopyToClipboard, Checkbox, RadioGroup, Password, BrandImage
+    AsyncButton, LabeledInput, CopyToClipboard, Checkbox, RadioGroup, Password, BrandImage, Banner
   },
 
   async asyncData({ route, req, store }) {
@@ -191,6 +202,10 @@ export default {
         }
       }
 
+      if (!isUrl(this.serverUrl) || this.fvGetPathErrors(['serverUrl']).length > 0) {
+        return false;
+      }
+
       return true;
     },
 
@@ -198,6 +213,10 @@ export default {
       const out = findBy(this.principals, 'me', true);
 
       return out;
+    },
+
+    showLocalhostWarning() {
+      return isLocalhost(this.serverUrl);
     }
   },
 
@@ -265,6 +284,10 @@ export default {
     done() {
       this.$router.replace('/');
     },
+
+    onServerUrlChange(value) {
+      this.serverUrl = value.trim();
+    },
   },
 };
 </script>
@@ -368,10 +391,24 @@ export default {
                 />
               </p>
               <div class="mt-20">
+                <Banner
+                  v-if="showLocalhostWarning"
+                  color="warning"
+                  :label="t('validation.setting.serverUrl.localhost')"
+                />
+                <Banner
+                  v-for="(err, i) in fvGetPathErrors(['serverUrl'])"
+                  :key="i"
+                  color="error"
+                  :label="err"
+                />
                 <LabeledInput
                   v-model="serverUrl"
                   :label="t('setup.serverUrl.label')"
                   data-testid="setup-server-url"
+                  :rules="fvGetAndReportPathRules('serverUrl')"
+                  :required="true"
+                  @input="onServerUrlChange"
                 />
               </div>
             </template>

package/pages/c/_cluster/apps/charts/__tests__/install.helper.test.ts

@@ -2,30 +2,15 @@ import { ignoreVariables } from '@shell/pages/c/_cluster/apps/charts/install.hel
 
 describe('fX: ignoreVariables', () => {
   describe.each([['epinio', 'global.rbac.pspEnabled']])('given chart %p with path %p', (name, path) => {
-    it.each([
-      ['v1.24.11+rke2r1'],
-    ])('should not return variable path list if cluster has k8s version %p', (version) => {
-      const cluster = { kubernetesVersion: version };
-      const data = {
-        chart:  { name },
-        values: { global: { rbac: { pspEnabled: undefined } } }
-      };
-
-      const paths = ignoreVariables(cluster, data);
-
-      expect(paths).toStrictEqual([]);
-    });
-
     it.each([
       ['v1.25.11+rke2r1'],
-    ])('should return questions if cluster has k8s version %p', (version) => {
-      const cluster = { kubernetesVersion: version };
+    ])('should return questions', () => {
       const data = {
         chart:  { name },
         values: { global: { rbac: { pspEnabled: undefined } } }
       };
 
-      const paths = ignoreVariables(cluster, data);
+      const paths = ignoreVariables(data);
 
       expect(paths).toStrictEqual([path]);
     });

package/pages/c/_cluster/apps/charts/index.vue

@@ -54,7 +54,6 @@ export default {
       searchQuery:     null,
       showDeprecated:  null,
       showHidden:      null,
-      isPspLegacy:     false,
       chartOptions:    [
         {
           label: 'Browse',
@@ -241,14 +240,6 @@ export default {
     }
   },
 
-  created() {
-    const release = this.currentCluster?.status?.version?.gitVersion || '';
-    const isRKE2 = release.includes('rke2');
-    const version = release.match(/\d+/g);
-
-    this.isPspLegacy = version?.length ? isRKE2 && (+version[0] === 1 && +version[1] < 25) : false;
-  },
-
   methods: {
     colorForChart(chart) {
       const repos = this.repoOptions;
@@ -377,12 +368,6 @@ export default {
       />
     </div>
 
-    <Banner
-      v-if="isPspLegacy"
-      color="warning"
-      :label="t('catalog.chart.banner.legacy')"
-    />
-
     <TypeDescription resource="chart" />
     <div class="left-right-split">
       <Select

package/pages/c/_cluster/apps/charts/install.helpers.js

@@ -1,7 +1,7 @@
 /**
  * Return list of variables to filter chart questions
  */
-export const ignoreVariables = (cluster, data) => {
+export const ignoreVariables = (data) => {
   const pspChartMap = {
     epinio:                     'global.rbac.pspEnabled',
     longhorn:                   'enablePSP',
@@ -11,16 +11,5 @@ export const ignoreVariables = (cluster, data) => {
   };
   const path = pspChartMap[data.chart.name];
 
-  if (path) {
-    const clusterVersion = cluster?.kubernetesVersion || '';
-    const version = clusterVersion.match(/\d+/g);
-    const isRequiredVersion = version?.length ? +version[0] === 1 && +version[1] < 25 : false;
-
-    // Provide path as question variable to be ignored
-    if (!isRequiredVersion) {
-      return [path];
-    }
-  }
-
-  return [];
+  return [path];
 };

package/pages/c/_cluster/apps/charts/install.vue

@@ -473,7 +473,7 @@ export default {
      * Return list of variables to filter chart questions
      */
     ignoreVariables() {
-      return ignoreVariables(this.currentCluster, this.versionInfo);
+      return ignoreVariables(this.versionInfo);
     },
 
     namespaceIsNew() {

package/pages/c/_cluster/auth/roles/index.vue

@@ -1,4 +1,5 @@
 <script>
+import { mapGetters } from 'vuex';
 import Tab from '@shell/components/Tabbed/Tab';
 import Tabbed from '@shell/components/Tabbed';
 import { MANAGEMENT } from '@shell/config/types';
@@ -7,6 +8,7 @@ import Loading from '@shell/components/Loading';
 import { SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import { NAME } from '@shell/config/product/auth';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { Banner } from '@components/Banner';
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 const CLUSTER = SUBTYPE_MAPPING.CLUSTER.key;
@@ -31,7 +33,7 @@ export default {
   name: 'Roles',
 
   components: {
-    Tab, Tabbed, ResourceTable, Loading
+    Tab, Tabbed, ResourceTable, Loading, Banner
   },
 
   async asyncData({ store }) {
@@ -100,6 +102,8 @@ export default {
   },
 
   computed: {
+    ...mapGetters(['releaseNotesUrl']),
+
     globalResources() {
       return this.globalRoles;
     },
@@ -181,6 +185,12 @@ export default {
         :weight="tabs[GLOBAL].weight"
         :label-key="tabs[GLOBAL].labelKey"
       >
+        <Banner
+          color="warning"
+          class="mb-20"
+        >
+          <span v-clean-html="t('rbac.globalRoles.role.restricted-admin.deprecation', { releaseNotesUrl }, true)" />
+        </Banner>
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"

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

@@ -15,7 +15,6 @@ import {
   WORKLOAD_TYPES,
   COUNT,
   CATALOG,
-  PSP,
 } from '@shell/config/types';
 import { setPromiseResult } from '@shell/utils/promise';
 import AlertTable from '@shell/components/AlertTable';
@@ -27,8 +26,7 @@ import {
   STATE,
 } from '@shell/config/table-headers';
 
-import { mapPref, PSP_DEPRECATION_BANNER } from '@shell/store/prefs';
-import { haveV1Monitoring, monitoringStatus } from '@shell/utils/monitoring';
+import { haveV1Monitoring, monitoringStatus, canViewGrafanaLink } from '@shell/utils/monitoring';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import { allDashboardsExist } from '@shell/utils/grafana';
@@ -103,6 +101,10 @@ export default {
         `Determine etcd metrics`
       );
 
+      // It's not enough to check that the grafana links are working for the current user; embedded cluster-level dashboards should only be shown if the user can view the grafana endpoint
+      // https://github.com/rancher/dashboard/issues/9792
+      setPromiseResult(canViewGrafanaLink(this.$store), this, 'canViewMetrics', 'Determine Grafana Permission');
+
       if (this.currentCluster.isLocal && this.$store.getters['management/schemaFor'](MANAGEMENT.NODE)) {
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
       }
@@ -125,6 +127,7 @@ export default {
       showClusterMetrics: false,
       showK8sMetrics:     false,
       showEtcdMetrics:    false,
+      canViewMetrics:     false,
       CLUSTER_METRICS_DETAIL_URL,
       CLUSTER_METRICS_SUMMARY_URL,
       K8S_METRICS_DETAIL_URL,
@@ -151,20 +154,6 @@ export default {
     ...mapGetters(['currentCluster']),
     ...monitoringStatus(),
 
-    displayPspDeprecationBanner() {
-      const cluster = this.currentCluster;
-      const major = cluster.status?.version?.major ? parseInt(cluster.status?.version?.major) : 0;
-      const minor = cluster.status?.version?.minor ? parseInt(cluster.status?.version?.minor) : 0;
-
-      if (major === 1 && minor >= 21 && minor < 25) {
-        const clusterCounts = this.$store.getters[`cluster/all`](COUNT)?.[0]?.counts;
-
-        return !!clusterCounts?.[PSP]?.summary?.count;
-      }
-
-      return false;
-    },
-
     nodes() {
       return this.$store.getters['cluster/all'](NODE);
     },
@@ -173,8 +162,6 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
     },
 
-    hidePspDeprecationBanner: mapPref(PSP_DEPRECATION_BANNER),
-
     hasV1Monitoring() {
       return haveV1Monitoring(this.$store.getters);
     },
@@ -346,7 +333,7 @@ export default {
     },
 
     hasMetricsTabs() {
-      return this.showClusterMetrics || this.showK8sMetrics || this.showEtcdMetrics;
+      return this.canViewMetrics && ( this.showClusterMetrics || this.showK8sMetrics || this.showEtcdMetrics);
     },
 
     hasBadge() {
@@ -429,17 +416,6 @@ export default {
         </div>
       </div>
     </header>
-    <Banner
-      v-if="displayPspDeprecationBanner && !hidePspDeprecationBanner"
-      :closable="true"
-      color="warning"
-      @close="hidePspDeprecationBanner = true"
-    >
-      <t
-        k="landing.deprecatedPsp"
-        :raw="true"
-      />
-    </Banner>
     <div
       class="cluster-dashboard-glance"
     >
@@ -473,14 +449,6 @@ export default {
           :show-tooltip="true"
         /></span>
       </div>
-      <p
-        v-if="displayPspDeprecationBanner && hidePspDeprecationBanner"
-        v-clean-tooltip="t('landing.deprecatedPsp')"
-        class="alt-psp-deprecation-info"
-      >
-        <span>{{ t('landing.psps') }}</span>
-        <i class="icon icon-warning" />
-      </p>
       <div :style="{'flex':1}" />
       <div v-if="!monitoringStatus.v2 && !monitoringStatus.v1">
         <n-link
@@ -729,16 +697,6 @@ export default {
   margin-top: 0;
 }
 
-.alt-psp-deprecation-info {
-  display: flex;
-  align-items: center;
-  color: var(--warning);
-
-  span {
-    margin-right: 4px;
-  }
-}
-
 .monitoring-install {
   display: flex;
   margin-left: 10px;

package/pages/c/_cluster/manager/pages/_page.vue

@@ -7,11 +7,10 @@ export default {
   data() {
     return {
       PAGES: {
-        'rke-drivers':           '/n/drivers/cluster',
-        'rke-templates':         '/g/rke-templates/index',
-        'cloud-credentials':     '/g/security/cloud-credentials',
-        'node-templates':        '/n/node-templates',
-        'pod-security-policies': '/g/security/policies',
+        'rke-drivers':       '/n/drivers/cluster',
+        'rke-templates':     '/g/rke-templates/index',
+        'cloud-credentials': '/g/security/cloud-credentials',
+        'node-templates':    '/n/node-templates',
       }
     };
   }

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

@@ -4,16 +4,14 @@ import isEmpty from 'lodash/isEmpty';
 import InstallRedirect from '@shell/utils/install-redirect';
 import AlertTable from '@shell/components/AlertTable';
 import { NAME, CHART_NAME } from '@shell/config/product/monitoring';
-import { CATALOG, ENDPOINTS, MONITORING } from '@shell/config/types';
+import { CATALOG, MONITORING } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { findBy } from '@shell/utils/array';
 import { getClusterPrefix } from '@shell/utils/grafana';
 import { Banner } from '@components/Banner';
 import LazyImage from '@shell/components/LazyImage';
 import SimpleBox from '@shell/components/SimpleBox';
-import { haveV1MonitoringWorkloads } from '@shell/utils/monitoring';
-
-const CATTLE_MONITORING_NAMESPACE = 'cattle-monitoring-system';
+import { haveV1MonitoringWorkloads, canViewAlertManagerLink, canViewGrafanaLink, canViewPrometheusLink } from '@shell/utils/monitoring';
 
 export default {
   components: {
@@ -96,52 +94,41 @@ export default {
       const { $store, externalLinks } = this;
 
       this.v1Installed = await haveV1MonitoringWorkloads($store);
-      const hash = await allHash({
-        apps:      $store.dispatch('cluster/findAll', { type: CATALOG.APP }),
-        endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }),
-      });
+      const hash = {};
+
+      if ($store.getters['cluster/canList'](CATALOG.APP)) {
+        hash.apps = $store.dispatch('cluster/findAll', { type: CATALOG.APP });
+      }
+      const res = await allHash(hash);
+
+      const canViewAlertManager = await canViewAlertManagerLink(this.$store);
+      const canViewGrafana = await canViewGrafanaLink(this.$store);
+      const canViewPrometheus = await canViewPrometheusLink(this.$store);
 
-      if (!isEmpty(hash.endpoints)) {
+      if (canViewAlertManager) {
         const amMatch = findBy(externalLinks, 'group', 'alertmanager');
-        const grafanaMatch = findBy(externalLinks, 'group', 'grafana');
-        const promeMatch = externalLinks.filter(
-          (el) => el.group === 'prometheus'
-        );
 
+        amMatch.enabled = true;
+      }
+      if (canViewGrafana) {
+        const grafanaMatch = findBy(externalLinks, 'group', 'grafana');
         // Generate Grafana link
         const currentCluster = this.$store.getters['currentCluster'];
-        const rancherMonitoring = !isEmpty(hash.apps) ? findBy(hash.apps, 'id', 'cattle-monitoring-system/rancher-monitoring') : '';
+        const rancherMonitoring = !isEmpty(res.apps) ? findBy(res.apps, 'id', 'cattle-monitoring-system/rancher-monitoring') : '';
         const clusterPrefix = getClusterPrefix(rancherMonitoring?.currentVersion || '', currentCluster.id);
 
         grafanaMatch.link = `${ clusterPrefix }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
+        grafanaMatch.enabled = true;
+      }
 
-        const alertmanager = findBy(
-          hash.endpoints,
-          'id',
-          `${ CATTLE_MONITORING_NAMESPACE }/rancher-monitoring-alertmanager`
-        );
-        const grafana = findBy(
-          hash.endpoints,
-          'id',
-          `${ CATTLE_MONITORING_NAMESPACE }/rancher-monitoring-grafana`
-        );
-        const prometheus = findBy(
-          hash.endpoints,
-          'id',
-          `${ CATTLE_MONITORING_NAMESPACE }/rancher-monitoring-prometheus`
+      if (canViewPrometheus) {
+        const promeMatch = externalLinks.filter(
+          (el) => el.group === 'prometheus'
         );
 
-        if (!isEmpty(alertmanager) && !isEmpty(alertmanager.subsets)) {
-          amMatch.enabled = true;
-        }
-        if (!isEmpty(grafana) && !isEmpty(grafana.subsets)) {
-          grafanaMatch.enabled = true;
-        }
-        if (!isEmpty(prometheus) && !isEmpty(prometheus.subsets)) {
-          promeMatch.forEach((match) => {
-            match.enabled = true;
-          });
-        }
+        promeMatch.forEach((match) => {
+          match.enabled = true;
+        });
       }
     },
   },

package/pages/support/index.vue

@@ -8,7 +8,6 @@ import { SETTING } from '@shell/config/settings';
 import { addParam } from '@shell/utils/url';
 import { isRancherPrime } from '@shell/config/version';
 import { hasCspAdapter } from 'mixins/brand';
-import { generateSupportLink } from '@shell/utils/version';
 
 export default {
   layout: 'home',
@@ -112,12 +111,6 @@ 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);
     }
   },
 
@@ -139,7 +132,7 @@ export default {
               <div class="support-link">
                 <a
                   class="support-link"
-                  :href="supportLink"
+                  href="https://www.rancher.com/support"
                   target="_blank"
                   rel="noopener noreferrer nofollow"
                 >{{ t('support.community.learnMore') }}</a>

package/promptRemove/management.cattle.io.project.vue

@@ -71,12 +71,9 @@ export default {
     names() {
       return this.filteredNamespaces.map((obj) => obj.nameDisplay).slice(0, 5);
     },
-
-    canManageNamespaces() {
-      // Only admins and cluster owners can see namespaces outside of projects
-      // BUT cluster members can also manage projects and namespaces and may want to not delete the namespaces associated with the project
-      // as per https://github.com/rancher/dashboard/issues/9517 despite the namespaces cannot be seen afterwards (projectless)
-      return this.currentCluster.canUpdate || (this.currentProject.canDelete && this.filteredNamespaces.length && this.filteredNamespaces[0]?.canDelete);
+    // Only admins and cluster owners can see namespaces outside of projects
+    canSeeProjectlessNamespaces() {
+      return this.currentCluster.canUpdate;
     }
   },
   methods: {
@@ -84,7 +81,7 @@ export default {
     remove() {
       // Delete all of thre namespaces and return false - this tells the prompt remove dialog to continue and delete the project
       // Delete all namespaces if the user wouldn't be able to see them after deleting the project
-      if (this.deleteProjectNamespaces || !this.canManageNamespaces) {
+      if (this.deleteProjectNamespaces || !this.canSeeProjectlessNamespaces) {
         return Promise.all(this.filteredNamespaces.map((n) => n.remove())).then(() => false);
       }
 
@@ -100,7 +97,7 @@ export default {
     <div>
       <div class="mb-10">
         {{ t('promptRemove.attemptingToRemove', { type }) }} <span class="display-name">{{ `${displayName}.` }}</span>
-        <template v-if="!canManageNamespaces">
+        <template v-if="!canSeeProjectlessNamespaces">
           <span class="delete-warning"> {{ t('promptRemove.willDeleteAssociatedNamespaces') }}</span> <br>
           <div
             v-clean-html="resourceNames(names, plusMore, t)"
@@ -109,7 +106,7 @@ export default {
         </template>
       </div>
       <div
-        v-if="filteredNamespaces.length > 0 && canManageNamespaces"
+        v-if="filteredNamespaces.length > 0 && canSeeProjectlessNamespaces"
         class="mt-20 remove-project-dialog"
       >
         <Checkbox

package/rancher-components/BadgeState/BadgeState.vue

@@ -60,11 +60,7 @@ export default Vue.extend({
 
 <template>
   <span :class="{'badge-state': true, [bg]: true}">
-    <i
-      v-if="icon"
-      class="icon"
-      :class="{[icon]: true, 'mr-5': !!msg}"
-    />{{ msg }}
+    <i v-if="icon" class="icon" :class="{[icon]: true, 'mr-5': !!msg}" />{{ msg }}
   </span>
 </template>
 

package/rancher-components/Banner/Banner.test.ts

@@ -1,63 +1,13 @@
 import { mount } from '@vue/test-utils';
 import { Banner } from './index';
-import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 
 describe('component: Banner', () => {
   it('should display text based on label', () => {
     const label = 'test';
-    const wrapper = mount(
-      Banner,
-      {
-        directives: { cleanHtmlDirective },
-        propsData:  { label }
-      });
+    const wrapper = mount(Banner, { propsData: { label } });
 
     const element = wrapper.find('span').element;
 
     expect(element.textContent).toBe(label);
   });
-
-  it('should display an icon', () => {
-    const icon = 'my-icon';
-    const wrapper = mount(Banner, { propsData: { icon } });
-
-    const element = wrapper.find(`.${ icon }`).element;
-
-    expect(element.classList).toContain(icon);
-  });
-
-  it('should not display an icon', () => {
-    const wrapper = mount(Banner);
-
-    const element = wrapper.find(`[data-testid="banner-icon"]`).element;
-
-    expect(element).not.toBeDefined();
-  });
-
-  it('should emit close event', () => {
-    const wrapper = mount(Banner, { propsData: { closable: true } });
-    const element = wrapper.find(`[data-testid="banner-close"]`).element;
-
-    element.click();
-
-    expect(wrapper.emitted('close')).toHaveLength(1);
-  });
-
-  it('should add the right color', () => {
-    const color = 'red';
-    const wrapper = mount(Banner, { propsData: { color } });
-
-    const element = wrapper.element;
-
-    expect(element.classList).toContain(color);
-  });
-
-  it('should stack the banner messages', () => {
-    const stacked = true;
-    const wrapper = mount(Banner, { propsData: { stacked } });
-
-    const element = wrapper.find(`[data-testid="banner-content"]`).element;
-
-    expect(element.classList).toContain('stacked');
-  });
 });