@rancher/shell 3.0.10 → 3.0.12-rc.1

package/models/monitoring.coreos.com.receiver.js

@@ -3,6 +3,11 @@ import { isEmpty } from '@shell/utils/object';
 import { MONITORING } from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import slackLogo from '~shell/assets/images/vendor/slack.svg';
+import emailLogo from '~shell/assets/images/vendor/email.svg';
+import pagerdutyLogo from '~shell/assets/images/vendor/pagerduty.svg';
+import webhookLogo from '~shell/assets/images/vendor/webhook.svg';
+import customLogo from '~shell/assets/images/vendor/custom.svg';
 
 // i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
@@ -13,14 +18,14 @@ export const RECEIVERS_TYPES = [
     title: 'monitoringReceiver.slack.title',
     info:  'monitoringReceiver.slack.info',
     key:   'slack_configs',
-    logo:  require(`~shell/assets/images/vendor/slack.svg`)
+    logo:  slackLogo
   },
   {
     name:  'email',
     label: 'monitoringReceiver.email.label',
     title: 'monitoringReceiver.email.title',
     key:   'email_configs',
-    logo:  require(`~shell/assets/images/vendor/email.svg`)
+    logo:  emailLogo
   },
   {
     name:  'pagerduty',
@@ -28,21 +33,21 @@ export const RECEIVERS_TYPES = [
     title: 'monitoringReceiver.pagerduty.title',
     info:  'monitoringReceiver.pagerduty.info',
     key:   'pagerduty_configs',
-    logo:  require(`~shell/assets/images/vendor/pagerduty.svg`)
+    logo:  pagerdutyLogo
   },
   {
     name:  'opsgenie',
     label: 'monitoringReceiver.opsgenie.label',
     title: 'monitoringReceiver.opsgenie.title',
     key:   'opsgenie_configs',
-    logo:  require(`~shell/assets/images/vendor/email.svg`)
+    logo:  emailLogo
   },
   {
     name:      'webhook',
     label:     'monitoringReceiver.webhook.label',
     title:     'monitoringReceiver.webhook.title',
     key:       'webhook_configs',
-    logo:      require(`~shell/assets/images/vendor/webhook.svg`),
+    logo:      webhookLogo,
     banner:    'webhook.banner',
     addButton: 'webhook.add'
   },
@@ -52,7 +57,7 @@ export const RECEIVERS_TYPES = [
     title: 'monitoringReceiver.custom.title',
     info:  'monitoringReceiver.custom.info',
     key:   'webhook_configs',
-    logo:  require(`~shell/assets/images/vendor/custom.svg`)
+    logo:  customLogo
   },
 ];
 

package/models/pod.js

@@ -4,6 +4,7 @@ import { NODE, WORKLOAD_TYPES } from '@shell/config/types';
 import { escapeHtml, shortenedImage } from '@shell/utils/string';
 import WorkloadService from '@shell/models/workload.service';
 import { deleteProperty } from '@shell/utils/object';
+import { POD_RESTARTS_REG_EX } from '@shell/types/resources/pod';
 
 export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.DEPLOYMENT]:             1,
@@ -222,6 +223,9 @@ export default class Pod extends WorkloadService {
     return this.$rootGetters['i18n/t']('resourceTable.groupLabel.node', { name: escapeHtml(name) });
   }
 
+  /**
+   * How many times has the first container restarted
+   */
   get restartCount() {
     if (this.status.containerStatuses) {
       return this.status?.containerStatuses[0].restartCount || 0;
@@ -230,6 +234,20 @@ export default class Pod extends WorkloadService {
     return 0;
   }
 
+  /**
+   * How many times does native kube report this pod has restarted
+   */
+  get restartsCount() {
+    return this.metadata?.fields?.[3]?.match(POD_RESTARTS_REG_EX)?.[1] || '';
+  }
+
+  /**
+   * When does native kube think the last pod restart happen?
+   */
+  get restartsLaster() {
+    return this.metadata?.fields?.[3]?.match(POD_RESTARTS_REG_EX)?.[2] || '';
+  }
+
   processSaveResponse(res) {
     if (res._headers && res._headers.warning) {
       const warnings = res._headers.warning.split('299') || [];

package/models/provisioning.cattle.io.cluster.js

@@ -127,9 +127,9 @@ export default class ProvCluster extends SteveModel {
     }
     const ready = this.mgmt?.isReady;
 
-    const canEditRKE2cluster = this.isRke2 && ready && this.canUpdate && !this.isCapiHybrid;
+    const canEditRKE2cluster = this.isRke2 && ready && this.canUpdate;
 
-    const canSnapshot = ready && this.isRke2 && this.canUpdate && !this.isCapiHybrid;
+    const canSnapshot = ready && this.isRke2 && this.canUpdate;
 
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check

package/models/workload.js

@@ -9,6 +9,7 @@ import WorkloadService from '@shell/models/workload.service';
 import { matching } from '@shell/utils/selector-typed';
 import { defineAsyncComponent, markRaw } from 'vue';
 import { useResourceCardRow } from '@shell/components/Resource/Detail/Card/StateCard/composables';
+import { colorForState as colorForStateFn, stateDisplay as stateDisplayFn } from '@shell/plugins/dashboard-store/resource-class';
 
 export const defaultContainer = {
   imagePullPolicy: 'Always',
@@ -622,12 +623,29 @@ export default class Workload extends WorkloadService {
 
   calcPodGauges(pods) {
     const out = { };
+    let refPods = pods;
 
-    if (!pods) {
+    if (this.metadata.associatedData) {
+      refPods = [];
+      this.metadata.associatedData.forEach((w) => {
+        if (w.gvk.kind.toLowerCase() !== POD) {
+          return;
+        }
+
+        return w.data.forEach((p) => {
+          refPods.push({
+            stateColor:   colorForStateFn(p.state.name, p.state.error === 'true', p.state.transitioning === 'true'),
+            stateDisplay: stateDisplayFn(p.state.name),
+          });
+        });
+      });
+    }
+
+    if (!refPods) {
       return out;
     }
 
-    pods.map((pod) => {
+    refPods.map((pod) => {
       const { stateColor, stateDisplay } = pod;
 
       if (out[stateDisplay]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.10",
+  "version": "3.0.12-rc.1",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
@@ -53,7 +53,7 @@
     "add": "2.0.6",
     "ansi_up": "5.0.0",
     "axios-retry": "3.1.9",
-    "axios": "1.13.2",
+    "axios": "1.13.5",
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "5.0.2",
     "babel-preset-vue": "2.0.2",
@@ -76,7 +76,6 @@
     "d3-selection": "3.0.0",
     "d3": "7.3.0",
     "dayjs": "1.11.18",
-    "defu": "6.1.4",
     "diff2html": "3.4.24",
     "dompurify": "3.2.5",
     "element-matches": "^0.1.2",
@@ -109,9 +108,9 @@
     "js-yaml": "4.1.1",
     "jsdiff": "1.1.1",
     "jsonpath-plus": "10.3.0",
-    "jsrsasign": "11.0.0",
+    "jsrsasign": "11.1.1",
     "jszip": "3.10.1",
-    "lodash": "4.17.23",
+    "lodash": "4.18.1",
     "marked": "4.0.17",
     "node-polyfill-webpack-plugin": "3.0.0",
     "nodemon": "2.0.22",
@@ -148,7 +147,7 @@
     "xterm-addon-web-links": "0.9.0",
     "xterm-addon-webgl": "0.16.0",
     "xterm": "5.2.1",
-    "yarn": "1.22.18"
+    "yarn": "1.22.22"
   },
   "resolutions": {
     "d3-color": "3.1.0",

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

@@ -183,7 +183,6 @@ function getTooltip(key: string, fallback?: string): string | undefined {
   }
 
   &-button {
-    text-transform: capitalize;
     min-width: 0;
     max-width: 100%;
 

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

@@ -624,7 +624,6 @@ export default {
       <RichTranslation
         k="catalog.charts.appCollectionRepoMissing"
         tag="div"
-        :raw="true"
       >
         <template #repoCreate="{ content }">
           <router-link
@@ -661,10 +660,7 @@ export default {
           {{ t('catalog.charts.noCharts.title') }}
         </h1>
         <div class="empty-state-tips">
-          <RichTranslation
-            k="catalog.charts.noCharts.message"
-            :raw="true"
-          >
+          <RichTranslation k="catalog.charts.noCharts.message">
             <template #resetAllFilters="{ content }">
               <a
                 tabindex="0"
@@ -684,8 +680,7 @@ export default {
           </RichTranslation>
           <RichTranslation
             k="catalog.charts.noCharts.docsMessage"
-            tag="div"
-            :raw="true"
+            tag="span"
           >
             <template #docsUrl="{ content }">
               <a
@@ -891,7 +886,7 @@ export default {
 
 .charts-empty-state {
   width: 100%;
-  padding: 72px 120px;
+  padding: 72px 72px;
   text-align: center;
 
   .empty-state-title {

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

@@ -379,7 +379,7 @@ export default {
     /* Look for annotation to say this app is a legacy migrated app (we look in either place for now) */
     this.migratedApp = (this.existing?.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.MIGRATED] === 'true');
 
-    if (this.repo.isSuseAppCollection) {
+    if (this.repo?.isSuseAppCollection) {
       let defaultSelectedSecret = await this.$store.getters['cluster/byId'](SECRET, `cattle-system/${ this.repo.spec.clientSecret.name }`);
 
       if (!defaultSelectedSecret) {
@@ -823,7 +823,7 @@ export default {
         }
       }
 
-      if (this.repo.isSuseAppCollection) {
+      if (this.repo?.isSuseAppCollection) {
         await this.initializeDataForNamespaceChanges();
       }
     },
@@ -938,7 +938,7 @@ export default {
 
     async initializeDataForNamespaceChanges() {
       // Skip the flow if the data still not fetched, it will trigger after fetching manually
-      if (!this.appCoDataFetched) {
+      if (this.appCoDataFetched) {
         try {
           this.defaultImagePullSecret = await this.$store.dispatch('cluster/find', { type: SECRET, id: `${ this.targetNamespace }/${ this.repo.spec.clientSecret.name }-image-pull-secret` });
         } catch (e) {
@@ -1028,7 +1028,7 @@ export default {
     },
 
     async setImagePullSecretData() {
-      if (this.selectedSecret && this.repo.isSuseAppCollection && this.dontUseDefaultOption !== null) {
+      if (this.selectedSecret && this.repo?.isSuseAppCollection && this.dontUseDefaultOption !== null) {
         if (!this.dontUseDefaultOption && this.defaultImagePullSecret) {
           // If the default option is used and the default secret already exists, use it
           this.selectedImagePullSecret = this.defaultImagePullSecret.name;
@@ -1159,7 +1159,7 @@ export default {
 
         // Create namespace if it doesn't exist (before hooks run)
         // And only if it is SUSE APP Collection, overall should just do the same flow
-        if (!isUpgrade && this.isNamespaceNew && this.repo.isSuseAppCollection) {
+        if (!isUpgrade && this.isNamespaceNew && this.repo?.isSuseAppCollection) {
           await this.createNamespaceIfNeeded();
         }
 
@@ -1355,7 +1355,7 @@ export default {
           ...migratedAnnotations,
           [CATALOG_ANNOTATIONS.SOURCE_REPO_TYPE]: this.chart.repoType,
           [CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: this.chart.repoName,
-          ...(this.repo.isSuseAppCollection ? { [CATALOG_ANNOTATIONS.SUSE_APP_COLLECTION]: 'true' } : {}),
+          ...(this.repo?.isSuseAppCollection ? { [CATALOG_ANNOTATIONS.SUSE_APP_COLLECTION]: 'true' } : {}),
         },
         values,
       };
@@ -1497,7 +1497,7 @@ export default {
     },
 
     async createImagePullSecret() {
-      if (!this.repo.isSuseAppCollection) {
+      if (!this.repo?.isSuseAppCollection) {
         return;
       }
 
@@ -1655,7 +1655,6 @@ export default {
             </div>
           </div>
           <NameNsDescription
-            v-if="showNameEditor"
             v-model:value="value"
             :description-hidden="true"
             :mode="mode"
@@ -1686,7 +1685,7 @@ export default {
             </template>
           </NameNsDescription>
           <div
-            v-if="repo.isSuseAppCollection"
+            v-if="repo?.isSuseAppCollection"
             class="mb-20"
           >
             <Banner

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

@@ -2,6 +2,8 @@
 import { mapGetters } from 'vuex';
 import { SERVICE } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
+import kialiSvg from '~shell/assets/images/vendor/kiali.svg';
+import jaegerSvg from '~shell/assets/images/vendor/jaeger.svg';
 export default {
   components: { Loading },
 
@@ -23,7 +25,7 @@ export default {
 
     kialiLogo() {
       // @TODO move to theme css
-      return require(`~shell/assets/images/vendor/kiali.svg`);
+      return kialiSvg;
     },
 
     kialiUrl() {
@@ -31,7 +33,7 @@ export default {
     },
 
     jaegerLogo() {
-      return require(`~shell/assets/images/vendor/jaeger.svg`);
+      return jaegerSvg;
     },
 
     jaegerUrl() {

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

@@ -3,6 +3,7 @@ import { mapGetters } from 'vuex';
 import { SERVICE } from '@shell/config/types';
 import IconMessage from '@shell/components/IconMessage';
 import LazyImage from '@shell/components/LazyImage';
+import longhornSvg from '~shell/assets/images/vendor/longhorn.svg';
 import Loading from '@shell/components/Loading';
 
 export default {
@@ -24,7 +25,7 @@ export default {
 
   data() {
     return {
-      longhornImgSrc: require('~shell/assets/images/vendor/longhorn.svg'),
+      longhornImgSrc: longhornSvg,
       uiServices:     null
     };
   },

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

@@ -9,6 +9,8 @@ import LazyImage from '@shell/components/LazyImage';
 import SimpleBox from '@shell/components/SimpleBox';
 import { canViewAlertManagerLink, canViewGrafanaLink, canViewPrometheusLink } from '@shell/utils/monitoring';
 import Loading from '@shell/components/Loading';
+import grafanaSrc from '~shell/assets/images/vendor/grafana.svg';
+import prometheusSrc from '~shell/assets/images/vendor/prometheus.svg';
 
 export default {
   components: {
@@ -23,8 +25,6 @@ export default {
   },
 
   data() {
-    const grafanaSrc = require('~shell/assets/images/vendor/grafana.svg');
-    const prometheusSrc = require('~shell/assets/images/vendor/prometheus.svg');
     const currentCluster = this.$store.getters['currentCluster'];
 
     return {

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

@@ -4,6 +4,7 @@ import { NEU_VECTOR_NAMESPACE } from '@shell/config/product/neuvector';
 
 import LazyImage from '@shell/components/LazyImage';
 import Loading from '@shell/components/Loading';
+import neuvectorSvg from '~shell/assets/images/vendor/neuvector.svg';
 
 export default {
   components: { LazyImage, Loading },
@@ -11,7 +12,7 @@ export default {
   data() {
     return {
       externalLinks:   [],
-      neuvectorImgSrc: require('~shell/assets/images/vendor/neuvector.svg'),
+      neuvectorImgSrc: neuvectorSvg,
     };
   },
 

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

@@ -440,14 +440,14 @@ export default {
             />
           </div>
           <SimpleBox
-            v-if="uiLoginBackgroundLight || uiLoginBackgroundDark"
+            v-if="uiLoginBackgroundLight"
             class="theme-light mb-10"
           >
             <label class="text-muted">{{ t('branding.loginBackground.lightPreview') }}</label>
             <img
               class="img-preview"
               data-testid="branding-login-background-light-preview"
-              :src="uiLoginBackgroundLight ? uiLoginBackgroundLight : uiLoginBackgroundDark"
+              :src="uiLoginBackgroundLight"
             >
           </SimpleBox>
         </div>
@@ -465,14 +465,14 @@ export default {
             />
           </div>
           <SimpleBox
-            v-if="uiLoginBackgroundDark || uiLoginBackgroundLight"
+            v-if="uiLoginBackgroundDark"
             class="theme-dark  mb-10"
           >
             <label class="text-muted">{{ t('branding.loginBackground.darkPreview') }}</label>
             <img
               class="img-preview"
               data-testid="branding-login-background-dark-preview"
-              :src="uiLoginBackgroundDark ? uiLoginBackgroundDark : uiLoginBackgroundLight"
+              :src="uiLoginBackgroundDark"
             >
           </SimpleBox>
         </div>

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

@@ -237,11 +237,6 @@ export default {
             {{ t('performance.serverPagination.label') }}
           </h2>
           <p>{{ t('performance.serverPagination.description') }}</p>
-          <Banner
-            color="warning"
-          >
-            <div v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)" />
-          </Banner>
           <Collapse
             :title="t('performance.serverPagination.applicable')"
             :open="steveCacheEnabled && ssPApplicableTypesOpen"

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

@@ -3,6 +3,7 @@ import { mapGetters } from 'vuex';
 import ChartReadme from '@shell/components/ChartReadme';
 import LazyImage from '@shell/components/LazyImage';
 import { MANAGEMENT } from '@shell/config/types';
+import genericPluginSvg from '~shell/assets/images/generic-plugin.svg';
 import { SETTING } from '@shell/config/settings';
 import { useWatcherBasedSetupFocusTrapWithDestroyIncluded } from '@shell/composables/focusTrap';
 import { getPluginChartVersionLabel, getPluginChartVersion } from '@shell/utils/uiplugins';
@@ -36,7 +37,7 @@ export default {
       infoVersion:      undefined,
       versionInfo:      undefined,
       versionError:     undefined,
-      defaultIcon:      require('~shell/assets/images/generic-plugin.svg'),
+      defaultIcon:      genericPluginSvg,
       headerBannerSize: 0,
       isActive:         false
     };