mirror of https://github.com/rancher/dashboard.git
Merge pull request #14719 from richard-cox/pagination-fix-receiver-config
Ensure correct syntax is used with SSP and the secret selectors
This commit is contained in:
commit
01dbbd6897
|
|
@ -173,11 +173,18 @@ export default {
|
|||
paginatePageOptions(opts) {
|
||||
const { opts: { filter } } = opts;
|
||||
|
||||
const filters = !!filter ? [PaginationParamFilter.createSingleField({ field: 'metadata.name', value: filter })] : [];
|
||||
const filters = !!filter ? [PaginationParamFilter.createSingleField({
|
||||
field: 'metadata.name', value: filter, exact: false, equals: true
|
||||
})] : [];
|
||||
|
||||
filters.push(
|
||||
PaginationParamFilter.createSingleField({ field: 'metadata.namespace', value: this.namespace }),
|
||||
PaginationParamFilter.createSingleField({ field: 'metadata.fields.1', value: this.types.join(',') })
|
||||
PaginationParamFilter.createMultipleFields(this.types.map((t) => ({
|
||||
field: 'metadata.fields.1',
|
||||
equals: true,
|
||||
exact: true,
|
||||
value: t
|
||||
})))
|
||||
);
|
||||
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -156,11 +156,18 @@ export default {
|
|||
paginatePageOptions(opts) {
|
||||
const { opts: { filter } } = opts;
|
||||
|
||||
const filters = !!filter ? [PaginationParamFilter.createSingleField({ field: 'metadata.name', value: filter })] : [];
|
||||
const filters = !!filter ? [PaginationParamFilter.createSingleField({
|
||||
field: 'metadata.name', value: filter, exact: false, equals: true
|
||||
})] : [];
|
||||
|
||||
filters.push(
|
||||
PaginationParamFilter.createSingleField({ field: 'metadata.namespace', value: this.namespace }),
|
||||
PaginationParamFilter.createSingleField({ field: 'metadata.fields.1', value: this.types.join(',') })
|
||||
PaginationParamFilter.createMultipleFields(this.types.map((t) => ({
|
||||
field: 'metadata.fields.1',
|
||||
equals: true,
|
||||
exact: true,
|
||||
value: t
|
||||
})))
|
||||
);
|
||||
|
||||
return {
|
||||
|
|
|
|||
Loading…
Reference in New Issue