diff --git a/packages/datalib/src/PerspectiveConfig.ts b/packages/datalib/src/PerspectiveConfig.ts index 6f26b04ae..daccfdc55 100644 --- a/packages/datalib/src/PerspectiveConfig.ts +++ b/packages/datalib/src/PerspectiveConfig.ts @@ -30,7 +30,7 @@ export interface PerspectiveFilterColumnInfo { export interface PerspectiveConfig extends PerspectiveConfigColumns { rootObject: { schemaName?: string; pureName: string }; filters: { [uniqueName: string]: string }; - filterInfos: { [uniqueName: string]: PerspectiveFilterColumnInfo }; + // filterInfos: { [uniqueName: string]: PerspectiveFilterColumnInfo }; sort: { [parentUniqueName: string]: { uniqueName: string; @@ -47,7 +47,7 @@ export function createPerspectiveConfig(rootObject: { schemaName?: string; pureN uncheckedColumns: [], customJoins: [], filters: {}, - filterInfos: {}, + // filterInfos: {}, sort: {}, rootObject, }; diff --git a/packages/web/src/perspectives/PerspectiveFilters.svelte b/packages/web/src/perspectives/PerspectiveFilters.svelte index be717e831..e09a5034e 100644 --- a/packages/web/src/perspectives/PerspectiveFilters.svelte +++ b/packages/web/src/perspectives/PerspectiveFilters.svelte @@ -16,7 +16,7 @@ export let database; export let driver; - $: allFilterNames = _.keys(config.filterInfos || {}); + $: allFilterNames = _.keys(config.filters || {}); @@ -27,28 +27,32 @@ {:else} {#each allFilterNames as uniqueName} - - setConfig(cfg => ({ - ...cfg, - filters: { - ...cfg.filters, - [uniqueName]: value, - }, - }))} - onRemoveFilter={value => - setConfig(cfg => ({ - ...cfg, - filters: _.omit(cfg.filters, [uniqueName]), - filterInfos: _.omit(cfg.filterInfos, [uniqueName]), - }))} - /> + {@const node = root?.findNodeByUniqueName(uniqueName)} + {@const filterInfo = node?.filterInfo} + {#if filterInfo} + + setConfig(cfg => ({ + ...cfg, + filters: { + ...cfg.filters, + [uniqueName]: value, + }, + }))} + onRemoveFilter={value => + setConfig(cfg => ({ + ...cfg, + filters: _.omit(cfg.filters, [uniqueName]), + // filterInfos: _.omit(cfg.filterInfos, [uniqueName]), + }))} + /> + {/if} {/each} {/if} diff --git a/packages/web/src/perspectives/PerspectiveTable.svelte b/packages/web/src/perspectives/PerspectiveTable.svelte index 0af467368..4594b5baa 100644 --- a/packages/web/src/perspectives/PerspectiveTable.svelte +++ b/packages/web/src/perspectives/PerspectiveTable.svelte @@ -274,10 +274,10 @@ ...cfg.filters, [dataNode.uniqueName]: getFilterValueExpression(value, dataNode.column.dataType), }, - filterInfos: { - ...cfg.filterInfos, - [dataNode.uniqueName]: dataNode.filterInfo, - }, + // filterInfos: { + // ...cfg.filterInfos, + // [dataNode.uniqueName]: dataNode.filterInfo, + // }, })); }, }); diff --git a/packages/web/src/perspectives/perspectiveMenu.ts b/packages/web/src/perspectives/perspectiveMenu.ts index 36fb9016f..c5f2a0d1a 100644 --- a/packages/web/src/perspectives/perspectiveMenu.ts +++ b/packages/web/src/perspectives/perspectiveMenu.ts @@ -78,9 +78,9 @@ export function getPerspectiveNodeMenu(props: PerspectiveNodeMenuProps) { onClick: () => setConfig(cfg => ({ ...cfg, - filterInfos: { - ...cfg.filterInfos, - [node.uniqueName]: filterInfo, + filters: { + ...cfg.filters, + [node.uniqueName]: '', }, })), },