dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-test.2

package/core/types.ts

@@ -39,8 +39,19 @@ export type OnEnterLeavePackageConfig = {
 export type OnNavToPackage = (store: any, config: OnEnterLeavePackageConfig) => Promise<void>;
 export type OnNavAwayFromPackage = (store: any, config: OnEnterLeavePackageConfig) => Promise<void>;
 export type OnLogOut = (store: any) => Promise<void>;
+export type OnLogIn = (store: any) => Promise<void>;
 
-/** Enum regarding the extensionable areas/places of the UI */
+/**
+ * Navigation hooks specified as an object
+ */
+export type NavHooks = {
+  onEnter?: OnNavToPackage,
+  onLeave?: OnNavAwayFromPackage,
+  onLogout?: OnLogOut,
+  onLogin?: OnLogIn,
+}
+
+/** Enum regarding the extensible areas/places of the UI */
 export enum ExtensionPoint {
   ACTION = 'Action', // eslint-disable-line no-unused-vars
   TAB = 'Tab', // eslint-disable-line no-unused-vars
@@ -49,31 +60,32 @@ export enum ExtensionPoint {
   TABLE_COL = 'TableColumn', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding action locations that are extensionable in the UI */
+/** Enum regarding action locations that are extensible in the UI */
 export enum ActionLocation {
   HEADER = 'header-action', // eslint-disable-line no-unused-vars
   TABLE = 'table-action', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding panel locations that are extensionable in the UI */
+/** Enum regarding panel locations that are extensible in the UI */
 export enum PanelLocation {
+  ABOUT_TOP = 'about-top', // eslint-disable-line no-unused-vars
   DETAILS_MASTHEAD = 'details-masthead', // eslint-disable-line no-unused-vars
   DETAIL_TOP = 'detail-top', // eslint-disable-line no-unused-vars
   RESOURCE_LIST = 'resource-list', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding tab locations that are extensionable in the UI */
+/** Enum regarding tab locations that are extensible in the UI */
 export enum TabLocation {
   RESOURCE_DETAIL = 'tab', // eslint-disable-line no-unused-vars
   CLUSTER_CREATE_RKE2 = 'cluster-create-rke2', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding card locations that are extensionable in the UI */
+/** Enum regarding card locations that are extensible in the UI */
 export enum CardLocation {
   CLUSTER_DASHBOARD_CARD = 'cluster-dashboard-card', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding table col locations that are extensionable in the UI */
+/** Enum regarding table col locations that are extensible in the UI */
 export enum TableColumnLocation {
   RESOURCE = 'resource-list', // eslint-disable-line no-unused-vars
 }
@@ -323,6 +335,10 @@ export interface HeaderOptions {
 }
 
 export interface ConfigureTypeOptions {
+  /**
+   * Override for the create button string on a list view
+   */
+  listCreateButtonLabelKey?: boolean;
   /**
    * The resource can edit/show yaml
    */
@@ -643,8 +659,10 @@ export interface IPlugin {
   addNavHooks(
     onEnter?: OnNavToPackage,
     onLeave?: OnNavAwayFromPackage,
-    onLogOut?: OnLogOut
+    onLogOut?: OnLogOut,
+    onLogIn?: OnLogIn,
   ): void;
+  addNavHooks(hooks: NavHooks): void;
 
   /**
    * Adds a model extension

package/detail/catalog.cattle.io.app.vue

@@ -11,6 +11,7 @@ import merge from 'lodash/merge';
 import { CATALOG } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { allHash } from '@shell/utils/promise';
+import { mergeWithReplace } from '@shell/utils/object';
 
 export default {
   name: 'DetailRelease',
@@ -52,7 +53,10 @@ export default {
     },
 
     valuesYaml() {
-      const combined = merge(merge({}, this.value?.chartValues || {}), this.value?.values || {});
+      const combined = mergeWithReplace(
+        merge({}, this.value?.chartValues || {}),
+        this.value?.values || {},
+      );
 
       return jsyaml.dump(combined);
     },

package/detail/{cis.cattle.io.clusterscan.vue → compliance.cattle.io.clusterscan.vue}

@@ -7,11 +7,11 @@ import Loading from '@shell/components/Loading';
 import day from 'dayjs';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { escapeHtml, randomStr } from '@shell/utils/string';
-import { CIS } from '@shell/config/types';
+import { COMPLIANCE } from '@shell/config/types';
 import { STATE } from '@shell/config/table-headers';
 import { get } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
-import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
+import { fetchSpecsScheduledScanConfig } from '@shell/models/compliance.cattle.io.clusterscan';
 
 export default {
   components: {
@@ -95,50 +95,50 @@ export default {
 
       const out = [
         {
-          label: this.t('cis.profile'),
+          label: this.t('compliance.profile'),
           value: this.value.status.lastRunScanProfileName,
           to:    {
             name:   'c-cluster-product-resource-id',
             params: {
               ...this.$route.params,
-              resource: CIS.CLUSTER_SCAN_PROFILE,
+              resource: COMPLIANCE.CLUSTER_SCAN_PROFILE,
               id:       this.value.status.lastRunScanProfileName
             }
           }
         },
         {
-          label: this.t('cis.scan.total'),
+          label: this.t('compliance.scan.total'),
           value: this.parsedReport.total
         },
         {
-          label: this.t('cis.scan.pass'),
+          label: this.t('compliance.scan.pass'),
           value: this.parsedReport.pass
         },
         {
-          label: this.t('cis.scan.warn'),
+          label: this.t('compliance.scan.warn'),
           value: this.parsedReport.warn
         },
         {
-          label: this.t('cis.scan.skip'),
+          label: this.t('compliance.scan.skip'),
           value: this.parsedReport.skip
         },
         {
-          label: this.t('cis.scan.fail'),
+          label: this.t('compliance.scan.fail'),
           value: this.parsedReport.fail
         },
         {
-          label: this.t('cis.scan.notApplicable'),
+          label: this.t('compliance.scan.notApplicable'),
           value: this.parsedReport.notApplicable
         },
         {
-          label:     this.canBeScheduled ? this.t('cis.scan.lastScanTime') : this.t('cis.scan.scanDate'),
+          label:     this.canBeScheduled ? this.t('compliance.scan.lastScanTime') : this.t('compliance.scan.scanDate'),
           value:     this.value.status.lastRunTimestamp,
           component: 'Date'
         },
       ];
 
       if (!this.canBeScheduled) {
-        return out.filter((each) => each.label !== this.t('cis.scan.warn'));
+        return out.filter((each) => each.label !== this.t('compliance.scan.warn'));
       }
 
       return out;
@@ -154,14 +154,14 @@ export default {
         },
         {
           name:  'number',
-          label: this.t('cis.scan.number'),
+          label: this.t('compliance.scan.number'),
           value: 'id',
           sort:  'testIdSort',
           width: 100
         },
         {
           name:  'description',
-          label: this.t('cis.scan.description'),
+          label: this.t('compliance.scan.description'),
           value: 'description',
         }
       ];
@@ -250,7 +250,7 @@ export default {
       if (!remediation) {
 
       } else {
-        return `${ this.t('cis.scan.remediation') }: ${ remediation }`;
+        return `${ this.t('compliance.scan.remediation') }: ${ remediation }`;
       }
     },
     get
@@ -287,13 +287,13 @@ export default {
     >
       <div class="col span-8">
         <h3>
-          {{ t('cis.scan.scanReport') }}
+          {{ t('compliance.scan.scanReport') }}
         </h3>
       </div>
       <div class="col span-4">
         <LabeledSelect
           v-model:value="clusterReport"
-          :label="t('cis.reports')"
+          :label="t('compliance.reports')"
           :options="clusterReports"
           :get-option-label="reportLabel"
           :get-option-key="report=>report.id"
@@ -302,7 +302,7 @@ export default {
     </div>
     <div v-if="results && !!get(value, 'status.summary')">
       <SortableTable
-        no-rows-key="cis.noReportFound"
+        no-rows-key="compliance.noReportFound"
         default-sort-by="state"
         :search="false"
         :row-actions="false"
@@ -328,6 +328,7 @@ export default {
                 color="warning"
               />
               <SortableTable
+                v-if="row.nodeRows.length"
                 class="sub-table"
                 :rows="row.nodeRows"
                 :headers="nodeTableHeaders"
@@ -336,6 +337,9 @@ export default {
                 :table-actions="false"
                 key-field="id"
               />
+              <span v-else>
+                {{ t('compliance.detail.subRow.noNodes') }}
+              </span>
             </td>
           </tr>
         </template>

package/detail/fleet.cattle.io.bundle.vue

@@ -1,12 +1,15 @@
 <script>
-import { MANAGEMENT } from '@shell/config/types';
-import FleetBundleResources from '@shell/components/fleet/FleetBundleResources.vue';
+import { FLEET, MANAGEMENT } from '@shell/config/types';
+import FleetResources from '@shell/components/fleet/FleetResources';
 import FleetUtils from '@shell/utils/fleet';
+import { checkSchemasForFindAllHash } from '@shell/utils/auth';
+import Loading from '@shell/components/Loading.vue';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 export default {
   name: 'FleetBundleDetail',
 
-  components: { FleetBundleResources },
+  components: { Loading, FleetResources },
   props:      {
     value: {
       type:     Object,
@@ -14,15 +17,74 @@ export default {
     }
   },
 
+  data() {
+    return { allBundleDeployments: [] };
+  },
+
   async fetch() {
+    const allDispatches = await checkSchemasForFindAllHash({
+      allBundleDeployments: {
+        inStoreType: 'management',
+        type:        FLEET.BUNDLE_DEPLOYMENT,
+      },
+
+      // must be loaded for bundle.targetClusters to work
+      allFleetClusters: {
+        inStoreType: 'management',
+        type:        FLEET.CLUSTER
+      },
+      clusterGroups: {
+        inStoreType: 'management',
+        type:        FLEET.CLUSTER_GROUP
+      }
+    }, this.$store);
+
     if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
       await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.USER }, { root: true });
     }
+
+    this.allBundleDeployments = allDispatches.allBundleDeployments || [];
   },
 
   computed: {
     bundleResources() {
-      return FleetUtils.resourcesFromBundleStatus(this.value?.status);
+      if (!this.allBundleDeployments) {
+        return [];
+      }
+
+      const bundleDeploymentsByClusterId = this.allBundleDeployments
+        .reduce((res, bd) => {
+          if (this.value.id === FleetUtils.bundleIdFromBundleDeploymentLabels(bd.metadata?.labels)) {
+            res[FleetUtils.clusterIdFromBundleDeploymentLabels(bd.metadata?.labels)] = bd;
+          }
+
+          return res;
+        }, {});
+
+      return this.value.targetClusters.reduce((res, cluster) => {
+        const bd = bundleDeploymentsByClusterId[cluster.id];
+
+        if (bd) {
+          FleetUtils.resourcesFromBundleDeploymentStatus(bd.status)
+            .forEach((r) => {
+              const type = FleetUtils.resourceType(r);
+              const key = `${ cluster.id }-${ type }-${ r.namespace }-${ r.name }`;
+
+              res.push({
+                ...r,
+                key,
+                type,
+                id:          FleetUtils.resourceId(r),
+                clusterId:   cluster.id,
+                clusterName: cluster.nameDisplay,
+
+                detailLocation: FleetUtils.detailLocation(r, cluster.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME]),
+              });
+            });
+        }
+
+        return res;
+      }, []);
     },
     resourceCount() {
       return this.bundleResources.length;
@@ -38,8 +100,10 @@ export default {
       <h2>{{ t('fleet.bundles.resources') }}</h2>
       <span>{{ resourceCount }}</span>
     </div>
-    <FleetBundleResources
-      :value="bundleResources"
+    <Loading v-if="$fetchState.pending" />
+    <FleetResources
+      v-else
+      :rows="bundleResources"
     />
   </div>
 </template>

package/detail/fleet.cattle.io.cluster.vue

@@ -1,10 +1,10 @@
 <script>
 import Loading from '@shell/components/Loading';
 import ResourcesSummary from '@shell/components/fleet/ResourcesSummary';
-import FleetRepos from '@shell/components/fleet/FleetRepos';
+import FleetApplications from '@shell/components/fleet/FleetApplications';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
-import { MANAGEMENT, FLEET } from '@shell/config/types';
+import { MANAGEMENT, FLEET, SCHEMA } from '@shell/config/types';
 import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
 import { allHash } from 'utils/promise';
 
@@ -16,7 +16,7 @@ export default {
   components: {
     Loading,
     ResourcesSummary,
-    FleetRepos,
+    FleetApplications,
     ResourceTabs,
     Tab,
   },
@@ -35,17 +35,27 @@ export default {
         type: MANAGEMENT.CLUSTER,
         id:   managementClusterId
       }),
-      repos:             this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO }),
+      gitRepos:          this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO }),
+      helmOps:           this.$store.dispatch('management/findAll', { type: FLEET.HELM_OP }),
       workspaces:        this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE }),
       bundleDeployments: this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT })
     });
 
     this.rancherCluster = hash.rancherCluster;
-    this.allRepos = hash.repos;
+    this.gitRepos = hash.gitRepos;
+    this.helmOps = hash.helmOps;
   },
 
   data() {
-    return { rancherCluster: null, allRepos: [] };
+    return {
+      rancherCluster: null,
+      gitRepos:       [],
+      helmOps:        [],
+      appSchema:      {
+        id:   FLEET.APPLICATION,
+        type: SCHEMA,
+      },
+    };
   },
 
   computed: {
@@ -53,14 +63,17 @@ export default {
       return this.value.id;
     },
 
-    repos() {
-      return this.allRepos.filter((x) => {
+    rows() {
+      return [
+        ...this.gitRepos,
+        ...this.helmOps
+      ].filter((x) => {
         return x.targetClusters.includes(this.value);
       });
     },
 
-    repoSchema() {
-      return this.$store.getters['management/schemaFor'](FLEET.GIT_REPO);
+    typeLabel() {
+      return this.t(`typeLabel."${ FLEET.APPLICATION }"`, { count: 2 });
     },
   },
 };
@@ -82,14 +95,14 @@ export default {
       @update:value="$emit('input', $event)"
     >
       <Tab
-        label="Git Repos"
-        name="repos"
+        :label="typeLabel"
+        name="applications"
         :weight="19"
       >
-        <FleetRepos
+        <FleetApplications
           :clusterId="clusterId"
-          :rows="repos"
-          :schema="repoSchema"
+          :rows="rows"
+          :schema="appSchema || {}"
           :paging="true"
           paging-label="sortableTable.paging.resource"
         />

package/detail/fleet.cattle.io.gitrepo.vue

@@ -1,4 +1,5 @@
 <script>
+import { mapState } from 'vuex';
 import Loading from '@shell/components/Loading';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import FleetSummary from '@shell/components/fleet/FleetSummary';
@@ -38,7 +39,15 @@ export default {
       allBundles:       [],
     };
   },
+
+  created() {
+    if (this.workspace !== this.value.namespace) {
+      this.$store.commit('updateWorkspace', { value: this.value.namespace, getters: this.$store.getters });
+    }
+  },
+
   computed: {
+    ...mapState(['workspace']),
     gitRepoHasClusters() {
       return this.value.status?.desiredReadyClusters;
     },
@@ -119,7 +128,7 @@ export default {
       color="info"
       class="mb-20"
     >
-      {{ t('fleet.fleetSummary.noClustersGitRepo') }}
+      {{ t('fleet.fleetSummary.noClusters.gitRepo') }}
     </Banner>
     <ResourceTabs
       :value="value"
@@ -141,7 +150,7 @@ export default {
         name="resources"
         :weight="20"
       >
-        <FleetResources :value="value" />
+        <FleetResources :rows="value.resourcesStatuses" />
       </Tab>
     </ResourceTabs>
   </div>

package/detail/fleet.cattle.io.helmop.vue

@@ -0,0 +1,157 @@
+<script>
+import { mapState } from 'vuex';
+import Loading from '@shell/components/Loading';
+import ResourceTabs from '@shell/components/form/ResourceTabs';
+import FleetSummary from '@shell/components/fleet/FleetSummary';
+import { Banner } from '@components/Banner';
+import FleetResources from '@shell/components/fleet/FleetResources';
+import Tab from '@shell/components/Tabbed/Tab';
+import { FLEET, MANAGEMENT } from '@shell/config/types';
+import { isHarvesterCluster } from '@shell/utils/cluster';
+import FleetBundles from '@shell/components/fleet/FleetBundles.vue';
+import { checkSchemasForFindAllHash } from '@shell/utils/auth';
+
+export default {
+  name: 'DetailsHelmOp',
+
+  emits: ['input'],
+
+  components: {
+    Loading,
+    FleetResources,
+    FleetSummary,
+    Banner,
+    ResourceTabs,
+    Tab,
+    FleetBundles,
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      allFleetClusters: [],
+      allBundles:       [],
+    };
+  },
+
+  created() {
+    if (this.workspace !== this.value.namespace) {
+      this.$store.commit('updateWorkspace', { value: this.value.namespace, getters: this.$store.getters });
+    }
+  },
+
+  computed: {
+    ...mapState(['workspace']),
+    helmOpHasClusters() {
+      return this.value.status?.desiredReadyClusters;
+    },
+    clusterSchema() {
+      return this.$store.getters['management/schemaFor'](FLEET.CLUSTER);
+    },
+    harvesterClusters() {
+      const harvester = {};
+
+      this.allFleetClusters.forEach((c) => {
+        if (isHarvesterCluster(c)) {
+          harvester[c.metadata.name] = c;
+        }
+      });
+
+      return harvester;
+    },
+    bundles() {
+      const harvester = this.harvesterClusters;
+
+      const bundles = this.allBundles.filter((bundle) => {
+        const targets = bundle.spec?.targets || [];
+
+        // Filter out any bundle that has one target whose cluster is a harvester cluster
+        if (targets.length === 1) {
+          return !harvester[targets[0].clusterName];
+        }
+
+        return true;
+      });
+
+      return bundles;
+    },
+  },
+  async fetch() {
+    const allDispatches = await checkSchemasForFindAllHash({
+      allBundles: {
+        inStoreType: 'management',
+        type:        FLEET.BUNDLE,
+        opt:         { excludeFields: ['metadata.managedFields', 'spec.resources'] },
+      },
+
+      allFleetClusters: {
+        inStoreType: 'management',
+        type:        FLEET.CLUSTER
+      },
+      clusterGroups: {
+        inStoreType: 'management',
+        type:        FLEET.CLUSTER_GROUP
+      }
+    }, this.$store);
+
+    if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
+      await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.USER }, { root: true });
+    }
+
+    this.allBundles = allDispatches.allBundles || [];
+    this.allFleetClusters = allDispatches.allFleetClusters || [];
+  },
+
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <div
+    v-else
+    class="mt-20"
+  >
+    <FleetSummary
+      v-if="helmOpHasClusters"
+      :value="value"
+      :bundles="bundles"
+      class="mb-20"
+    />
+    <Banner
+      v-else
+      color="info"
+      class="mb-20"
+    >
+      {{ t('fleet.fleetSummary.noClusters.helmOp') }}
+    </Banner>
+    <ResourceTabs
+      :value="value"
+      mode="view"
+      class="mt-20"
+      :need-related="false"
+      @update:value="$emit('input', $event)"
+    >
+      <Tab
+        v-if="!!allBundles.length"
+        label="Bundles"
+        name="bundles"
+        :weight="30"
+      >
+        <FleetBundles :value="value" />
+      </Tab>
+      <Tab
+        label="Resources"
+        name="resources"
+        :weight="20"
+      >
+        <FleetResources :rows="value.resourcesStatuses" />
+      </Tab>
+    </ResourceTabs>
+  </div>
+</template>