Merge pull request #13478 from torchiaf/13477-event-schema

Add Event schema null checks
rancher · Feb 26, 2025 · 753469f · 753469f
2 parents b3d7079 + 68e9820
commit 753469f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
@@ -75,23 +75,25 @@ export default {
     const inStore = this.$store.getters['currentStore'](EVENT);
     const eventSchema = this.$store.getters[`${ inStore }/schemaFor`](EVENT); // @TODO be smarter about which resources actually ever have events
 
+    const paginationHeaders = eventSchema ? [
+      STEVE_EVENT_LAST_SEEN,
+      STEVE_EVENT_TYPE,
+      REASON,
+      headerFromSchemaColString('Subobject', eventSchema, this.$store.getters, true),
+      headerFromSchemaColString('Source', eventSchema, this.$store.getters, true),
+      MESSAGE,
+      headerFromSchemaColString('First Seen', eventSchema, this.$store.getters, true),
+      headerFromSchemaColString('Count', eventSchema, this.$store.getters, true),
+      STEVE_NAME_COL,
+    ] : [];
+
     return {
       eventSchema,
       EVENT,
-      selectedTab:       this.defaultTab,
+      selectedTab:    this.defaultTab,
       inStore,
-      showConditions:    false,
-      paginationHeaders: [
-        STEVE_EVENT_LAST_SEEN,
-        STEVE_EVENT_TYPE,
-        REASON,
-        headerFromSchemaColString('Subobject', eventSchema, this.$store.getters, true),
-        headerFromSchemaColString('Source', eventSchema, this.$store.getters, true),
-        MESSAGE,
-        headerFromSchemaColString('First Seen', eventSchema, this.$store.getters, true),
-        headerFromSchemaColString('Count', eventSchema, this.$store.getters, true),
-        STEVE_NAME_COL,
-      ]
+      showConditions: false,
+      paginationHeaders
     };
   },
 

diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -35,7 +35,7 @@ export default {
 
     const schema = this.$store.getters['cluster/schemaFor'](EVENT);
 
-    const paginationHeaders = [
+    const paginationHeaders = schema ? [
       reason,
       STEVE_EVENT_OBJECT,
       MESSAGE,
@@ -49,7 +49,7 @@ export default {
         defaultSort: true,
       },
       headerFromSchemaColString('Count', schema, this.$store.getters, true),
-    ];
+    ] : [];
 
     return {
       schema,
@@ -88,6 +88,7 @@ export default {
 
 <template>
   <PaginatedResourceTable
+    v-if="!!schema"
     :schema="schema"
     :headers="eventHeaders"
     :pagination-headers="paginationHeaders"

diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
@@ -123,6 +123,10 @@ export function createHeaders(
  * Given a schema's attribute.column value create a header
  */
 export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
+  if (!schema) {
+    throw new Error(`Unable to create header for column '${ colName }' from schema: schema is missing`);
+  }
+
   const col = schema.attributes.columns.find((c) => c.name === colName);
 
   if (!col) {