From 3471b49832a5e264931362dc1c3ba82911d07911 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 20:29:33 +0100
Subject: [PATCH 1/3] Add Event schema null checks

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/form/ResourceTabs/index.vue  | 28 ++++++++++---------
 .../pages/c/_cluster/explorer/EventsTable.vue |  5 ++--
 shell/store/type-map.utils.ts                 |  4 +++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index e80d5344a02..ee627f97158 100644
--- 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
index 01cfa54cd1b..5321b75566d 100644
--- 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
index 74343e0c859..ffe8ec88c25 100644
--- 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(`Schema is null`);
+  }
+  
   const col = schema.attributes.columns.find((c) => c.name === colName);
 
   if (!col) {

From 2a3e9ebc1639e87cb3cf37f3095cc2480d654464 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 12:28:11 +0100
Subject: [PATCH 2/3] Update shell/store/type-map.utils.ts

Co-authored-by: Richard Cox <18697775+richard-cox@users.noreply.github.com>
---
 shell/store/type-map.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index ffe8ec88c25..3e4fe507ac6 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -124,7 +124,7 @@ export function createHeaders(
  */
 export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
   if (!schema) {
-    throw new Error(`Schema is null`);
+    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);

From 68e982012d352c21d3e73e17ec8082f97de0a94c Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 12:38:01 +0100
Subject: [PATCH 3/3] Lint

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/store/type-map.utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index 3e4fe507ac6..79c34311511 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -124,9 +124,9 @@ export function createHeaders(
  */
 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`);
+    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) {