Tidy up event headers

- opens up to event header e2e failures again...

cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts

@@ -18,7 +18,7 @@ describe('Workspaces', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] },
     let initialCount: number;
 
     it('check table headers are available in list and details view', () => {
-      FleetWorkspaceListPagePo.navTo();
+      fleetWorkspacesPage.goTo();
       fleetWorkspacesPage.waitForPage();
       fleetWorkspacesPage.sortableTable().noRowsShouldNotExist();
       fleetWorkspacesPage.sortableTable().filter(defaultWorkspace);

shell/components/form/ResourceTabs/index.vue

@@ -13,6 +13,9 @@ import { _VIEW } from '@shell/config/query-params';
 import RelatedResources from '@shell/components/RelatedResources';
 import { isConditionReadyAndWaiting } from '@shell/plugins/dashboard-store/resource-class';
 import { PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { MESSAGE, REASON } from '@shell/config/table-headers';
+import { STEVE_EVENT_LAST_SEEN, STEVE_EVENT_TYPE, STEVE_NAME_COL, STEVE_NAMESPACE_COL } from '@shell/config/pagination-table-headers';
+import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 
 export default {
 
@@ -70,13 +73,25 @@ export default {
 
   data() {
     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
 
     return {
-      eventSchema:    this.$store.getters[`${ inStore }/schemaFor`](EVENT), // @TODO be smarter about which resources actually ever have events
+      eventSchema,
       EVENT,
-      selectedTab:    this.defaultTab,
+      selectedTab:       this.defaultTab,
       inStore,
-      showConditions: false,
+      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,
+      ]
     };
   },
 
@@ -241,6 +256,8 @@ export default {
         :local-filter="filterRowsLocal"
         :api-filter="filterRowsApi"
         :use-query-params-for-simple-filtering="false"
+        :headers="eventHeaders"
+        :paginationHeaders="paginationHeaders"
       />
     </Tab>
 

shell/config/pagination-table-headers.js

@@ -1,5 +1,8 @@
 import {
-  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT
+  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
+  LAST_SEEN_TIME,
+  EVENT_LAST_SEEN_TIME,
+  EVENT_TYPE
 } from '@shell/config/table-headers';
 
 // This file contains table headers
@@ -52,6 +55,18 @@ export const STEVE_EVENT_OBJECT = {
   search: 'involvedObject.kind',
 };
 
+export const STEVE_EVENT_LAST_SEEN = {
+  ...EVENT_LAST_SEEN_TIME,
+  value: 'metadata.fields.0',
+  sort:  'metadata.fields.0',
+};
+
+export const STEVE_EVENT_TYPE = {
+  ...EVENT_TYPE,
+  value: '_type',
+  sort:  '_type',
+};
+
 export const STEVE_LIST_GROUPS = [{
   tooltipKey: 'resourceTable.groupBy.none',
   icon:       'icon-list-flat',

shell/config/product/explorer.js

@@ -20,12 +20,13 @@ import {
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
-  DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA
+  DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
+  EVENT_LAST_SEEN_TIME
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_EVENT_OBJECT, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_LAST_SEEN, STEVE_EVENT_OBJECT, STEVE_EVENT_TYPE, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
@@ -321,23 +322,12 @@ export function init(store) {
     ]
   );
 
-  const eventLastSeenTime = {
-    ...LAST_SEEN_TIME,
-    defaultSort: true,
-  };
-
   headers(EVENT,
-    [STATE, eventLastSeenTime, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
+    [STATE, EVENT_LAST_SEEN_TIME, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
     [
-      STEVE_STATE_COL, {
-        ...eventLastSeenTime,
-        value: 'metadata.fields.0',
-        sort:  'metadata.fields.0',
-      }, {
-        ...EVENT_TYPE,
-        value: '_type',
-        sort:  '_type',
-      },
+      STEVE_STATE_COL,
+      STEVE_EVENT_LAST_SEEN,
+      STEVE_EVENT_TYPE,
       REASON,
       STEVE_EVENT_OBJECT,
       'Subobject',

shell/config/table-headers.js

@@ -515,6 +515,12 @@ export const LAST_SEEN_TIME = {
   sort:     'lastTimestamp:desc',
   tooltip:  'tableHeaders.lastSeenTooltip'
 };
+
+export const EVENT_LAST_SEEN_TIME = {
+  ...LAST_SEEN_TIME,
+  defaultSort: true,
+};
+
 export const LAST_HEARTBEAT_TIME = {
   name:      'lastHeartbeatTime',
   labelKey:  'tableHeaders.lastSeen',