Remove SSP performance setting enabled/disabled flag, only use FF

This commit is contained in:
Richard Cox 2025-04-10 10:26:02 +01:00
parent f0638e8aab
commit 64590dfc2c
5 changed files with 8 additions and 35 deletions

View File

@ -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. authUserTTL: This timeout cannot be higher than the user session timeout auth-user-session-ttl-minutes, which is currently {current} minutes.
serverPagination: serverPagination:
label: Server-side Pagination 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. 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.
checkboxLabel: Enable Server-side Pagination
applicable: "Server-side pagination applies to Resource Types" 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: This setting is now soley controlled by the&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache`
featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
resources: resources:
generic: most resources in the cluster's 'More Resources' section generic: most resources in the cluster's 'More Resources' section
all: All Resources 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: banner:
label: Fixed Banners label: Fixed Banners
settingName: Banners settingName: Banners

View File

@ -254,7 +254,6 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
} }
}, },
serverPagination: { serverPagination: {
enabled: false,
useDefaultStores: true, useDefaultStores: true,
stores: undefined, stores: undefined,
} }

View File

@ -13,8 +13,6 @@ import { NAME as SETTING_PRODUCT } from '@shell/config/product/settings';
import paginationUtils from '@shell/utils/pagination-utils'; import paginationUtils from '@shell/utils/pagination-utils';
import Collapse from '@shell/components/Collapse'; 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 = { const incompatible = {
incrementalLoading: ['forceNsFilterV2'], incrementalLoading: ['forceNsFilterV2'],
manualRefresh: ['forceNsFilterV2'], manualRefresh: ['forceNsFilterV2'],
@ -103,10 +101,6 @@ export default {
return this.$store.getters['features/get'](STEVE_CACHE); return this.$store.getters['features/get'](STEVE_CACHE);
}, },
steveCacheAndSSPEnabled() {
return this.steveCacheEnabled && this.value.serverPagination.enabled;
},
sspApplicableResources() { sspApplicableResources() {
const storeResources = []; const storeResources = [];
const stores = paginationUtils.getStoreSettings(this.value.serverPagination); const stores = paginationUtils.getStoreSettings(this.value.serverPagination);
@ -263,27 +257,14 @@ export default {
</h2> </h2>
<p>{{ t('performance.serverPagination.description') }}</p> <p>{{ t('performance.serverPagination.description') }}</p>
<Banner <Banner
v-if="!steveCacheEnabled"
v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
color="warning" color="warning"
/> >
<Banner <div v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)" />
color="error" </Banner>
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)"
/>
<Collapse <Collapse
:title="t('performance.serverPagination.applicable')" :title="t('performance.serverPagination.applicable')"
:open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen" :open="steveCacheEnabled && ssPApplicableTypesOpen"
:isDisabled="!steveCacheAndSSPEnabled" :isDisabled="!steveCacheEnabled"
@update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen" @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
> >
<p <p

View File

@ -24,10 +24,6 @@ export interface PaginationSettingsStore {
* Settings to handle server side pagination * Settings to handle server side pagination
*/ */
export interface PaginationSettings { 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 * Override `stores` and apply pagination to a set of default resource types that can change between versions
*/ */

View File

@ -62,7 +62,7 @@ class PaginationUtils {
const settings = this.getSettings({ rootGetters }); const settings = this.getSettings({ rootGetters });
// No setting, not enabled // No setting, not enabled
if (!settings?.enabled) { if (!settings) {
return false; return false;
} }