From 64590dfc2c61bf33731f9b32249cb29d86c85dd6 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 10 Apr 2025 10:26:02 +0100
Subject: [PATCH] Remove SSP performance setting enabled/disabled flag, only
 use FF

---
 shell/assets/translations/en-us.yaml          |  7 ++---
 shell/config/settings.ts                      |  1 -
 .../pages/c/_cluster/settings/performance.vue | 29 ++++---------------
 shell/types/resources/settings.d.ts           |  4 ---
 shell/utils/pagination-utils.ts               |  2 +-
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 6f3d0cef2f..53cc9f2071 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7806,15 +7806,12 @@ performance:
     authUserTTL: This timeout cannot be higher than the user session timeout auth-user-session-ttl-minutes, which is currently {current} minutes.
   serverPagination:
     label: Server-side Pagination
-    description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Change this setting to enable pagination server-side. This should help the responsiveness of the UI in systems with a lot of resources.
-    checkboxLabel: Enable Server-side Pagination
+    description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Server-Side Pagination helps the responsiveness of the UI in systems with a lot of resources.
     applicable: "Server-side pagination applies to Resource Types"
-    incompatibleDescription: "Server-side Pagination is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
-    featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
+    featureFlag: This setting is now soley controlled by the&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache`
     resources:
       generic: most resources in the cluster's 'More Resources' section
       all: All Resources
-    experimental: This setting is experimental and may be removed or updated in future versions. We do not recommend enabling this setting in production environments.
 banner:
   label: Fixed Banners
   settingName: Banners
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index ab9f1045b9..26b100db0a 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -254,7 +254,6 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
     }
   },
   serverPagination: {
-    enabled:          false,
     useDefaultStores: true,
     stores:           undefined,
   }
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 8f6d9b8156..ab236b931e 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -13,8 +13,6 @@ import { NAME as SETTING_PRODUCT } from '@shell/config/product/settings';
 import paginationUtils from '@shell/utils/pagination-utils';
 import Collapse from '@shell/components/Collapse';
 
-// TODO: RC Remove l10n references for removed incompatibles
-// TODO: RC Add supercedes notices to SSP and subcedes to incremental and manual???
 const incompatible = {
   incrementalLoading: ['forceNsFilterV2'],
   manualRefresh:      ['forceNsFilterV2'],
@@ -103,10 +101,6 @@ export default {
       return this.$store.getters['features/get'](STEVE_CACHE);
     },
 
-    steveCacheAndSSPEnabled() {
-      return this.steveCacheEnabled && this.value.serverPagination.enabled;
-    },
-
     sspApplicableResources() {
       const storeResources = [];
       const stores = paginationUtils.getStoreSettings(this.value.serverPagination);
@@ -263,27 +257,14 @@ export default {
           </h2>
           <p>{{ t('performance.serverPagination.description') }}</p>
           <Banner
-            v-if="!steveCacheEnabled"
-            v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
             color="warning"
-          />
-          <Banner
-            color="error"
-            label-key="performance.serverPagination.experimental"
-          />
-          <Checkbox
-            v-model:value="value.serverPagination.enabled"
-            :mode="mode"
-            :label="t('performance.serverPagination.checkboxLabel')"
-            class="mt-10 mb-10"
-            :primary="true"
-            :disabled="!steveCacheEnabled"
-            @update:value="compatibleWarning('serverPagination', $event)"
-          />
+          >
+            <div v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)" />
+          </Banner>
           <Collapse
             :title="t('performance.serverPagination.applicable')"
-            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
-            :isDisabled="!steveCacheAndSSPEnabled"
+            :open="steveCacheEnabled && ssPApplicableTypesOpen"
+            :isDisabled="!steveCacheEnabled"
             @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
           >
             <p
diff --git a/shell/types/resources/settings.d.ts b/shell/types/resources/settings.d.ts
index 7a2af9ee31..812a689c13 100644
--- a/shell/types/resources/settings.d.ts
+++ b/shell/types/resources/settings.d.ts
@@ -24,10 +24,6 @@ export interface PaginationSettingsStore {
  * Settings to handle server side pagination
  */
 export interface PaginationSettings {
-  /**
-   * Global setting to enable or disable
-   */
-  enabled: boolean,
   /**
    * Override `stores` and apply pagination to a set of default resource types that can change between versions
    */
diff --git a/shell/utils/pagination-utils.ts b/shell/utils/pagination-utils.ts
index b6c4f39622..f2e65bb667 100644
--- a/shell/utils/pagination-utils.ts
+++ b/shell/utils/pagination-utils.ts
@@ -62,7 +62,7 @@ class PaginationUtils {
     const settings = this.getSettings({ rootGetters });
 
     // No setting, not enabled
-    if (!settings?.enabled) {
+    if (!settings) {
       return false;
     }