dashboard-shell-shell 1.0.122 → 1.0.1000000082

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

@@ -19,17 +19,15 @@ export default {
   mixins: [ResourceManager],
 
   data() {
-    const actions = [
-      {
-        action:  'showCatalogUninstallDialog',
-        label:   this.t('plugins.uninstall.label'),
-        icon:    'icon icon-trash',
-        enabled: true,
-      }
-    ];
-
     return {
-      actions,
+      actions: [
+        {
+          action:  'showCatalogUninstallDialog',
+          label:   this.t('plugins.uninstall.label'),
+          icon:    'icon icon-trash',
+          enabled: true,
+        }
+      ],
       catalogHeaders: UI_PLUGIN_CATALOG,
     };
   },

package/pages/diagnostic.vue

@@ -17,6 +17,7 @@ export default {
     const finalCounts = [];
     const promises = [];
     const topFifteenForResponseTime = [];
+    const schemaPromises = [];
 
     clusterForCounts.forEach((cluster, i) => {
       // Necessary to retrieve the proper display name of the cluster
@@ -31,9 +32,11 @@ export default {
         isTableVisible: !!(i === 0 && clusterForCounts.length === 1)
       });
       promises.push(this.$store.dispatch('management/request', { url: `/k8s/clusters/${ cluster.mgmt?.id }/v1/counts` }));
+      schemaPromises.push(this.$store.dispatch('management/request', { url: `/k8s/clusters/${ cluster.mgmt?.id }/v1/schemas?exclude=metadata.managedFields` }));
     });
 
     const countsPerCluster = await Promise.all(promises);
+    const schemasPerCluster = await Promise.all(schemaPromises);
 
     countsPerCluster.forEach((clusterCount, index) => {
       const counts = clusterCount.data?.[0]?.counts;
@@ -69,9 +72,27 @@ export default {
 
     this.topFifteenForResponseTime = topFifteenForResponseTime;
     this.finalCounts = finalCounts;
+
+    // Schemas
+    schemasPerCluster.forEach((schemas, index) => {
+      finalCounts[index].schemaCount = schemas?.data?.length || 0;
+      finalCounts[index].customSchemas = (schemas?.data?.filter((schema) => {
+        return schema.attributes?.group.includes('.') && !schema.attributes?.group.includes('.cattle.io') && !schema.attributes?.group.includes('.k8s.io');
+      }).map((schema) => schema.id) || []).sort();
+    });
   },
 
   data() {
+    return {
+      systemInformation:         null,
+      topFifteenForResponseTime: null,
+      responseTimes:             null,
+      finalCounts:               null,
+      includeResponseTimes:      true,
+    };
+  },
+
+  created() {
     const {
       userAgent,
       userAgentData,
@@ -118,14 +139,7 @@ export default {
       systemInformation.jsMemory.value += `, ${ this.t('about.diagnostic.systemInformation.memUsedJsHeapSize', { usedJSHeapSize: window?.performance?.memory?.usedJSHeapSize }) }`;
     }
 
-    return {
-      systemInformation,
-      topFifteenForResponseTime: null,
-      responseTimes:             null,
-      finalCounts:               null,
-      includeResponseTimes:      true,
-      storeMapping:              this.$store?._modules?.root?.state,
-    };
+    this.systemInformation = systemInformation;
   },
 
   computed: {
@@ -146,9 +160,9 @@ export default {
       const fileName = 'rancher-diagnostic-data.json';
       const data = {
         systemInformation: this.systemInformation,
-        storeMapping:      this.parseStoreData(this.storeMapping),
+        storeMapping:      this.parseStoreData(this.$store?._modules?.root?.state),
         resourceCounts:    this.finalCounts,
-        responseTimes:     this.responseTimes
+        responseTimes:     this.responseTimes,
       };
 
       downloadFile(fileName, JSON.stringify(data), 'application/json')
@@ -352,6 +366,7 @@ export default {
                   <span>Cluster: <b>{{ cluster.name }}</b></span>
                   <span>Namespace: <b>{{ cluster.namespace }}</b></span>
                   <span>Total Resources: <b>{{ sumResourceCount(cluster.counts) }}</b></span>
+                  <span>Total Schemas: <b>{{ cluster.schemaCount }}</b></span>
                   <span>Nodes: <b>{{ nodeCount(cluster.counts) }}</b></span>
                   <i
                     class="icon"
@@ -365,6 +380,22 @@ export default {
             </tr>
           </thead>
           <tbody v-show="cluster.isTableVisible">
+            <tr>
+              <td colspan="3">
+                <div class="schema-title">
+                  Custom Schemas
+                </div>
+                <div class="custom-schemas">
+                  <div
+                    v-for="name in cluster.customSchemas"
+                    :key="name"
+                    class="schema-name"
+                  >
+                    {{ name }}
+                  </div>
+                </div>
+              </td>
+            </tr>
             <tr>
               <th>
                 Resource
@@ -445,6 +476,23 @@ table {
     padding: 8px 5px;
     min-width: 150px;
     text-align: left;
+
+    .schema-title {
+      font-weight: bold;
+      margin-bottom: 4px;
+    }
+
+    .custom-schemas {
+      display: flex;
+      flex-wrap: wrap;
+
+      > .schema-name {
+        margin-right: 5px;
+        margin-bottom: 2px;
+        border: 1px solid var(--border);
+        padding: 2px 5px;
+      }
+    }
   }
 
   th {
@@ -511,7 +559,7 @@ table {
 .resources-count-container {
   .cluster-row {
     display: grid;
-    grid-template-columns: repeat(4, 1fr) 20px;
+    grid-template-columns: repeat(5, 1fr) 20px;
     grid-template-rows: 1fr;
     align-content: center;
     font-weight: normal;

package/pages/fail-whale.vue

@@ -17,17 +17,19 @@ export default {
   mixins: [Brand, BrowserTabVisibility],
 
   data() {
+    return {
+      previousRoute: '',
+      styles:        { '--custom-content': `'${ this.t('nav.failWhale.separator') }'` }
+    };
+  },
+
+  created() {
     const store = this.$store;
 
     if (!store.state.error && !store.state.cameFromError) {
       store.commit('cameFromError');
       this.$router.replace('/');
     }
-
-    return {
-      previousRoute: '',
-      styles:        { '--custom-content': `'${ this.t('nav.failWhale.separator') }'` }
-    };
   },
 
   computed: {
@@ -70,12 +72,15 @@ export default {
         :simple="true"
       />
 
-      <main class="main-layout">
+      <main
+        class="main-layout"
+        aria-label="Fail whale layout"
+      >
         <div
           v-if="error"
           class="outlet"
         >
-          <main class="main-layout error">
+          <div class="main-layout error">
             <div class="text-center">
               <BrandImage
                 file-name="error-desert-landscape.svg"
@@ -105,6 +110,7 @@ export default {
               <hr
                 class="custom-content"
                 :style="styles"
+                role="none"
               >
               <p class="mt-20">
                 <a
@@ -115,7 +121,7 @@ export default {
                 </a>
               </p>
             </div>
-          </main>
+          </div>
         </div>
       </main>
     </div>

package/pages/home.vue

@@ -49,6 +49,21 @@ export default defineComponent({
   mixins: [PageHeaderActions],
 
   data() {
+    const options = this.$store.getters[`type-map/optionsFor`](CAPI.RANCHER_CLUSTER)?.custom || {};
+    const params = {
+      product:  MANAGER,
+      cluster:  BLANK_CLUSTER,
+      resource: CAPI.RANCHER_CLUSTER
+    };
+    const defaultCreateLocation = {
+      name: 'c-cluster-product-resource-create',
+      params,
+    };
+    const defaultImportLocation = {
+      ...defaultCreateLocation,
+      query: { [MODE]: _IMPORT }
+    };
+
     return {
       HIDE_HOME_PAGE_CARDS,
       fullVersion: getVersionInfo(this.$store).fullVersion,
@@ -87,24 +102,9 @@ export default defineComponent({
         },
       },
 
-      createLocation: {
-        name:   'c-cluster-product-resource-create',
-        params: {
-          product:  MANAGER,
-          cluster:  BLANK_CLUSTER,
-          resource: CAPI.RANCHER_CLUSTER
-        },
-      },
+      createLocation: options.createLocation ? options.createLocation(params) : defaultCreateLocation,
 
-      importLocation: {
-        name:   'c-cluster-product-resource-create',
-        params: {
-          product:  MANAGER,
-          cluster:  BLANK_CLUSTER,
-          resource: CAPI.RANCHER_CLUSTER
-        },
-        query: { [MODE]: _IMPORT }
-      },
+      importLocation: options.importLocation ? options.importLocation(params) : defaultImportLocation,
 
       headers: [
         STATE,
@@ -512,7 +512,7 @@ export default defineComponent({
       :show-child="false"
       :breadcrumb="false"
     >
-      {{ vendor }}
+      {{ `${vendor} - ${t('landing.homepage')}` }}
     </TabTitle>
     <BannerGraphic
       :small="true"
@@ -805,6 +805,12 @@ export default defineComponent({
     .cluster-name {
       display: flex;
       align-items: center;
+
+      // Ensure long cluster names truncate with ellipsis
+      > A {
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
 
     .cluster-description {

package/pages/prefs.vue

@@ -17,6 +17,8 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { addObject } from '@shell/utils/array';
 import LocaleSelector from '@shell/components/LocaleSelector';
 import TabTitle from '@shell/components/TabTitle';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   components: {
@@ -43,7 +45,7 @@ export default {
     ...mapGetters({ hasMultipleLocales: 'i18n/hasMultipleLocales' }),
 
     isHarvester() {
-      return this.isSingleProduct?.productName === 'harvester';
+      return this.isSingleProduct?.productName === harvester2cloud(HARVESTER);
     },
 
     theme: {
@@ -225,7 +227,7 @@ export default {
       v-if="!isSingleProduct"
       class="mt-10 mb-10"
     >
-      <hr>
+      <hr role="none">
       <h4 v-t="'prefs.landing.label'" />
       <LandingPagePreference
         data-testid="prefs__landingPagePreference"
@@ -233,7 +235,7 @@ export default {
     </div>
     <!-- Display Settings -->
     <div class="mt-10 mb-10">
-      <hr>
+      <hr role="none">
       <h4 v-t="'prefs.displaySettings.title'" />
       <p class="set-landing-leadin">
         {{ t('prefs.displaySettings.detail', {}, raw=true) }}
@@ -277,7 +279,7 @@ export default {
       v-if="!isSingleProduct"
       class="col adv-features mt-10 mb-10"
     >
-      <hr>
+      <hr role="none">
       <h4 v-t="'prefs.confirmationSetting.title'" />
       <Checkbox
         v-model:value="scalingDownPrompt"
@@ -288,7 +290,7 @@ export default {
     </div>
     <!-- Advanced Features -->
     <div class="col adv-features mt-10 mb-10">
-      <hr>
+      <hr role="none">
       <h4 v-t="'prefs.advFeatures.title'" />
       <Checkbox
         v-model:value="viewInApi"
@@ -331,7 +333,7 @@ export default {
     </div>
     <!-- YAML editor key mapping -->
     <div class="col mt-10 mb-10">
-      <hr>
+      <hr role="none">
       <h4 v-t="'prefs.keymap.label'" />
       <ButtonGroup
         v-model:value="keymap"
@@ -344,7 +346,7 @@ export default {
       v-if="!isSingleProduct"
       class="col mt-10 mb-40"
     >
-      <hr>
+      <hr role="none">
       <h4 v-t="'prefs.helm.label'" />
       <ButtonGroup
         v-model:value="showPreRelease"

package/pages/support/index.vue

@@ -118,7 +118,10 @@ export default {
 </script>
 <template>
   <div>
-    <BannerGraphic :title="t(title, {}, true)" />
+    <BannerGraphic
+      :title="t(title, {}, true)"
+      :alt="t('support.bannerImage')"
+    />
 
     <IndentedPanel>
       <div class="content mt-20">

package/pkg/tsconfig.json

@@ -27,25 +27,25 @@
     ],
     "paths": {
       "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
+        "../../node_modules/dashboard-shell-shell/core/*"
       ],
       "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+        "../../node_modules/dashboard-shell-shell/config/*"
       ],
       "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+        "../../node_modules/dashboard-shell-shell/store/*"
       ],
       "@shell/plugins/*": [
-        "../../node_modules/@rancher/shell/plugins/*"
+        "../../node_modules/dashboard-shell-shell/plugins/*"
       ],
       "@shell/utils/*": [
-        "../../node_modules/@rancher/shell/utils/*"
+        "../../node_modules/dashboard-shell-shell/utils/*"
       ],
       "@shell/models/*": [
-        "../../node_modules/@rancher/shell/models/*"
+        "../../node_modules/dashboard-shell-shell/models/*"
       ],
       "@shell/mixins/*": [
-        "../../node_modules/@rancher/shell/mixins/*"
+        "../../node_modules/dashboard-shell-shell/mixins/*"
       ],
       "@pkg/*": [
         "./*"
@@ -56,8 +56,8 @@
     "**/*.ts",
     "**/*.tsx",
     "**/*.vue",
-    "../../node_modules/@rancher/shell/types/*.d.ts",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "../../node_modules/dashboard-shell-shell/types/*.d.ts",
+    "../../node_modules/dashboard-shell-shell/core/types.ts"
   ],
   "exclude": [
     "node_modules"

package/pkg/vue.config.js

@@ -117,7 +117,7 @@ module.exports = function(dir) {
         if (p.use) {
           p.use.forEach((u) => {
             if (u.loader.includes('babel-loader')) {
-              p.exclude = /node_modules\/(?!@rancher\/shell\/).*/;
+              p.exclude = /node_modules\/(?!dashboard-shell-shell\/).*/;
             }
           });
         }

package/plugins/dashboard-store/normalize.js

@@ -2,6 +2,8 @@ import { SCHEMA } from '@shell/config/types';
 
 import { applyChangeset, changeset, changesetConflicts } from '@shell/utils/object';
 
+import { cloud2harvesterhci } from '@shell/utils/router'
+
 export const KEY_FIELD_FOR = {
   [SCHEMA]: '_id',
   default:  'id',
@@ -14,7 +16,7 @@ export function keyFieldFor(type) {
 export function normalizeType(type) {
   type = (type?.type || type || '').toLowerCase();
 
-  return type;
+  return cloud2harvesterhci(type);
 }
 
 // Detect and resolve conflicts from a 409 response.

package/plugins/dashboard-store/resource-class.js

@@ -34,6 +34,7 @@ import { markRaw } from 'vue';
 
 import { ExtensionPoint, ActionLocation } from '@shell/core/types';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 export const DNS_LIKE_TYPES = ['dnsLabel', 'dnsLabelRestricted', 'hostname'];
 
@@ -896,42 +897,42 @@ export default class Resource {
       {
         action:  this.canUpdate ? 'goToEdit' : 'goToViewConfig',
         label:   this.t(this.canUpdate ? 'action.edit' : 'action.view'),
-        icon:    'icon icon-edit',
+        // icon:    'icon icon-edit',
         enabled: this.canCustomEdit,
       },
-      {
-        action:  this.canEditYaml ? 'goToEditYaml' : 'goToViewYaml',
-        label:   this.t(this.canEditYaml ? 'action.editYaml' : 'action.viewYaml'),
-        icon:    'icon icon-file',
-        enabled: this.canYaml,
-      },
+      // {
+      //   action:  this.canEditYaml ? 'goToEditYaml' : 'goToViewYaml',
+      //   label:   this.t(this.canEditYaml ? 'action.editYaml' : 'action.viewYaml'),
+      //   icon:    'icon icon-file',
+      //   enabled: this.canYaml,
+      // },
       {
         action:  (this.canCustomEdit ? 'goToClone' : 'cloneYaml'),
         label:   this.t('action.clone'),
-        icon:    'icon icon-copy',
-        enabled: this.canClone && this.canCreate && (this.canCustomEdit || this.canYaml),
-      },
-      { divider: true },
-      {
-        action:     'download',
-        label:      this.t('action.download'),
-        icon:       'icon icon-download',
-        bulkable:   true,
-        bulkAction: 'downloadBulk',
-        enabled:    this.canYaml,
-        weight:     -9,
-      },
-      {
-        action:  'viewInApi',
-        label:   this.t('action.viewInApi'),
-        icon:    'icon icon-external-link',
-        enabled: this.canViewInApi,
+        // icon:    'icon icon-copy',
+        enabled: this.canClone && this.canCreate && (this.canCustomEdit || this.canYaml)&& this.schema.id!=='event',
       },
+      // { divider: true },
+      // {
+      //   action:     'download',
+      //   label:      this.t('action.download'),
+      //   icon:       'icon icon-download',
+      //   bulkable:   true,
+      //   bulkAction: 'downloadBulk',
+      //   enabled:    this.canYaml,
+      //   weight:     -9,
+      // },
+      // {
+      //   action:  'viewInApi',
+      //   label:   this.t('action.viewInApi'),
+      //   icon:    'icon icon-external-link',
+      //   enabled: this.canViewInApi,
+      // },
       {
         action:     'promptRemove',
         altAction:  'remove',
         label:      this.t('action.remove'),
-        icon:       'icon icon-trash',
+        // icon:       'icon icon-trash',
         bulkable:   true,
         enabled:    this.canDelete,
         bulkAction: 'promptRemove',
@@ -1269,7 +1270,7 @@ export default class Resource {
       params: {
         product:  this.$rootGetters['productId'],
         cluster:  this.$rootGetters['clusterId'],
-        resource: this.type,
+        resource: harvesterhci2cloud(this.type),
       }
     };
   }
@@ -1284,7 +1285,7 @@ export default class Resource {
       params: {
         product:   this.$rootGetters['productId'],
         cluster:   this.$rootGetters['clusterId'],
-        resource:  this.type,
+        resource:  harvesterhci2cloud(this.type),
         namespace: this.metadata?.namespace,
         id,
       }
@@ -1292,7 +1293,8 @@ export default class Resource {
   }
 
   get detailLocation() {
-    return this._detailLocation;
+    let location = this._detailLocation;
+    return location;
   }
 
   goToDetail() {

package/plugins/internal-api/index.ts

@@ -0,0 +1,37 @@
+import { Store } from 'vuex';
+
+interface PluginContext {
+  store: Store<any>;
+  [key: string]: any;
+}
+
+export default function(context: PluginContext, inject: (key: string, value: any) => void) {
+  const { store } = context;
+
+  // Load all API modules
+  const apiContext = (require as any).context(
+    '@shell/plugins/internal-api', // the base directory
+    true, // whether to search subdirectories
+    /\.api\.ts$/ // only .api.ts files
+  );
+
+  apiContext.keys().forEach((relativePath: string) => {
+    const mod = apiContext(relativePath);
+    const ApiClass = mod.default;
+
+    if (typeof ApiClass === 'function') {
+      // Check for a static `apiName` property, or fallback to filename
+      let apiName: string = ApiClass.apiName();
+
+      if (!apiName) {
+        // fallback to filename (strip leading ‘./’ and extension)
+        apiName = `$${ relativePath.replace(/^\.\//, '').replace(/\.\w+$/, '') }`;
+      }
+
+      const instance = new ApiClass(store);
+
+      // The inject() method automatically adds the `$` prefix
+      inject(apiName, instance);
+    }
+  });
+}

package/plugins/internal-api/shared/base-api.ts

@@ -0,0 +1,13 @@
+export abstract class BaseApi {
+  // The Vuex store, available to all API classes
+  protected $store: any;
+
+  // Documented requirement: each API should define its static apiName.
+  static apiName(): string {
+    throw new Error('apiName() static method has not been implemented');
+  }
+
+  constructor(store: any) {
+    this.$store = store;
+  }
+}