@rancher/shell 0.5.3 → 1.2.0

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

@@ -3,72 +3,34 @@ import { mapGetters } from 'vuex';
 import Loading from '@shell/components/Loading';
 import { _FLAGGED, DEPRECATED, HIDDEN, FROM_TOOLS } from '@shell/config/query-params';
 import { filterAndArrangeCharts } from '@shell/store/catalog';
-import { CATALOG, MANAGEMENT, NORMAN } from '@shell/config/types';
+import { CATALOG, NORMAN } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import LazyImage from '@shell/components/LazyImage';
-import AppSummaryGraph from '@shell/components/formatter/AppSummaryGraph';
-import { sortBy } from '@shell/utils/sort';
-import { LEGACY } from '@shell/store/features';
 import { isAlternate } from '@shell/utils/platform';
 import IconMessage from '@shell/components/IconMessage';
 import TypeDescription from '@shell/components/TypeDescription';
 
 export default {
   components: {
-    AppSummaryGraph, LazyImage, Loading, IconMessage, TypeDescription
+    LazyImage, Loading, IconMessage, TypeDescription
   },
 
   async fetch() {
     await this.$store.dispatch('catalog/load', { force: true, reset: true });
 
     const query = this.$route.query;
-    const projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
 
     this.showDeprecated = query[DEPRECATED] === _FLAGGED;
     this.showHidden = query[HIDDEN] === _FLAGGED;
 
     this.allInstalled = await this.$store.dispatch('cluster/findAll', { type: CATALOG.APP });
-
-    // If legacy feature flag enabled
-    if (this.legacyEnabled) {
-      const res = await this.$store.dispatch('management/findMatching', {
-        type:     MANAGEMENT.CATALOG_TEMPLATE,
-        selector: 'catalog.cattle.io/name=system-library'
-      });
-
-      if (res) {
-        this.v1SystemCatalog = res.reduce((map, template) => {
-          map[template.spec.displayName] = template;
-
-          return map;
-        }, {});
-      } else {
-        this.v1SystemCatalog = {};
-      }
-
-      // Need the project ID of the system project in order to get the apps
-      const systemProject = projects.find((p) => p.spec?.displayName === 'System');
-
-      if (systemProject) {
-        const id = systemProject.id.replace('/', ':');
-
-        this.systemProject = id;
-        await this.$store.dispatch('rancher/findAll', {
-          type: NORMAN.APP,
-          opt:  { url: `/v3/project/${ id }/apps`, force: true }
-        });
-      }
-    }
   },
 
   data() {
-    const legacyEnabled = this.$store.getters['features/get'](LEGACY);
-
     return {
       allInstalled:    null,
       v1SystemCatalog: null,
       systemProject:   null,
-      legacyEnabled,
     };
   },
 
@@ -123,37 +85,15 @@ export default {
 
       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']);
-      }
-
-      let chartsWithApps = charts.map((chart) => {
+      const chartsWithApps = charts.map((chart) => {
         return {
           chart,
           app: this.installedAppForChart[chart.id],
         };
       });
 
-      // V1 Legacy support
-      if (this.legacyEnabled) {
-        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;
     },
-
-    legacyCharts() {
-      // Fake charts for the legacy V1 tools
-      return [
-        this._legacyChart('monitoring'),
-        this._legacyChart('logging'),
-        this._legacyChart('istio'),
-      ];
-    }
   },
 
   watch: {
@@ -173,22 +113,6 @@ export default {
   },
 
   methods: {
-    _legacyChart(id) {
-      return {
-        certifiedSort:    1,
-        chartNameDisplay: this.t(`v1ClusterTools.${ id }.label`),
-        chartDescription: this.t(`v1ClusterTools.${ id }.description`),
-        id:               `v1-${ id }`,
-        chartName:        `v1-${ id }`,
-        key:              `v1-${ id }`,
-        versions:         this.getLegacyVersions(`rancher-${ id }`),
-        repoKey:          this.rancherCatalog?._key,
-        legacy:           true,
-        legacyPage:       id,
-        iconName:         `icon-${ id }`,
-      };
-    },
-
     edit(app, version) {
       app.goToUpgrade(version, true);
     },
@@ -221,55 +145,6 @@ export default {
 
       this.$router.replace(route);
     },
-
-    getLegacyVersions(id) {
-      const versions = [];
-      const c = this.v1SystemCatalog?.[id];
-
-      if (c?.spec?.versions) {
-        c.spec.versions.forEach((v) => versions.push({ version: v.version }));
-      }
-
-      return versions;
-    },
-
-    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);
-
-      if (v1) {
-        const v1App = v1Apps.find((a) => a.id.indexOf(v1AppName) > 0);
-
-        v1.app = v1App;
-
-        // Add in the upgrade version information for a legacy v1 app
-        if (v1.app) {
-          v1.app.upgradeAvailable = undefined;
-          // Check if an upgrade is available
-          if (v1.chart.versions?.length) {
-            const latest = v1.chart.versions[0]?.version;
-
-            if (v1.app.currentVersion !== latest) {
-              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) {
-          if (v1.app) {
-            v2.app = undefined;
-            v2.blocked = true;
-          } else if (v2.app) {
-            v1.blocked = true;
-          }
-        }
-      }
-
-      return chartsWithApps;
-    }
   }
 };
 </script>
@@ -330,10 +205,6 @@ export default {
         overflow: hidden;
         background-color: white;
 
-        &.legacy {
-          background-color: transparent;
-        }
-
         img {
           width: $logo - 4px;
           height: $logo - 4px;
@@ -418,7 +289,6 @@ export default {
   <div v-else-if="options.length">
     <h1 v-clean-html="t('catalog.tools.header')" />
     <TypeDescription
-      v-if="!legacyEnabled"
       resource="chart"
     />
 
@@ -430,7 +300,6 @@ export default {
       >
         <div
           class="logo"
-          :class="{'legacy': opt.chart.legacy}"
         >
           <i
             v-if="opt.chart.iconName"
@@ -470,16 +339,6 @@ export default {
             class="description-content"
           />
         </div>
-        <div
-          v-if="opt.app && !opt.chart.legacy"
-          class="state"
-        >
-          <AppSummaryGraph
-            :row="opt.app"
-            label-key="generic.resourceCount"
-            :link-to="opt.app.detailLocation"
-          />
-        </div>
         <div class="action">
           <template v-if="opt.blocked">
             <button
@@ -488,26 +347,6 @@ export default {
               class="btn btn-sm role-primary"
             />
           </template>
-          <template v-else-if="opt.app && opt.chart.legacy">
-            <button
-              v-clean-html="t('catalog.tools.action.manage')"
-              class="btn btn-sm role-secondary"
-              @click="openV1Tool(opt.chart.legacyPage)"
-            />
-          </template>
-          <template v-else-if="opt.app && opt.upgradeAvailable && !opt.chart.legacy">
-            <button
-              class="btn btn-sm role-secondary"
-              @click="remove(opt.app, $event)"
-            >
-              <i class="icon icon-delete icon-lg" />
-            </button>
-            <button
-              v-clean-html="t('catalog.tools.action.upgrade')"
-              class="btn btn-sm role-secondary"
-              @click="edit(opt.app, opt.app.upgradeAvailable)"
-            />
-          </template>
           <template v-else-if="opt.app">
             <button
               class="btn btn-sm role-secondary"
@@ -521,13 +360,6 @@ export default {
               @click="edit(opt.app)"
             />
           </template>
-          <template v-else-if="opt.chart.legacy">
-            <button
-              v-clean-html="t('catalog.tools.action.install')"
-              class="btn btn-sm role-primary"
-              @click="openV1Tool(opt.chart.legacyPage)"
-            />
-          </template>
           <template v-else>
             <button
               v-clean-html="t('catalog.tools.action.install')"

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

@@ -14,7 +14,7 @@ import FleetNoWorkspaces from '@shell/components/fleet/FleetNoWorkspaces.vue';
 import { NAME } from '@shell/config/product/fleet';
 
 export default {
-  name:       'FleetDashboard',
+  name:       'ListGitRepo',
   components: {
     Loading,
     ResourceTable,

package/pages/c/_cluster/index.vue

@@ -2,6 +2,8 @@
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
 export default {
+  layout: 'plain',
+
   middleware({ redirect, route } ) {
     return redirect({
       name:   'c-cluster-product',

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

@@ -7,10 +7,11 @@ 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',
+        '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',
       }
     };
   }

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

@@ -8,14 +8,12 @@ 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, canViewAlertManagerLink, canViewGrafanaLink, canViewPrometheusLink } from '@shell/utils/monitoring';
+import { canViewAlertManagerLink, canViewGrafanaLink, canViewPrometheusLink } from '@shell/utils/monitoring';
 
 export default {
   components: {
-    Banner,
     LazyImage,
     SimpleBox,
     AlertTable
@@ -39,7 +37,6 @@ export default {
         prometheus:   false,
       },
       resources:     [MONITORING.ALERTMANAGER, MONITORING.PROMETHEUS],
-      v1Installed:   false,
       externalLinks: [
         {
           enabled:     false,
@@ -92,8 +89,6 @@ export default {
   methods: {
     async fetchDeps() {
       const { $store, externalLinks } = this;
-
-      this.v1Installed = await haveV1MonitoringWorkloads($store);
       const hash = {};
 
       if ($store.getters['cluster/canList'](CATALOG.APP)) {
@@ -151,17 +146,6 @@ export default {
       </div>
     </header>
     <div>
-      <Banner
-        v-if="v1Installed"
-        color="warning"
-      >
-        <template #default>
-          <t
-            k="monitoring.v1Warning"
-            :raw="true"
-          />
-        </template>
-      </Banner>
       <div class="create-resource-container">
         <div class="subtypes-container">
           <a

package/pages/c/_cluster/settings/DefaultLinksEditor.vue

@@ -76,12 +76,12 @@ export default {
         <div
           v-if="!row.readonly && !isView"
           :key="i+'show'"
+          class="link-show-hide-checkbox"
         >
           <Checkbox
             v-if="!isView"
             v-model="row.enabled"
             label-key="customLinks.settings.showLabel"
-            :data-testid="`custom-links__checkbox-${i}`"
             @input="showhide(row, i, $event)"
           />
         </div>

package/pages/c/_cluster/settings/banners.vue

@@ -53,6 +53,8 @@ const DEFAULT_BANNER_SETTING = {
 };
 
 export default {
+  layout: 'authenticated',
+
   components: {
     Checkbox,
     Loading,

package/pages/c/_cluster/settings/brand.vue

@@ -20,6 +20,8 @@ import { setFavIcon } from '@shell/utils/favicon';
 const Color = require('color');
 
 export default {
+  layout: 'authenticated',
+
   components: {
     LabeledInput, Checkbox, FileImageSelector, Loading, SimpleBox, AsyncButton, Banner, ColorInput, TypeDescription
   },
@@ -238,7 +240,6 @@ export default {
             <label class="text-muted">{{ t('branding.logos.lightPreview') }}</label>
             <img
               class="logo-preview"
-              data-testid="branding-logo-light-preview"
               :src="uiLogoLight ? uiLogoLight : uiLogoDark"
             >
           </SimpleBox>
@@ -263,7 +264,6 @@ export default {
             <label class="text-muted">{{ t('branding.logos.darkPreview') }}</label>
             <img
               class="logo-preview"
-              data-testid="branding-logo-dark-preview"
               :src="uiLogoDark ? uiLogoDark : uiLogoLight"
             >
           </SimpleBox>
@@ -306,7 +306,6 @@ export default {
             <label class="text-muted">{{ t('branding.favicon.preview') }}</label>
             <img
               class="logo-preview"
-              data-testid="branding-favicon-preview"
               :src="uiFavicon"
             >
           </SimpleBox>

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

@@ -3,6 +3,8 @@ import { NAME as SETTINGS } from '@shell/config/product/settings';
 import { MANAGEMENT } from '@shell/config/types';
 
 export default {
+  layout: 'plain',
+
   middleware({ redirect, route, store } ) {
     const hasSettings = !!store.getters[`management/schemaFor`](MANAGEMENT.SETTING);
 

package/pages/c/_cluster/settings/links.vue

@@ -10,9 +10,10 @@ import KeyValue from '@shell/components/form/KeyValue';
 import { mapGetters } from 'vuex';
 import { isRancherPrime } from '@shell/config/version';
 import DefaultLinksEditor from './DefaultLinksEditor';
-import { CUSTOM_LINKS_VERSION, fetchLinks } from '@shell/config/home-links';
+import { CUSTOM_LINKS_COLLECTIVE_VERSION, fetchLinks } from '@shell/config/home-links';
 
 export default {
+  layout:     'authenticated',
   components: {
     KeyValue,
     Loading,
@@ -45,7 +46,7 @@ export default {
 
     allValues() {
       return {
-        version:  CUSTOM_LINKS_VERSION,
+        version:  CUSTOM_LINKS_COLLECTIVE_VERSION,
         defaults: this.value.defaults.filter((obj) => obj.enabled).map((obj) => obj.key),
         custom:   this.value.custom
       };

package/pages/c/_cluster/settings/performance.vue

@@ -22,6 +22,7 @@ const l10n = {
 };
 
 export default {
+  layout:     'authenticated',
   components: {
     Checkbox,
     Loading,

package/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue

@@ -469,8 +469,7 @@ export default {
             <div class="fields">
               <LabeledSelect
                 v-model="imagePullSecrets"
-                :label="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.label')"
-                :tooltip="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.tooltip')"
+                :label="t('workload.container.imagePullSecrets')"
                 :multiple="true"
                 :taggable="true"
                 :options="imagePullNamespacedSecrets"

package/pages/c/_cluster/uiplugins/CatalogList/index.vue

@@ -7,12 +7,13 @@ import { SERVICE, WORKLOAD_TYPES } from '@shell/config/types';
 import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import { UI_PLUGIN_CATALOG } from '@shell/config/table-headers';
 
+import ActionMenu from '@shell/components/ActionMenu';
 import ResourceTable from '@shell/components/ResourceTable';
 
 export default {
   name: 'CatalogList',
 
-  components: { ResourceTable },
+  components: { ActionMenu, ResourceTable },
 
   mixins: [ResourceManager],
 
@@ -28,7 +29,10 @@ export default {
 
     return {
       actions,
-      catalogHeaders: UI_PLUGIN_CATALOG,
+      catalogHeaders:    UI_PLUGIN_CATALOG,
+      menuTargetElement: null,
+      menuTargetEvent:   null,
+      menuOpen:          false,
     };
   },
 
@@ -45,7 +49,6 @@ export default {
 
     catalogRows() {
       const rows = [];
-      const actions = this.actions;
 
       if ( !isEmpty(this.namespacedDeployments) ) {
         this.namespacedDeployments.forEach((deploy) => {
@@ -54,13 +57,11 @@ export default {
 
           if ( deployName ) {
             const out = {
-              name:                       deployName,
-              state:                      deploy.metadata?.state?.name,
-              image:                      deploy.spec?.template?.spec?.containers[0]?.image,
-              service:                    null,
-              repo:                       null,
-              availableActions:           actions,
-              showCatalogUninstallDialog: () => this.$emit('showCatalogUninstallDialog', out)
+              name:    deployName,
+              state:   deploy.metadata?.state?.name,
+              image:   deploy.spec?.template?.spec?.containers[0]?.image,
+              service: null,
+              repo:    null
             };
             const keys = ['service', 'repo'];
 
@@ -76,6 +77,20 @@ export default {
       return rows;
     }
   },
+
+  methods: {
+    setMenu(event) {
+      this.menuOpen = !!event;
+
+      if (event) {
+        this.menuTargetElement = this.$refs.catalogActions;
+        this.menuTargetEvent = event;
+      } else {
+        this.menuTargetElement = undefined;
+        this.menuTargetEvent = undefined;
+      }
+    }
+  }
 };
 </script>
 
@@ -103,6 +118,27 @@ export default {
             </button>
           </div>
         </template>
+        <template #row-actions="{row}">
+          <button
+            ref="catalogActions"
+            aria-haspopup="true"
+            type="button"
+            class="btn btn-sm role-multi-action actions"
+            data-testid="extensions-page-catalog-row-menu"
+            @click="setMenu"
+          >
+            <i class="icon icon-actions" />
+          </button>
+          <ActionMenu
+            :custom-actions="actions"
+            :open="menuOpen"
+            :use-custom-target-element="true"
+            :custom-target-element="menuTargetElement"
+            :custom-target-event="menuTargetEvent"
+            @close="setMenu(false)"
+            @showCatalogUninstallDialog="e => $emit('showCatalogUninstallDialog', row, e.event)"
+          />
+        </template>
       </ResourceTable>
     </div>
   </div>

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

@@ -93,6 +93,8 @@ export default {
     };
   },
 
+  layout: 'plain',
+
   async fetch() {
     const hash = {};
 

package/pages/c/index.vue

@@ -0,0 +1,9 @@
+<script>
+export default {};
+</script>
+
+<template>
+  <div>
+    Clusters
+  </div>
+</template>

package/pages/diagnostic.vue

@@ -7,7 +7,8 @@ import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/u
 import { sortBy } from '@shell/utils/sort';
 
 export default {
-  name: 'Diagnostic',
+  name:   'Diagnostic',
+  layout: 'plain',
 
   components: { AsyncButton, PromptModal },
 

package/pages/fail-whale.vue

@@ -4,6 +4,7 @@ import { mapGetters, mapState } from 'vuex';
 import { stringify } from '@shell/utils/error';
 
 export default {
+  layout: 'home',
 
   components: { BrandImage },
 

package/pages/prefs.vue

@@ -18,6 +18,7 @@ import { addObject } from '@shell/utils/array';
 import LocaleSelector from '@shell/components/LocaleSelector';
 
 export default {
+  layout:     'plain',
   components: {
     BackLink, ButtonGroup, LabeledSelect, Checkbox, LandingPagePreference, LocaleSelector
   },