Fixes from #15489

Author: rhamilto

frontend/packages/console-app/src/components/data-view/ResourceDataView.tsx

@@ -144,7 +144,7 @@ export const ResourceDataView = <
       );
     }
 
-    if (!hideNameLabelFilters && !hideLabelFilter) {
+    if (!hideNameLabelFilters && !hideLabelFilter && loaded) {
       basicFilters.push(
         <DataViewLabelFilter key="label" filterId="label" title={t('public~Label')} data={data} />,
       );
@@ -156,7 +156,7 @@ export const ResourceDataView = <
 
     // Can't use data in the deps array as it will recompute the filters and will cause the selected category to reset
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [additionalFilterNodes, t]);
+  }, [additionalFilterNodes, t, loaded]);
 
   return mock ? (
     <EmptyBox label={label} />

frontend/packages/console-app/src/components/data-view/useResourceDataViewData.tsx

@@ -76,42 +76,35 @@ export const useResourceDataViewData = <
 
   const dataViewColumns = React.useMemo<ResourceDataViewColumn<TData>[]>(
     () =>
-      activeColumns.map(
-        (
-          { id, title, sort, props: { classes, isStickyColumn, stickyMinWidth, modifier } },
-          index,
-        ) => {
-          const headerProps: ThProps = {
-            className: classes,
-            isStickyColumn,
-            stickyMinWidth,
-            modifier,
+      activeColumns.map(({ id, title, sort, props }, index) => {
+        const headerProps: ThProps = {
+          ...props,
+          dataLabel: title,
+        };
+
+        if (sort) {
+          headerProps.sort = {
+            columnIndex: index,
+            sortBy: {
+              index: 0,
+              direction: SortByDirection.asc,
+              defaultDirection: SortByDirection.asc,
+            },
           };
-
-          if (sort) {
-            headerProps.sort = {
-              columnIndex: index,
-              sortBy: {
-                index: 0,
-                direction: SortByDirection.asc,
-                defaultDirection: SortByDirection.asc,
-              },
-            };
-          }
-
-          return {
-            id,
-            title,
-            sortFunction: sort,
-            props: headerProps,
-            cell: title ? (
-              <span>{title}</span>
-            ) : (
-              <span className="pf-v6-u-screen-reader">{t('public~Actions')}</span>
-            ),
-          };
-        },
-      ),
+        }
+
+        return {
+          id,
+          title,
+          sortFunction: sort,
+          props: headerProps,
+          cell: title ? (
+            <span>{title}</span>
+          ) : (
+            <span className="pf-v6-u-screen-reader">{t('public~Actions')}</span>
+          ),
+        };
+      }),
     [activeColumns, t],
   );
 

frontend/public/components/workload-table.tsx

@@ -239,6 +239,7 @@ export const useWorkloadColumns = <T extends K8sResourceKind>(): TableColumn<T>[
         sort: 'metadata.labels',
         props: {
           modifier: 'nowrap',
+          width: 20,
         },
       },
       {
@@ -247,6 +248,7 @@ export const useWorkloadColumns = <T extends K8sResourceKind>(): TableColumn<T>[
         sort: 'spec.selector',
         props: {
           modifier: 'nowrap',
+          width: 20,
         },
       },
       {