@rancher/shell 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -32,125 +32,124 @@
     "e2e:dev": "start-server-and-test dev https://localhost:8005 cy:open"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.1.0",
-    "@aws-sdk/client-eks": "^3.1.0",
-    "@aws-sdk/client-kms": "^3.8.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-    "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-    "@babel/preset-typescript": "^7.15.0",
-    "@innologica/vue-dropdown-menu": "^0.1.3",
-    "@novnc/novnc": "^1.2.0",
+    "@aws-sdk/client-ec2": "3.1.0",
+    "@aws-sdk/client-eks": "3.1.0",
+    "@aws-sdk/client-kms": "3.8.1",
+    "@babel/plugin-proposal-optional-chaining": "7.14.5",
+    "@babel/plugin-proposal-private-property-in-object": "7.14.5",
+    "@babel/preset-typescript": "7.16.7",
+    "@innologica/vue-dropdown-menu": "0.1.3",
+    "@novnc/novnc": "1.2.0",
     "@nuxt/types": "2.14.6",
-    "@nuxt/typescript-build": "^2.1.0",
-    "@nuxtjs/axios": "^5.3.6",
-    "@nuxtjs/eslint-config-typescript": "^6.0.1",
-    "@nuxtjs/eslint-module": "^1.1.0",
-    "@nuxtjs/proxy": "^1.3.3",
-    "@nuxtjs/style-resources": "^1.2.1",
-    "@nuxtjs/webpack-profile": "^0.1.0",
-    "@popperjs/core": "^2.4.0",
-    "@types/node": "^16.4.3",
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
-    "@vue/cli-plugin-babel": "^4.5.15",
-    "@vue/cli-plugin-typescript": "^4.5.15",
-    "@vue/cli-service": "^4.5.13",
+    "@nuxt/typescript-build": "2.1.0",
+    "@nuxtjs/axios": "5.12.0",
+    "@nuxtjs/eslint-config-typescript": "6.0.1",
+    "@nuxtjs/eslint-module": "1.2.0",
+    "@nuxtjs/proxy": "1.3.3",
+    "@nuxtjs/style-resources": "1.2.1",
+    "@nuxtjs/webpack-profile": "0.1.0",
+    "@popperjs/core": "2.4.4",
+    "@types/node": "16.4.3",
+    "@typescript-eslint/eslint-plugin": "4.33.0",
+    "@typescript-eslint/parser": "4.33.0",
+    "@vue/cli-plugin-babel": "4.5.15",
+    "@vue/cli-plugin-typescript": "4.5.15",
+    "@vue/cli-service": "4.5.15",
     "@vue/test-utils": "1.2.1",
-    "@vue/vue2-jest": "^27.0.0",
-    "add": "^2.0.6",
-    "ansi_up": "^5.0.0",
-    "babel-eslint": "^10.0.1",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "babel-preset-vue": "^2.0.2",
-    "browser-env": "^3.2.6",
-    "comlink": "^4.3.1",
-    "cookie": "^0.4.0",
-    "cookie-universal-nuxt": "^2.0.17",
-    "core-js": "^3.20.3",
-    "cron-validator": "^1.2.0",
-    "cronstrue": "^1.92.0",
-    "cross-env": "^6.0.3",
+    "@vue/vue2-jest": "27.0.0",
+    "add": "2.0.6",
+    "ansi_up": "5.0.0",
+    "babel-eslint": "10.1.0",
+    "babel-plugin-module-resolver": "4.0.0",
+    "babel-preset-vue": "2.0.2",
+    "browser-env": "3.3.0",
+    "cookie": "0.5.0",
+    "cookie-universal-nuxt": "2.1.4",
+    "core-js": "3.21.1",
+    "cron-validator": "1.2.0",
+    "cronstrue": "1.95.0",
+    "cross-env": "6.0.3",
     "css-loader": "4.3.0",
-    "csv-loader": "^3.0.3",
-    "cypress": "8.4.1",
-    "d3": "^5.12.0",
-    "d3-selection": "^1.3.0",
-    "dagre-d3": "^0.6.3",
-    "dayjs": "^1.8.16",
-    "diff2html": "^2.11.2",
-    "dompurify": "^2.0.12",
+    "csv-loader": "3.0.3",
+    "cypress": "10.3.1",
+    "d3": "7.3.0",
+    "d3-selection": "1.4.1",
+    "dagre-d3": "0.6.4",
+    "dayjs": "1.8.29",
+    "diff2html": "2.11.2",
+    "dompurify": "2.0.12",
     "eslint": "7.32.0",
-    "eslint-config-standard": ">=12.0.0",
+    "eslint-config-standard": "16.0.3",
     "eslint-import-resolver-node": "0.3.4",
     "eslint-module-utils": "2.6.1",
-    "eslint-plugin-cypress": "^2.11.3",
+    "eslint-plugin-cypress": "2.12.1",
     "eslint-plugin-import": "2.23.4",
-    "eslint-plugin-jest": "^23.6.0",
-    "eslint-plugin-n": "^15.2.0",
+    "eslint-plugin-jest": "24.4.0",
+    "eslint-plugin-n": "15.2.0",
     "eslint-plugin-vue": "7.14.0",
-    "event-target-shim": "^5.0.1",
-    "express": "^4.17.1",
-    "file-saver": "^2.0.2",
-    "frontmatter-markdown-loader": "^3.6.3",
-    "identicon.js": "^2.3.3",
-    "intl-messageformat": "^7.7.2",
-    "is-url": "^1.2.4",
-    "jest": "^27.5.1",
-    "jest-serializer-vue": "^2.0.2",
-    "jexl": "^2.2.2",
-    "jquery": "^3.5.0",
-    "js-cookie": "^2.2.0",
-    "js-yaml": "^4.1.0",
-    "js-yaml-loader": "^1.2.2",
-    "jsdiff": "^1.1.1",
-    "jsdom-global": "^3.0.2",
-    "jsonpath-plus": "^6.0.1",
-    "jsrsasign": "^10.2.0",
-    "jszip": "^3.7.0",
-    "lodash": "^4.17.21",
-    "marked": "^2.0.0",
-    "nodemon": "^2.0.2",
+    "event-target-shim": "5.0.1",
+    "express": "4.17.1",
+    "file-saver": "2.0.2",
+    "frontmatter-markdown-loader": "3.7.0",
+    "identicon.js": "2.3.3",
+    "intl-messageformat": "7.8.4",
+    "is-url": "1.2.4",
+    "jest": "27.5.1",
+    "jest-serializer-vue": "2.0.2",
+    "jexl": "2.2.2",
+    "jquery": "3.5.1",
+    "js-cookie": "2.2.1",
+    "js-yaml": "4.1.0",
+    "js-yaml-loader": "1.2.2",
+    "jsdiff": "1.1.1",
+    "jsdom-global": "3.0.2",
+    "jsonpath-plus": "6.0.1",
+    "jsrsasign": "10.2.0",
+    "jszip": "3.7.0",
+    "lodash": "4.17.21",
+    "marked": "4.0.17",
+    "nodemon": "2.0.4",
     "nuxt": "2.15.8",
-    "nyc": "^15.0.0",
-    "papaparse": "^5.3.0",
-    "portal-vue": "^2.1.5",
-    "rancher-icons": "rancher/icons#v2.0.0",
-    "require-extension-hooks": "^0.3.3",
-    "require-extension-hooks-babel": "^1.0.0-beta.1",
-    "require-extension-hooks-vue": "^3.0.0",
-    "sass": "^1.38.2",
-    "sass-loader": "10",
-    "serve-static": "^1.14.1",
-    "set-cookie-parser": "^2.4.0",
-    "shell-quote": "^1.7.2",
-    "sinon": "^8.0.4",
-    "start-server-and-test": "^1.13.1",
-    "style-loader": "^1.1.2",
-    "ts-node": "^8.3.0",
-    "typescript": "~4.1.5",
-    "url-parse": "^1.5.0",
-    "v-tooltip": "^2.0.2",
+    "nyc": "15.1.0",
+    "papaparse": "5.3.0",
+    "portal-vue": "2.1.7",
+    "rancher-icons": "rancher/icons#v2.0.3",
+    "require-extension-hooks": "0.3.3",
+    "require-extension-hooks-babel": "1.0.0",
+    "require-extension-hooks-vue": "3.0.0",
+    "sass": "1.51.0",
+    "sass-loader": "10.2.1",
+    "serve-static": "1.14.1",
+    "set-cookie-parser": "2.4.6",
+    "shell-quote": "1.7.3",
+    "sinon": "8.1.1",
+    "start-server-and-test": "1.13.1",
+    "style-loader": "1.2.1",
+    "ts-node": "8.10.2",
+    "typescript": "4.1.6",
+    "url-parse": "1.5.10",
+    "v-tooltip": "2.0.3",
     "vue": "2.6.14",
-    "vue-clipboard2": "^0.3.1",
-    "vue-codemirror": "^4.0.6",
-    "vue-js-modal": "^1.3.31",
-    "vue-resize": "^0.4.5",
-    "vue-select": "^3.13.0",
+    "vue-clipboard2": "0.3.1",
+    "vue-codemirror": "4.0.6",
+    "vue-js-modal": "1.3.35",
+    "vue-resize": "0.4.5",
+    "vue-select": "3.18.3",
     "vue-server-renderer": "2.6.14",
-    "vue-shortkey": "^3.1.7",
+    "vue-shortkey": "3.1.7",
     "vue-template-compiler": "2.6.14",
-    "vue2-transitions": "^0.3.0",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-virtual-modules": "^0.4.3",
-    "xterm": "^4.9.0",
-    "xterm-addon-fit": "^0.4.0",
-    "xterm-addon-search": "^0.7.0",
-    "xterm-addon-web-links": "^0.4.0",
-    "xterm-addon-webgl": "^0.9.0",
-    "worker-loader": "^3.0.8",
-    "yarn": "^1.22.11"
+    "vue2-transitions": "0.3.0",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.2",
+    "webpack-bundle-analyzer": "4.5.0",
+    "webpack-virtual-modules": "0.4.3",
+    "xterm": "4.9.0",
+    "xterm-addon-fit": "0.4.0",
+    "xterm-addon-search": "0.7.0",
+    "xterm-addon-web-links": "0.4.0",
+    "xterm-addon-webgl": "0.9.0",
+    "worker-loader": "3.0.8",
+    "yarn": "1.22.18"
   },
   "nyc": {
     "extension": [
@@ -158,4 +157,4 @@
       ".vue"
     ]
   }
-}
+}

package/pages/auth/login.vue

@@ -395,7 +395,7 @@ export default {
             </a>
           </div>
           <div class="locale-elector">
-            <LocaleSelector></LocaleSelector>
+            <LocaleSelector mode="login" />
           </div>
         </template>
       </div>

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

@@ -2,6 +2,8 @@
 import AsyncButton from '@shell/components/AsyncButton';
 import Loading from '@shell/components/Loading';
 import { Banner } from '@components/Banner';
+import Carousel from '@shell/components/Carousel';
+import ButtonGroup from '@shell/components/ButtonGroup';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import TypeDescription from '@shell/components/TypeDescription';
 import {
@@ -12,15 +14,18 @@ import { sortBy } from '@shell/utils/sort';
 import { mapGetters } from 'vuex';
 import { Checkbox } from '@components/Form/Checkbox';
 import Select from '@shell/components/form/Select';
-import { mapPref, HIDE_REPOS, SHOW_PRE_RELEASE } from '@shell/store/prefs';
+import { mapPref, HIDE_REPOS, SHOW_PRE_RELEASE, SHOW_CHART_MODE } from '@shell/store/prefs';
 import { removeObject, addObject, findBy } from '@shell/utils/array';
 import { compatibleVersionsFor, filterAndArrangeCharts } from '@shell/store/catalog';
 import { CATALOG } from '@shell/config/labels-annotations';
+import { isUIPlugin } from '@shell/config/uiplugins';
 
 export default {
   components: {
     AsyncButton,
     Banner,
+    Carousel,
+    ButtonGroup,
     Loading,
     Checkbox,
     Select,
@@ -48,6 +53,17 @@ export default {
       searchQuery:         null,
       showDeprecated:      null,
       showHidden:          null,
+      chartMode:           this.$store.getters['prefs/get'](SHOW_CHART_MODE),
+      chartOptions:    [
+        {
+          label:       'Browse',
+          value:       'browse',
+        },
+        {
+          label: 'Featured',
+          value: 'featured'
+        }
+      ]
     };
   },
 
@@ -134,6 +150,10 @@ export default {
           return false;
         }
 
+        if (isUIPlugin(c)) {
+          return false;
+        }
+
         return true;
       });
     },
@@ -154,6 +174,14 @@ export default {
       });
     },
 
+    getFeaturedCharts() {
+      const allCharts = (this.filteredCharts || []);
+
+      const featuredCharts = allCharts.filter(value => value.featured).sort((a, b) => a.featured - b.featured);
+
+      return featuredCharts.slice(0, 5);
+    },
+
     categories() {
       const map = {};
 
@@ -184,6 +212,10 @@ export default {
       return out;
     },
 
+    showCarousel() {
+      return this.chartMode === 'featured' && this.getFeaturedCharts.length;
+    }
+
   },
 
   watch: {
@@ -313,7 +345,20 @@ export default {
           {{ t('catalog.charts.header') }}
         </h1>
       </div>
+      <div v-if="getFeaturedCharts.length > 0" class="actions-container">
+        <ButtonGroup
+          v-model="chartMode"
+          :options="chartOptions"
+        />
+      </div>
     </header>
+    <div v-if="showCarousel">
+      <h3>Featured Charts</h3>
+      <Carousel
+        :sliders="getFeaturedCharts"
+        @clicked="(row) => selectChart(row)"
+      />
+    </div>
     <TypeDescription resource="chart" />
     <div class="left-right-split">
       <Select

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

@@ -632,10 +632,6 @@ export default {
       return { name: 'c-cluster-legacy-project' };
     },
 
-    mcmRoute() {
-      return { name: 'c-cluster-mcapps' };
-    },
-
     windowsIncompatible() {
       if (this.chart?.windowsIncompatible) {
         return this.t('catalog.charts.windowsIncompatible');
@@ -762,8 +758,10 @@ export default {
 
       // Load a values component for the UI if it is named in the Helm chart.
       if ( component ) {
-        if ( this.$store.getters['catalog/haveComponent'](component) ) {
-          this.valuesComponent = this.$store.getters['catalog/importComponent'](component);
+        const hasChartComponent = this.$store.getters['type-map/hasCustomChart'](component);
+
+        if ( hasChartComponent ) {
+          this.valuesComponent = this.$store.getters['type-map/importChart'](component);
           const loaded = await this.valuesComponent();
 
           this.showValuesComponent = true;
@@ -1537,7 +1535,7 @@ export default {
       </div>
 
       <Banner color="warning" class="description">
-        <span>
+        <span v-if="!mcapp">
           {{ t('catalog.install.error.legacy.label', { legacyType: mcapp ? legacyDefs.mcm : legacyDefs.legacy }, true) }}
         </span>
         <template v-if="!legacyEnabled">
@@ -1546,9 +1544,12 @@ export default {
             {{ t('catalog.install.error.legacy.enableLegacy.goto') }}
           </nuxt-link>
         </template>
+        <template v-else-if="mcapp">
+          <span v-html="t('catalog.install.error.legacy.mcmNotSupported')" />
+        </template>
         <template v-else>
-          <nuxt-link :to="mcapp ? mcmRoute : legacyAppRoute">
-            <span v-html="t('catalog.install.error.legacy.navigate', { legacyType: mcapp ? legacyDefs.mcm : legacyDefs.legacy }, true)" />
+          <nuxt-link :to="legacyAppRoute">
+            <span v-html="t('catalog.install.error.legacy.navigate')" />
           </nuxt-link>
         </template>
       </Banner>

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

@@ -24,8 +24,9 @@ import {
   COUNT,
   CATALOG,
   POD,
+  PSP,
 } from '@shell/config/types';
-import { mapPref, CLUSTER_TOOLS_TIP } from '@shell/store/prefs';
+import { mapPref, CLUSTER_TOOLS_TIP, PSP_DEPRECATION_BANNER } from '@shell/store/prefs';
 import { haveV1Monitoring, monitoringStatus } from '@shell/utils/monitoring';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -111,12 +112,12 @@ export default {
 
     return {
       nodeHeaders,
-      constraints:         [],
-      events:              [],
-      nodeMetrics:         [],
-      showClusterMetrics: false,
-      showK8sMetrics:     false,
-      showEtcdMetrics:    false,
+      constraints:                 [],
+      events:                      [],
+      nodeMetrics:                 [],
+      showClusterMetrics:          false,
+      showK8sMetrics:              false,
+      showEtcdMetrics:             false,
       CLUSTER_METRICS_DETAIL_URL,
       CLUSTER_METRICS_SUMMARY_URL,
       K8S_METRICS_DETAIL_URL,
@@ -124,7 +125,7 @@ export default {
       ETCD_METRICS_DETAIL_URL,
       ETCD_METRICS_SUMMARY_URL,
       clusterCounts,
-      selectedTab:         'cluster-events',
+      selectedTab:                 'cluster-events',
     };
   },
 
@@ -142,6 +143,20 @@ 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);
     },
@@ -150,7 +165,8 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
     },
 
-    hideClusterToolsTip: mapPref(CLUSTER_TOOLS_TIP),
+    hideClusterToolsTip:      mapPref(CLUSTER_TOOLS_TIP),
+    hidePspDeprecationBanner: mapPref(PSP_DEPRECATION_BANNER),
 
     hasV1Monitoring() {
       return haveV1Monitoring(this.$store.getters);
@@ -324,6 +340,16 @@ export default {
 
     hasDescription() {
       return !!this.currentCluster?.spec?.description;
+    },
+
+    allEventsLink() {
+      return {
+        name:   'c-cluster-product-resource',
+        params: {
+          product:  'explorer',
+          resource: 'event',
+        }
+      };
     }
   },
 
@@ -378,6 +404,14 @@ export default {
         </div>
       </div>
     </header>
+    <Banner
+      v-if="displayPspDeprecationBanner && !hidePspDeprecationBanner"
+      :closable="true"
+      color="warning"
+      @close="hidePspDeprecationBanner = true"
+    >
+      <t k="landing.deprecatedPsp" :raw="true" />
+    </Banner>
     <Banner
       v-if="!hideClusterToolsTip"
       :closable="true"
@@ -403,6 +437,14 @@ export default {
         <label>{{ t('glance.created') }}: </label>
         <span><LiveDate :value="currentCluster.metadata.creationTimestamp" :add-suffix="true" :show-tooltip="true" /></span>
       </div>
+      <p
+        v-if="displayPspDeprecationBanner && hidePspDeprecationBanner"
+        v-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 :to="{name: 'c-cluster-explorer-tools'}" class="monitoring-install">
@@ -446,6 +488,11 @@ export default {
     <div class="mt-30">
       <Tabbed @changed="tabChange">
         <Tab name="cluster-events" :label="t('clusterIndexPage.sections.events.label')" :weight="2">
+          <span class="events-table-link">
+            <n-link :to="allEventsLink">
+              <span>{{ t('glance.eventsTable') }}</span>
+            </n-link>
+          </span>
           <EventsTable />
         </Tab>
         <Tab v-if="hasMonitoring" name="cluster-alerts" :label="t('clusterIndexPage.sections.alerts.label')" :weight="1">
@@ -534,6 +581,16 @@ 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;
@@ -548,6 +605,12 @@ export default {
   }
 }
 
+.events-table-link {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
+
 .k8s-component-status {
   align-items: center;
   display: inline-flex;

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

@@ -121,13 +121,15 @@ export default {
         showTypes:        [CATALOG_ANNOTATIONS._CLUSTER_TOOL],
       });
 
+      charts = charts.filter(c => c.sideLabel !== 'Experimental');
+
       //  If legacy support is enabled, show V1 charts for some V1 Cluster tools
       if (this.legacyEnabled) {
         charts = charts.concat(this.legacyCharts);
         charts = sortBy(charts, ['certifiedSort', 'chartNameDisplay']);
       }
 
-      const chartsWithApps = charts.map((chart) => {
+      let chartsWithApps = charts.map((chart) => {
         return {
           chart,
           app: this.installedAppForChart[chart.id],
@@ -136,9 +138,9 @@ export default {
 
       // V1 Legacy support
       if (this.legacyEnabled) {
-        this.checkLegacyApp(chartsWithApps, this.v1Apps, 'v1-monitoring', 'rancher-monitoring', 'cluster-monitoring');
-        this.checkLegacyApp(chartsWithApps, this.v1Apps, 'v1-istio', 'rancher-istio', 'cluster-istio');
-        this.checkLegacyApp(chartsWithApps, this.v1Apps, 'v1-logging', 'rancher-logging', 'rancher-logging');
+        chartsWithApps = this.checkLegacyApp(chartsWithApps, this.v1Apps, 'v1-monitoring', 'rancher-monitoring', 'cluster-monitoring', false);
+        chartsWithApps = this.checkLegacyApp(chartsWithApps, this.v1Apps, 'v1-istio', 'rancher-istio', 'cluster-istio', true);
+        chartsWithApps = this.checkLegacyApp(chartsWithApps, this.v1Apps, 'v1-logging', 'rancher-logging', 'rancher-logging', true);
       }
 
       return chartsWithApps;
@@ -231,7 +233,7 @@ export default {
       return versions;
     },
 
-    checkLegacyApp(chartsWithApps, v1Apps, v1ChartName, v2ChartName, v1AppName) {
+    checkLegacyApp(chartsWithApps, v1Apps, v1ChartName, v2ChartName, v1AppName, showOnlyIfInstalled) {
       const v1 = chartsWithApps.find(a => a.chart.chartName === v1ChartName);
       const v2 = chartsWithApps.find(a => a.chart.chartName === v2ChartName);
 
@@ -251,6 +253,9 @@ export default {
               v1.app.upgradeAvailable = latest;
             }
           }
+        } else if (showOnlyIfInstalled) {
+          // Remove the v1 chart if it is not already installed for charts which we no longer support
+          chartsWithApps = chartsWithApps.filter(c => c !== v1);
         }
 
         if (v2) {
@@ -262,6 +267,8 @@ export default {
           }
         }
       }
+
+      return chartsWithApps;
     }
   }
 };

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

@@ -8,7 +8,7 @@ export default {
       params: {
         ...route.params,
         product:  NAME,
-        page:    'apps'
+        page:    'catalogs'
       }
     });
   }