rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into pagination-extensions-resource-enable

This commit is contained in:
Richard Cox 2025-10-03 09:25:12 +01:00
parent 539d61dbd9 68a5058c7c
commit c87d218c36
20 changed files with 153 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cypress/e2e/po/components/fleet/fleet-dashboard-workspace-card.po.ts
View File

@ -12,7 +12,7 @@ class ResourcePanelPo extends ComponentPo {
} }
stateBadge(state: string) { stateBadge(state: string) {
return this.self().find(`.bg-${ state }`); return this.self().find(`.badge.bg-${ state }`);
} }
} }
@ -32,6 +32,14 @@ class ExpandedPanelPo extends ComponentPo {
tablePanel() { tablePanel() {
return new TablePanelPo(this.self(), this.workspace); return new TablePanelPo(this.self(), this.workspace);
} }
gitReposFilter() {
return CheckboxInputPo.byLabel(this.self(), 'Show Git Repos');
}
helmOpsFilter() {
return CheckboxInputPo.byLabel(this.self(), 'Show Helm Ops');
}
} }
class CardPanelPo extends ComponentPo { class CardPanelPo extends ComponentPo {
@ -43,14 +51,6 @@ class CardPanelPo extends ComponentPo {
this.workspace = workspace; this.workspace = workspace;
} }
gitReposFilter() {
return CheckboxInputPo.byLabel(this.self(), 'Show Git Repos');
}
helmOpsFilter() {
return CheckboxInputPo.byLabel(this.self(), 'Show Helm Ops');
}
statePanel(stateDisplay) { statePanel(stateDisplay) {
return new StatePanelPo(`[data-testid="state-panel-${ stateDisplay }"]`, this.self(), this.workspace); return new StatePanelPo(`[data-testid="state-panel-${ stateDisplay }"]`, this.self(), this.workspace);
} }
@ -76,11 +76,11 @@ class StatePanelPo extends ComponentPo {
} }
title() { title() {
return this.self().find(`.title .label`); return this.self().find('.title .state-title');
} }
card(name) { card(name: string) {
return this.self().find(`[data-testid="card-${ this.workspace }/${ name }"]`); return this.self().find(`[data-testid="item-card-header-title"]`).contains(name);
} }
} }
@ -102,6 +102,6 @@ export default class FleetDashboardWorkspaceCardPo extends ComponentPo {
} }
expandButton() { expandButton() {
return this.self().find('[data-testid="expand-button"]'); return this.self().find(`[data-testid="workspace-expand-btn-${ this.workspace }"]`);
} }
} }

2
cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
View File

@ -41,7 +41,7 @@ export class FleetDashboardListPagePo extends BaseListPagePo {
} }
slideInPanel() { slideInPanel() {
return cy.get('[data-testid="slide-in-panel-component"] [data-testid="fleet-dashboard-resource-details-header"]'); return cy.get('[data-testid="slide-in-panel-component"]');
} }
fleetDashboardEmptyState() { fleetDashboardEmptyState() {

33
cypress/e2e/tests/pages/fleet/dashboard.spec.ts
View File

@ -100,15 +100,16 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
expandButton.should('be.visible'); expandButton.should('be.visible');
expandButton.click(); expandButton.click();
const cardsPanel = workspaceCard.expandedPanel().cardsPanel(); const expandedPanel = workspaceCard.expandedPanel();
const cardsPanel = expandedPanel.cardsPanel();
cardsPanel.self().should('be.visible'); cardsPanel.self().should('be.visible');
cardsPanel.gitReposFilter().checkVisible(); expandedPanel.gitReposFilter().checkVisible();
cardsPanel.gitReposFilter().isChecked(); expandedPanel.gitReposFilter().isChecked();
cardsPanel.helmOpsFilter().checkVisible(); expandedPanel.helmOpsFilter().checkVisible();
cardsPanel.helmOpsFilter().isChecked(); expandedPanel.helmOpsFilter().isChecked();
const activeStatePanel = cardsPanel.statePanel('Active'); const activeStatePanel = cardsPanel.statePanel('Active');
@ -117,10 +118,7 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
activeStatePanel.title().should('contain.text', '/1'); activeStatePanel.title().should('contain.text', '/1');
activeStatePanel.title().click(); activeStatePanel.title().click();
const card = activeStatePanel.card(repoName); activeStatePanel.card(repoName).should('be.visible');
card.should('be.visible');
card.find('.title').should('contain.text', repoName);
}); });
it('Should filter by GitRepo type', () => { it('Should filter by GitRepo type', () => {
@ -132,9 +130,10 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
expandButton.click(); expandButton.click();
const cardsPanel = workspaceCard.expandedPanel().cardsPanel(); const expandedPanel = workspaceCard.expandedPanel();
const cardsPanel = expandedPanel.cardsPanel();
cardsPanel.gitReposFilter().set(); expandedPanel.gitReposFilter().set();
const activeStatePanel = cardsPanel.statePanel('Active'); const activeStatePanel = cardsPanel.statePanel('Active');
activeStatePanel.self().should('not.be.visible'); activeStatePanel.self().should('not.be.visible');
@ -151,16 +150,16 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
const cardsPanel = workspaceCard.expandedPanel().cardsPanel(); const cardsPanel = workspaceCard.expandedPanel().cardsPanel();
cardsPanel.checkExists(); cardsPanel.self().should('be.visible');
// click 'card' mode // click 'table' mode (first button is table mode)
fleetDashboardPage.viewModeButton().self().find('[data-testid="button-group-child-0"]').click(); fleetDashboardPage.viewModeButton().self().find('[data-testid="button-group-child-0"]').click();
cardsPanel.checkNotExists(); cardsPanel.checkNotExists();
const tablePanel = workspaceCard.expandedPanel().tablePanel(); const tablePanel = workspaceCard.expandedPanel().tablePanel();
tablePanel.checkExists(); tablePanel.checkVisible();
}); });
it('Should open slide-in panel', () => { it('Should open slide-in panel', () => {
@ -202,10 +201,12 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
const activeStatePanel = cardsPanel.statePanel('Active'); const activeStatePanel = cardsPanel.statePanel('Active');
activeStatePanel.title().click(); activeStatePanel.title().click();
activeStatePanel.card(repoName).should('be.visible').click();
const card = activeStatePanel.card(repoName); const details = fleetDashboardPage.slideInPanel();
card.find('.title a').click(); details.should('be.visible');
details.find('.title').should('contain.text', repoName).click();
appDetails.waitForPage(null, 'bundles'); appDetails.waitForPage(null, 'bundles');
}); });

29
docusaurus/docs/extensions/api/table-columns.md
View File

@ -13,12 +13,12 @@ This method adds a table column to a `ResourceTable` element-based table on the
Method: Method:
```ts ```ts
plugin.addTableColumn(where: String, when: LocationConfig, options: Object); plugin.addTableColumn(where: String, when: LocationConfig, column: TableColumn);
``` ```
_Arguments_ _Arguments_
`where` string parameter admissable values for this method: `where` string parameter admissible values for this method:
| Key | Type | Description | | Key | Type | Description |
|---|---|---| |---|---|---|
@ -26,28 +26,35 @@ _Arguments_
<br/> <br/>
`when` Object admissable values: `when` Object admissible values:
`LocationConfig` as described above for the [LocationConfig object](./common#locationconfig). `LocationConfig` as described above for the [LocationConfig object](./common#locationconfig).
<br/> *(Rancher version v2.13.0)*
<br/>
### TableColumnLocation.RESOURCE options An addition parameter can be provided which will be used to support the column when server-side pagination is enabled. For more information and other changes required to server-side pagination see [here](../performance/scaling/lists.md).
```ts
plugin.addTableColumn(where: String, when: LocationConfig, column: TableColumn, paginationColumn?: PaginationTableColumn));
```
### TableColumnLocation.RESOURCE column
![Table Col](../screenshots/table-cols.png) ![Table Col](../screenshots/table-cols.png)
`options` config object. Admissable parameters for the `options` with `'TableColumnLocation.RESOURCE'` are: `column` config object. Admissible parameters for the `column` with `'TableColumnLocation.RESOURCE'` are:
| Key | Type | Description | | Key | Type | Description |
|---|---|---| |---|---|---|
|`name`| String | Label for column | |`name`| String | Label for column |
|`labelKey`| String | Same as "name" but allows for translation. Will superseed "name" | |`labelKey`| String | Same as "name" but allows for translation. Will supersede "name" |
|`value`| String | Object property to obtain the value from | |`value`| String | Object property to obtain the value from |
|`getValue`| Fuction | Same as "value", but it can be a function. Will superseed "value" | |`getValue`| Function | Same as "value", but it can be a function. Will supersede "value" |
|`width`| Int | Column width (in `px`). Optional | |`width`| Int | Column width (in `px`). Optional |
|`sort`| Array | Object properties to be bound to the table sorting. Optional | |`sort`| boolean,string,Array | Object properties to be bound to the table sorting. Optional |
|`search`| Array | Object properties to be bound to the table search. Optional | |`search`| boolean,string,Array | Object properties to be bound to the table search. Optional |
| `formatter`| string | Name of a `formatter` component used to render the cell. Components should be in the extension `formatters` folder
| `formatterOpts`| any | Provide additional values to the `formatter` component via a `formatterOpts` component param
Usage example for `'TableColumnLocation.RESOURCE'`: Usage example for `'TableColumnLocation.RESOURCE'`:

2
package.json
View File

@ -97,7 +97,7 @@
"express": "4.17.1", "express": "4.17.1",
"file-saver": "2.0.2", "file-saver": "2.0.2",
"floating-vue": "5.2.2", "floating-vue": "5.2.2",
"focus-trap": "7.6.2", "focus-trap": "7.6.5",
"https": "1.0.0", "https": "1.0.0",
"identicon.js": "2.3.3", "identicon.js": "2.3.3",
"intl-messageformat": "7.8.4", "intl-messageformat": "7.8.4",

9
shell/components/FilterPanel.vue
View File

@ -20,6 +20,8 @@ type FilterOption = {
componentProps?: Record<string, unknown>; componentProps?: Record<string, unknown>;
/** Label to show next to the checkbox, or a custom component next to the checkbox */ /** Label to show next to the checkbox, or a custom component next to the checkbox */
label?: string | { component: ComponentType; componentProps: Record<string, unknown>; }; label?: string | { component: ComponentType; componentProps: Record<string, unknown>; };
/** Tooltip to be displayed above the checkbox on hover */
labelTooltip?: string;
}; };
/** /**
@ -97,7 +99,12 @@ const updateFilter = (key: string, value: string[]) => {
@update:value="updateFilter(filter.key, $event)" @update:value="updateFilter(filter.key, $event)"
> >
<template #label> <template #label>
<span v-if="typeof option.label === 'string'">{{ option.label }}</span> <span
v-if="typeof option.label === 'string'"
v-clean-tooltip="{content: option.labelTooltip, delay: { show: 1000 }}"
>
{{ option.label }}
</span>
<component <component
:is="option.label.component" :is="option.label.component"
v-else v-else

9
shell/components/PaginatedResourceTable.vue
View File

@ -2,6 +2,7 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import ResourceFetch from '@shell/mixins/resource-fetch'; import ResourceFetch from '@shell/mixins/resource-fetch';
import ResourceTable from '@shell/components/ResourceTable.vue'; import ResourceTable from '@shell/components/ResourceTable.vue';
import { VuexStore } from '@shell/types/store/vuex';
/** /**
* This is meant to enable ResourceList like capabilities outside of List pages / components * This is meant to enable ResourceList like capabilities outside of List pages / components
@ -130,13 +131,17 @@ export default defineComponent({
safeHeaders(): any[] { safeHeaders(): any[] {
const customHeaders: any[] = this.canPaginate ? this.paginationHeaders : this.headers; const customHeaders: any[] = this.canPaginate ? this.paginationHeaders : this.headers;
return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate); const $store = this.$store as VuexStore;
return customHeaders || $store.getters['type-map/headersFor'](this.schema, this.canPaginate);
} }
}, },
methods: { methods: {
clearSelection() { clearSelection() {
this.$refs.table.clearSelection(); const table = this.$refs.table as { clearSelection: () => void };
table.clearSelection();
}, },
} }
}); });

5
shell/components/PromptRemove.vue
View File

@ -384,6 +384,7 @@ export default {
> >
<span <span
v-clean-html="t('promptRemove.confirmName', { nameToMatch: escapeHtml(nameToMatch) }, true)" v-clean-html="t('promptRemove.confirmName', { nameToMatch: escapeHtml(nameToMatch) }, true)"
class="confirm-text"
/> />
</div> </div>
</div> </div>
@ -472,5 +473,9 @@ export default {
flex: 1; flex: 1;
} }
} }
.confirm-text b {
user-select: all;
}
} }
</style> </style>

4
shell/list/catalog.cattle.io.clusterrepo.vue
View File

@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue'; import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations'; import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
import ClusterRepo from '@shell/models/catalog.cattle.io.clusterrepo'; import { RancherKubeMetadata } from '@shell/types/kube/kube-api';
import { PaginationArgs, PaginationParamFilter } from '@shell/types/store/pagination.types'; import { PaginationArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
@ -25,7 +25,7 @@ export default defineComponent({
/** /**
* Filter out hidden repos from list of all repos * Filter out hidden repos from list of all repos
*/ */
filterRowsLocal(rows: ClusterRepo[]) { filterRowsLocal(rows: { metadata: RancherKubeMetadata}[]) {
return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true')); return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
}, },

2
shell/package.json
View File

@ -93,7 +93,7 @@
"express": "4.17.1", "express": "4.17.1",
"file-saver": "2.0.2", "file-saver": "2.0.2",
"floating-vue": "5.2.2", "floating-vue": "5.2.2",
"focus-trap": "7.6.2", "focus-trap": "7.6.5",
"frontmatter-markdown-loader": "3.7.0", "frontmatter-markdown-loader": "3.7.0",
"identicon.js": "2.3.3", "identicon.js": "2.3.3",
"intl-messageformat": "7.8.4", "intl-messageformat": "7.8.4",

6
shell/pages/c/_cluster/apps/charts/AppChartCardFooter.vue
View File

@ -80,6 +80,12 @@ function onClickItem(type: string, label: string) {
&-text { &-text {
text-transform: capitalize; text-transform: capitalize;
margin-right: 8px; margin-right: 8px;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
} }
&-icon { &-icon {

7
shell/pages/c/_cluster/apps/charts/StatusLabel.vue
View File

@ -2,9 +2,9 @@
defineProps<{ defineProps<{
label: string; label: string;
icon: string; icon?: string;
iconColor?: string; iconColor?: string;
tooltip?: string; iconTooltip?: string;
}>(); }>();
</script> </script>
@ -13,7 +13,8 @@ defineProps<{
<div class="status-label"> <div class="status-label">
{{ label }} {{ label }}
<i <i
v-clean-tooltip.right="tooltip" v-if="!!icon"
v-clean-tooltip.right="iconTooltip"
:class="['icon', icon, iconColor]" :class="['icon', icon, iconColor]"
/> />
</div> </div>

23
shell/pages/c/_cluster/apps/charts/index.vue
View File

@ -82,10 +82,10 @@ export default {
label: { label: {
component: markRaw(StatusLabel), component: markRaw(StatusLabel),
componentProps: { componentProps: {
label: this.t('generic.installed'), label: this.t('generic.installed'),
icon: 'icon-warning', icon: 'icon-warning',
iconColor: 'warning', iconColor: 'warning',
tooltip: this.t('catalog.charts.statusFilterCautions.installation') iconTooltip: this.t('catalog.charts.statusFilterCautions.installation')
} }
} }
}, },
@ -98,10 +98,10 @@ export default {
label: { label: {
component: markRaw(StatusLabel), component: markRaw(StatusLabel),
componentProps: { componentProps: {
label: this.t('generic.upgradeable'), label: this.t('generic.upgradeable'),
icon: 'icon-warning', icon: 'icon-warning',
iconColor: 'warning', iconColor: 'warning',
tooltip: this.t('catalog.charts.statusFilterCautions.upgradeable') iconTooltip: this.t('catalog.charts.statusFilterCautions.upgradeable')
} }
} }
} }
@ -125,9 +125,10 @@ export default {
repoOptions() { repoOptions() {
let out = this.$store.getters['catalog/repos'].map((r) => { let out = this.$store.getters['catalog/repos'].map((r) => {
return { return {
value: r._key, value: r._key,
label: r.nameDisplay, label: r.nameDisplay,
weight: ( r.isRancher ? 1 : ( r.isPartner ? 2 : 3 ) ), labelTooltip: r.nameDisplay,
weight: ( r.isRancher ? 1 : ( r.isPartner ? 2 : 3 ) ),
}; };
}); });

9
shell/scripts/test-plugins-build.sh
View File

@ -98,12 +98,11 @@ createTestComponent() {
# Add test list component to the test package # Add test list component to the test package
# Validates rancher-components imports # Validates rancher-components imports
# NOTE - This fails if importing some components with TS imports... # Basic list instead
# cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
# See https://github.com/rancher/dashboard/issues/12918
# Use a basic list instead
cp ${SHELL_DIR}/list/namespace.vue pkg/test-pkg/list cp ${SHELL_DIR}/list/namespace.vue pkg/test-pkg/list
# More complex list
cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
} }
# Publish shell pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow) # Publish shell pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow)

2
shell/scripts/typegen.sh
View File

@ -39,6 +39,8 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/hybrid-class.js --d
# # mixins # # mixins
${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch-namespaced.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch-api-pagination.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
# # models # # models
${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null

3
shell/types/store/vuex.d.ts vendored
View File

@ -10,7 +10,8 @@ export interface VuexStoreGetters {
export interface VuexStore { export interface VuexStore {
getters: VuexStoreGetters, getters: VuexStoreGetters,
dispatch: any, dispatch: <T = any>(action: string, payload?: any) => Promise<T>,
commit: (mutation: string, payload?: any) => void,
// When we have exact properties above we can remove below // When we have exact properties above we can remove below
[name:string]: any [name:string]: any

7
shell/types/vue-shim.d.ts vendored
View File

@ -1,5 +1,6 @@
/* eslint-disable */ /* eslint-disable */
import type ShellApi from '@shell/plugins/internal-api/shell/shell.api'; import type ShellApi from '@shell/plugins/internal-api/shell/shell.api';
import { VuexStore } from '@shell/types/store/vuex';
export {}; export {};
@ -13,11 +14,7 @@ declare module 'vue' {
(key: string, args?: Record<string, any>, raw?: boolean): string; (key: string, args?: Record<string, any>, raw?: boolean): string;
(options: { k: string; raw?: boolean; tag?: string | Record<string, any>; escapehtml?: boolean }): string; (options: { k: string; raw?: boolean; tag?: string | Record<string, any>; escapehtml?: boolean }): string;
}, },
$store: { $store: VuexStore,
getters: Record<string, any>,
dispatch: (action: string, payload?: any) => Promise<any>,
commit: (mutation: string, payload?: any) => void,
},
$shell: ShellApi, $shell: ShellApi,
} }
} }

13
shell/utils/pagination-utils.ts
View File

@ -20,6 +20,7 @@ import { VuexStore } from '@shell/types/store/vuex';
import { ServerSidePaginationExtensionConfig } from '@shell/core/types'; import { ServerSidePaginationExtensionConfig } from '@shell/core/types';
import { EXT_IDS } from '@shell/core/plugin'; import { EXT_IDS } from '@shell/core/plugin';
import { ExtensionManager } from '@shell/types/extension-manager'; import { ExtensionManager } from '@shell/types/extension-manager';
import { DEFAULT_PERF_SETTING } from '@shell/config/settings';
/** /**
* Helper functions for server side pagination * Helper functions for server side pagination
@ -47,7 +48,15 @@ class PaginationUtils {
public getStoreSettings(arg: any | PaginationSettings): PaginationSettingsStores { public getStoreSettings(arg: any | PaginationSettings): PaginationSettingsStores {
const serverPagination: PaginationSettings = arg?.rootGetters !== undefined ? this.getSettings(arg) : arg; const serverPagination: PaginationSettings = arg?.rootGetters !== undefined ? this.getSettings(arg) : arg;
return serverPagination?.useDefaultStores ? this.getStoreDefault() : serverPagination?.stores || this.getStoreDefault(); // Ensure we use the current default store settings if
// 1. from 2.11.0 user saved `ui-performance` setting and it's applied the default pagination settings containing useDefaultStores
// 2. before 2.11.0 user has saved `ui-performance` setting and it's applied an obsolete pagination settings that lack useDefaultStore
// 3. user has manually set the `ui-performance` pagination setting useDefaultStores value
if (serverPagination?.useDefaultStores || serverPagination?.useDefaultStores === undefined) {
return this.getStoreDefault();
}
return serverPagination?.stores || this.getStoreDefault();
} }
public getStoreDefault(): PaginationSettingsStores { public getStoreDefault(): PaginationSettingsStores {
@ -227,7 +236,7 @@ class PaginationUtils {
resourceChangesDebounceMs({ rootGetters }: any): number | undefined { resourceChangesDebounceMs({ rootGetters }: any): number | undefined {
const settings = this.getSettings({ rootGetters }); const settings = this.getSettings({ rootGetters });
return settings.resourceChangesDebounceMs; return settings.resourceChangesDebounceMs || DEFAULT_PERF_SETTING.serverPagination.resourceChangesDebounceMs;
} }
validateNsProjectFilters(nsProjectFilters: string[]) { validateNsProjectFilters(nsProjectFilters: string[]) {

18
shell/yarn.lock
View File

@ -7737,10 +7737,10 @@ floating-vue@5.2.2:
"@floating-ui/dom" "~1.1.1" "@floating-ui/dom" "~1.1.1"
vue-resize "^2.0.0-alpha.1" vue-resize "^2.0.0-alpha.1"
focus-trap@7.6.2: focus-trap@7.6.5:
version "7.6.2" version "7.6.5"
resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz#a501988821ca23d0150a7229eb7a20a3695bdf0e" resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.6.5.tgz#56f0814286d43c1a2688e9bc4f31f17ae047fb76"
integrity sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w== integrity sha512-7Ke1jyybbbPZyZXFxEftUtxFGLMpE2n6A+z//m4CRDlj0hW+o3iYSmh8nFlYMurOiJVDmJRilUQtJr08KfIxlg==
dependencies: dependencies:
tabbable "^6.2.0" tabbable "^6.2.0"
@ -12268,15 +12268,7 @@ setprototypeof@1.2.0:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
sha.js@^2.4.0, sha.js@^2.4.8: sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
version "2.4.11"
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
dependencies:
inherits "^2.0.1"
safe-buffer "^5.0.1"
sha.js@^2.4.11:
version "2.4.12" version "2.4.12"
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w== integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==

40
yarn.lock
View File

@ -7812,7 +7812,6 @@ eslint-plugin-jest@24.4.0:
"eslint-plugin-local-rules@link:./eslint-plugin-local-rules": "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
version "0.0.0" version "0.0.0"
uid ""
"eslint-plugin-local-rules@link:eslint-plugin-local-rules": "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
version "0.0.0" version "0.0.0"
@ -8522,10 +8521,10 @@ flush-promises@1.0.2:
resolved "https://registry.npmjs.org/flush-promises/-/flush-promises-1.0.2.tgz#4948fd58f15281fed79cbafc86293d5bb09b2ced" resolved "https://registry.npmjs.org/flush-promises/-/flush-promises-1.0.2.tgz#4948fd58f15281fed79cbafc86293d5bb09b2ced"
integrity sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA== integrity sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA==
focus-trap@7.6.2: focus-trap@7.6.5:
version "7.6.2" version "7.6.5"
resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz#a501988821ca23d0150a7229eb7a20a3695bdf0e" resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.6.5.tgz#56f0814286d43c1a2688e9bc4f31f17ae047fb76"
integrity sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w== integrity sha512-7Ke1jyybbbPZyZXFxEftUtxFGLMpE2n6A+z//m4CRDlj0hW+o3iYSmh8nFlYMurOiJVDmJRilUQtJr08KfIxlg==
dependencies: dependencies:
tabbable "^6.2.0" tabbable "^6.2.0"
@ -14226,7 +14225,7 @@ string-length@^4.0.1:
char-regex "^1.0.2" char-regex "^1.0.2"
strip-ansi "^6.0.0" strip-ansi "^6.0.0"
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: "string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3" version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -14243,6 +14242,15 @@ string-width@^2.1.1:
is-fullwidth-code-point "^2.0.0" is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0" strip-ansi "^4.0.0"
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
string-width@^5.0.1, string-width@^5.1.2: string-width@^5.0.1, string-width@^5.1.2:
version "5.1.2" version "5.1.2"
resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@ -14317,7 +14325,7 @@ string_decoder@~1.1.1:
dependencies: dependencies:
safe-buffer "~5.1.0" safe-buffer "~5.1.0"
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: "strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1" version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@ -14338,6 +14346,13 @@ strip-ansi@^4.0.0:
dependencies: dependencies:
ansi-regex "^3.0.0" ansi-regex "^3.0.0"
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
strip-ansi@^7.0.1: strip-ansi@^7.0.1:
version "7.1.0" version "7.1.0"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@ -15673,7 +15688,7 @@ worker-loader@3.0.8:
loader-utils "^2.0.0" loader-utils "^2.0.0"
schema-utils "^3.0.0" schema-utils "^3.0.0"
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0" version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@ -15699,6 +15714,15 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0" string-width "^4.1.0"
strip-ansi "^6.0.0" strip-ansi "^6.0.0"
wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"
wrap-ansi@^8.1.0: wrap-ansi@^8.1.0:
version "8.1.0" version "8.1.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"