mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
fix(stacks): store filter state [EE-5159] (#11637)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
This commit is contained in:
parent
84fe3cf2a2
commit
1261887c9e
20 changed files with 252 additions and 57 deletions
|
@ -1,10 +1,10 @@
|
|||
import { TableOptions } from '@tanstack/react-table';
|
||||
|
||||
type OptionExtender<T> = (options: TableOptions<T>) => TableOptions<T>;
|
||||
import { OptionsExtension } from './types';
|
||||
|
||||
export function mergeOptions<T>(
|
||||
...extenders: Array<OptionExtender<T>>
|
||||
): OptionExtender<T> {
|
||||
return (options: TableOptions<T>) =>
|
||||
export function mergeOptions<D>(
|
||||
...extenders: Array<OptionsExtension<D>>
|
||||
): OptionsExtension<D> {
|
||||
return (options: TableOptions<D>) =>
|
||||
extenders.reduce((acc, option) => option(acc), options);
|
||||
}
|
||||
|
|
3
app/react/components/datatables/extend-options/types.ts
Normal file
3
app/react/components/datatables/extend-options/types.ts
Normal file
|
@ -0,0 +1,3 @@
|
|||
import { TableOptions } from '@tanstack/react-table';
|
||||
|
||||
export type OptionsExtension<D> = (options: TableOptions<D>) => TableOptions<D>;
|
|
@ -0,0 +1,29 @@
|
|||
import { ColumnFiltersState, TableOptions } from '@tanstack/react-table';
|
||||
|
||||
import { applySetStateAction } from '@/react-tools/apply-set-state-action';
|
||||
|
||||
import { DefaultType } from '../types';
|
||||
|
||||
import { OptionsExtension } from './types';
|
||||
|
||||
export function withColumnFilters<D extends DefaultType>(
|
||||
filters: ColumnFiltersState,
|
||||
onChange: (filters: ColumnFiltersState) => void
|
||||
): OptionsExtension<D> {
|
||||
return function extendOptions(options: TableOptions<D>) {
|
||||
return {
|
||||
...options,
|
||||
state: {
|
||||
...options.state,
|
||||
columnFilters: filters,
|
||||
},
|
||||
onColumnFiltersChange: (updater) => {
|
||||
onChange(applySetStateAction(updater, filters));
|
||||
},
|
||||
initialState: {
|
||||
...options.initialState,
|
||||
columnFilters: filters,
|
||||
},
|
||||
};
|
||||
};
|
||||
}
|
|
@ -6,10 +6,12 @@ import {
|
|||
|
||||
import { DefaultType } from '../types';
|
||||
|
||||
import { OptionsExtension } from './types';
|
||||
|
||||
export function withControlledSelected<D extends DefaultType>(
|
||||
onChange?: (value: string[]) => void,
|
||||
value?: string[]
|
||||
) {
|
||||
): OptionsExtension<D> {
|
||||
return function extendTableOptions(options: TableOptions<D>) {
|
||||
if (!onChange || !value) {
|
||||
return options;
|
||||
|
|
|
@ -3,12 +3,14 @@ import { TableOptions } from '@tanstack/react-table';
|
|||
import { defaultGlobalFilterFn } from '../Datatable';
|
||||
import { DefaultType } from '../types';
|
||||
|
||||
import { OptionsExtension } from './types';
|
||||
|
||||
export function withGlobalFilter<
|
||||
D extends DefaultType,
|
||||
TFilter extends {
|
||||
search: string;
|
||||
},
|
||||
>(filterFn: typeof defaultGlobalFilterFn<D, TFilter>) {
|
||||
>(filterFn: typeof defaultGlobalFilterFn<D, TFilter>): OptionsExtension<D> {
|
||||
return function extendOptions(options: TableOptions<D>) {
|
||||
return {
|
||||
...options,
|
||||
|
|
|
@ -2,7 +2,11 @@ import { TableOptions } from '@tanstack/react-table';
|
|||
|
||||
import { DefaultType } from '../types';
|
||||
|
||||
export function withMeta<D extends DefaultType>(meta: Record<string, unknown>) {
|
||||
import { OptionsExtension } from './types';
|
||||
|
||||
export function withMeta<D extends DefaultType>(
|
||||
meta: Record<string, unknown>
|
||||
): OptionsExtension<D> {
|
||||
return function extendOptions(options: TableOptions<D>) {
|
||||
return {
|
||||
...options,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue