Fix e2e + lint

rancher · Jan 20, 2025 · d42522c · d42522c
1 parent d9b64f8
commit d42522c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/.../pages/global-settings/peformance.spec.ts → ...pages/global-settings/performance.spec.ts b/.../pages/global-settings/peformance.spec.ts → ...pages/global-settings/performance.spec.ts
@@ -169,7 +169,7 @@ describe('Performance', { testIsolation: 'off', tags: ['@globalSettings', '@admi
     performancePage.namespaceFilteringCheckbox().set();
 
     performancePage.incompatibleModal().getBody().contains('Required Namespace / Project Filtering is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them.');
-    performancePage.incompatibleModal().submit('Enable');
+    performancePage.incompatibleModal().submit('Continue');
     performancePage.namespaceFilteringCheckbox().isChecked();
     performancePage.applyAndWait('forceNsFilterV2-true').then(({ request, response }) => {
       expect(response?.statusCode).to.eq(200);

diff --git a/cypress/e2e/tests/priority/vai-setup.spec.ts b/cypress/e2e/tests/priority/vai-setup.spec.ts
@@ -34,7 +34,7 @@ describe('Setup Vai', { testIsolation: 'off', tags: ['@vai', '@adminUser'] }, ()
     performancePage.serverSidePaginationCheckbox().set();
 
     performancePage.incompatibleModal().checkVisible();
-    performancePage.incompatibleModal().submit('Enable');
+    performancePage.incompatibleModal().submit('Continue');
 
     performancePage.serverSidePaginationCheckbox().isChecked();
 

diff --git a/shell/config/settings.ts b/shell/config/settings.ts
@@ -1,16 +1,6 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import {
-  CAPI, MANAGEMENT, EVENT, CATALOG, HPA, INGRESS, SERVICE,
-  CONFIG_MAP,
-  SECRET,
-  POD, NODE,
-  STORAGE_CLASS,
-  PVC,
-  PV,
-  WORKLOAD_TYPES
-} from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,

diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
@@ -11,7 +11,6 @@ import UnitInput from '@shell/components/form/UnitInput';
 import { STEVE_CACHE } from '@shell/store/features';
 import { NAME as SETTING_PRODUCT } from '@shell/config/product/settings';
 import paginationUtils from '@shell/utils/pagination-utils';
-import { isDevBuild } from '@shell/utils/version';
 
 const incompatible = {
   incrementalLoading: ['forceNsFilterV2', 'serverPagination'],
@@ -97,7 +96,7 @@ export default {
     },
 
     steveCacheAndSSPEnabled() {
-      return this.steveCacheEnabled && this.value.serverPagination.enabled
+      return this.steveCacheEnabled && this.value.serverPagination.enabled;
     },
 
     sspApplicableResources() {
@@ -204,7 +203,7 @@ export default {
       };
 
       if (defaultStore) {
-        this.value.serverPagination.stores = paginationUtils.getStoreDefault()
+        this.value.serverPagination.stores = paginationUtils.getStoreDefault();
       }
     }
   },
@@ -263,8 +262,8 @@ export default {
             v-if="isDev"
             class="btn btn-sm role-primary"
             style="width: fit-content;"
-            @click.prevent="sspApplyDefaults(true)"
             :disabled="!steveCacheAndSSPEnabled"
+            @click.prevent="sspApplyDefaults(true)"
           >
             {{ t('performance.serverPagination.populateDefaults') }}
           </button>