Pagination Updates

shell/assets/translations/en-us.yaml

@@ -7356,7 +7356,7 @@ performance:
     checkboxLabel: Enable Server-side Pagination
     applicable: "This applies to the following resource types"
     incompatibleDescription: "Server-side Pagination is incomaptible with Manual Refresh and Incremental Loading. Enabling this will disable them."
-    featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`on-disk-steve-cache` must be enabled to use this feature
+    featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
     resources:
       generic: most resources in the cluster's 'More Resources' section
       all: All Resources

shell/config/product/explorer.js

@@ -4,7 +4,6 @@ import {
   EVENT,
   NODE, SECRET, INGRESS,
   WORKLOAD, WORKLOAD_TYPES, SERVICE, HPA, NETWORK_POLICY, PV, PVC, STORAGE_CLASS, POD, POD_DISRUPTION_BUDGET, LIMIT_RANGE, RESOURCE_QUOTA,
-  RBAC,
   MANAGEMENT,
   NAMESPACE,
   NORMAN,
@@ -341,19 +340,6 @@ export function init(store) {
   }, AGE]);
   headers(STORAGE_CLASS, [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE]);
 
-  headers(RBAC.ROLE, [
-    STATE,
-    NAME_COL,
-    NAMESPACE_COL,
-    AGE
-  ]);
-
-  headers(RBAC.CLUSTER_ROLE, [
-    STATE,
-    NAME_COL,
-    AGE,
-  ]);
-
   configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, {
     listGroups: [
       {

shell/pages/c/_cluster/settings/performance.vue

@@ -198,6 +198,35 @@ export default {
     </h1>
     <div>
       <div class="ui-perf-setting">
+        <!-- Server Side Pagination -->
+        <div class="mt-40">
+          <h2>{{ t('performance.serverPagination.label') }}</h2>
+          <p>{{ t('performance.serverPagination.description') }}</p>
+          <Banner
+            color="error"
+            label-key="performance.experimental"
+          />
+          <Banner
+            v-if="!steveCacheEnabled"
+            v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
+            color="warning"
+          />
+          <Checkbox
+            v-model="value.serverPagination.enabled"
+            :mode="mode"
+            :label="t('performance.serverPagination.checkboxLabel')"
+            class="mt-10 mb-20"
+            :primary="true"
+            :disabled="(!steveCacheEnabled && !value.serverPagination.enabled)"
+            @input="compatibleWarning('serverPagination', $event)"
+          />
+          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
+            {{ t('performance.serverPagination.applicable') }}
+          </p>
+          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
+            {{ steveCacheApplicableResources }}
+          </p>
+        </div>
         <!-- Inactivity -->
         <div class="mt-20">
           <h2>{{ t('performance.inactivity.title') }}</h2>
@@ -377,35 +406,6 @@ export default {
             </div>
           </div>
         </div>
-        <!-- Server Side Pagination -->
-        <div class="mt-40">
-          <h2>{{ t('performance.serverPagination.label') }}</h2>
-          <p>{{ t('performance.serverPagination.description') }}</p>
-          <Banner
-            color="error"
-            label-key="performance.experimental"
-          />
-          <Banner
-            v-if="!steveCacheEnabled"
-            v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
-            color="warning"
-          />
-          <Checkbox
-            v-model="value.serverPagination.enabled"
-            :mode="mode"
-            :label="t('performance.serverPagination.checkboxLabel')"
-            class="mt-10 mb-20"
-            :primary="true"
-            :disabled="(!steveCacheEnabled && !value.serverPagination.enabled)"
-            @input="compatibleWarning('serverPagination', $event)"
-          />
-          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
-            {{ t('performance.serverPagination.applicable') }}
-          </p>
-          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
-            {{ steveCacheApplicableResources }}
-          </p>
-        </div>
         <!-- Force NS filter -->
         <div class="mt-40">
           <h2>{{ t('performance.nsFiltering.label') }}</h2>

shell/plugins/steve/steve-pagination-utils.ts

@@ -329,7 +329,7 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       checked: new Array<string>(),
       invalid: new Array<string>(),
     };
-    const res = filters
+    const filterStrings = filters
       .filter((filter) => !!filter.fields.length)
       .map((filter) => {
         const joined = filter.fields
@@ -348,7 +348,14 @@ class StevePaginationUtils extends NamespaceProjectFilters {
           .join(','); // This means OR
 
         return `${ filter.param }${ filter.equals ? '=' : '!=' }${ joined }`;
-      }).join('&'); // This means AND
+      });
+    const unique = filterStrings.reduce((res, s) => {
+      res[s] = true;
+
+      return res;
+    }, { } as {[filterString: string] : boolean });
+
+    const res = Object.keys(unique).join('&'); // This means AND
 
     if (validateFields.invalid.length) {
       console.warn(`Pagination API does not support filtering '${ schema.id }' by the requested fields: ${ uniq(validateFields.invalid).join(', ') }`); // eslint-disable-line no-console

shell/store/type-map.utils.ts

@@ -105,7 +105,7 @@ export function createHeaders(
   }
 
   // Age always goes last
-  const ageColumnActual = out.find((o) => o.name === 'Age');
+  const ageColumnActual = out.find((o) => o.name.toLocaleLowerCase() === 'age');
 
   if ( ageColumnActual ) {
     removeObject(out, ageColumnActual);