@rancher/shell 1.2.3 → 2.0.1

package/pages/auth/verify.vue

@@ -17,24 +17,29 @@ function reply(err, code) {
   }
 }
 
-export default {
-  layout: 'unauthenticated',
+function isSaml($route) {
+  const { query } = $route;
+  const configQuery = get(query, 'config');
+
+  return samlProviders.includes(configQuery);
+}
 
-  async fetch({ store, route, redirect }) {
-    const code = route.query[GITHUB_CODE];
-    const stateStr = route.query[GITHUB_NONCE];
+export default {
+  async fetch() {
+    const code = this.$route.query[GITHUB_CODE];
+    const stateStr = this.$route.query[GITHUB_NONCE];
     const {
       error, error_description: errorDescription, errorCode, errorMsg
-    } = route.query;
+    } = this.$route.query;
 
     if (error || errorDescription || errorCode || errorMsg) {
       let out = errorDescription || error || errorCode;
 
       if (errorMsg) {
-        out = store.getters['i18n/withFallback'](`login.serverError.${ errorMsg }`, null, errorMsg);
+        out = this.$store.getters['i18n/withFallback'](`login.serverError.${ errorMsg }`, null, errorMsg);
       }
 
-      redirect(`/auth/login?err=${ escape(out) }`);
+      this.$router.replace(`/auth/login?err=${ escape(out) }`);
 
       return;
     }
@@ -43,11 +48,16 @@ export default {
     try {
       parsed = JSON.parse(base64Decode((stateStr)));
     } catch (err) {
-      const out = store.getters['i18n/t'](`login.error`);
+      if (isSaml(this.$route)) {
+        // This is an ok failure. SAML has no state string so a failure is fine (see similar check in mounted).
+        // This whole file could be re-written with that in mind, but this change keeps things simple and fixes a breaking addition
+        return;
+      }
+      const out = this.$store.getters['i18n/t'](`login.error`);
 
-      console.error('Failed to parse nonce'); // eslint-disable-line no-console
+      console.error('Failed to parse nonce', stateStr, err); // eslint-disable-line no-console
 
-      redirect(`/auth/login?err=${ escape(out) }`);
+      this.$router.replace(`/auth/login?err=${ escape(out) }`);
 
       return;
     }
@@ -59,28 +69,28 @@ export default {
     }
 
     try {
-      const res = await store.dispatch('auth/verifyOAuth', {
+      const res = await this.$store.dispatch('auth/verifyOAuth', {
         code,
         nonce,
         provider
       });
 
       if ( res._status === 200) {
-        const backTo = route.query[BACK_TO] || '/';
+        const backTo = this.$route.query[BACK_TO] || '/';
 
         // Load plugins
         await loadPlugins({
-          app:     store.app,
-          store,
-          $plugin: store.$plugin
+          app:     this.$store.app,
+          store:   this.$store,
+          $plugin: this.$store.$plugin
         });
 
-        redirect(backTo);
+        this.$router.replace(backTo);
       } else {
-        redirect(`/auth/login?err=${ escape(res) }`);
+        this.$router.replace(`/auth/login?err=${ escape(res) }`);
       }
     } catch (err) {
-      redirect(`/auth/login?err=${ escape(err) }`);
+      this.$router.replace(`/auth/login?err=${ escape(err) }`);
     }
   },
 
@@ -117,12 +127,8 @@ export default {
         window.close();
       }
     } else {
-      const { query } = this.$route;
-
       if ( window.opener ) {
-        const configQuery = get(query, 'config');
-
-        if ( samlProviders.includes(configQuery) ) {
+        if (isSaml(this.$route)) {
           if ( window.opener.window.onAuthTest ) {
             reply(null, null);
           } else {

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/chart.vue

@@ -7,9 +7,11 @@ import LazyImage from '@shell/components/LazyImage';
 import DateFormatter from '@shell/components/formatter/Date';
 import isEqual from 'lodash/isEqual';
 import { CHART, REPO, REPO_TYPE, VERSION } from '@shell/config/query-params';
+import { ZERO_TIME } from '@shell/config/types';
 import { mapGetters } from 'vuex';
 import { compatibleVersionsFor } from '@shell/store/catalog';
 import TypeDescription from '@shell/components/TypeDescription';
+
 export default {
   components: {
     Banner,
@@ -30,6 +32,7 @@ export default {
 
   data() {
     return {
+      ZERO_TIME,
       showLastVersions: 10,
       showMoreVersions: false,
     };
@@ -51,8 +54,18 @@ export default {
       return this.isChartTargeted ? this.t('catalog.chart.errors.clusterToolExists', { url }, true) : '';
     },
 
+    appVersion() {
+      return this.version.appVersion || this.versionInfo?.chart?.appVersion;
+    },
+
+    home() {
+      return this.version.home || this.versionInfo?.chart?.home;
+    },
+
     maintainers() {
-      return this.version.maintainers.map((m) => {
+      const maintainers = this.version.maintainers || this.versionInfo?.chart?.maintainers || [];
+
+      return maintainers.map((m) => {
         return {
           id:   m.name,
           text: m.name,
@@ -79,6 +92,23 @@ export default {
       }
 
       return false;
+    },
+
+    warningMessage() {
+      const {
+        deprecated, experimental, chartName: name, chartNameDisplay
+      } = this.chart;
+      const chartName = chartNameDisplay || name;
+
+      if (deprecated && experimental) {
+        return this.t('catalog.chart.deprecatedAndExperimentalWarning', { chartName });
+      } else if (deprecated) {
+        return this.t('catalog.chart.deprecatedWarning', { chartName });
+      } else if (experimental) {
+        return this.t('catalog.chart.experimentalWarning', { chartName });
+      }
+
+      return '';
     }
 
   },
@@ -116,10 +146,21 @@ export default {
   <Loading v-if="$fetchState.pending" />
   <div v-else>
     <TypeDescription resource="chart" />
+    <Banner
+      v-if="versionInfoError"
+      color="error"
+      :label="versionInfoError"
+    />
     <div
       v-if="chart"
       class="chart-header"
     >
+      <Banner
+        v-if="warningMessage"
+        color="warning"
+        :label="warningMessage"
+        data-testid="deprecation-and-experimental-banner"
+      />
       <div class="name-logo-install">
         <div class="name-logo">
           <div class="logo-bg">
@@ -129,9 +170,9 @@ export default {
             />
           </div>
           <h1>
-            <nuxt-link :to="{ name: 'c-cluster-apps-charts' }">
+            <router-link :to="{ name: 'c-cluster-apps-charts' }">
               {{ t('catalog.chart.header.charts') }}:
-            </nuxt-link>
+            </router-link>
             {{ chart.chartNameDisplay }} ({{ targetVersion }})
           </h1>
         </div>
@@ -230,6 +271,7 @@ export default {
               {{ vers.originalVersion === currentVersion ? t('catalog.install.versions.current', { ver: currentVersion }): vers.shortLabel }}
             </a>
             <DateFormatter
+              v-if="vers.created !== ZERO_TIME"
               :value="vers.created"
               :show-time="false"
             />
@@ -245,25 +287,28 @@ export default {
             </button>
           </div>
         </div>
-        <div class="chart-content__right-bar__section">
+        <div
+          v-if="appVersion"
+          class="chart-content__right-bar__section"
+        >
           <h3 t>
             {{ t('catalog.chart.info.appVersion') }}
           </h3>
-          {{ version.appVersion }}
+          {{ appVersion }}
         </div>
         <div
-          v-if="version.home"
+          v-if="home"
           class="chart-content__right-bar__section"
         >
           <h3>{{ t('catalog.chart.info.home') }}</h3>
           <a
-            :href="version.home"
+            :href="home"
             rel="nofollow noopener noreferrer"
             target="_blank"
-          >{{ version.home }}</a>
+          >{{ home }}</a>
         </div>
         <div
-          v-if="version.maintainers"
+          v-if="maintainers.length"
           class="chart-content__right-bar__section"
         >
           <h3>{{ t('catalog.chart.info.maintainers') }}</h3>