@furystack/shades-common-components 13.5.0 → 14.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +58 -0
- package/README.md +3 -3
- package/esm/components/accordion/accordion-item.js +1 -1
- package/esm/components/accordion/accordion-item.js.map +1 -1
- package/esm/components/accordion/accordion.js +1 -1
- package/esm/components/accordion/accordion.js.map +1 -1
- package/esm/components/alert.js +1 -1
- package/esm/components/alert.js.map +1 -1
- package/esm/components/app-bar-link.js +1 -1
- package/esm/components/app-bar-link.js.map +1 -1
- package/esm/components/app-bar.js +1 -1
- package/esm/components/app-bar.js.map +1 -1
- package/esm/components/avatar.js +1 -1
- package/esm/components/avatar.js.map +1 -1
- package/esm/components/badge.js +1 -1
- package/esm/components/badge.js.map +1 -1
- package/esm/components/breadcrumb.js +1 -1
- package/esm/components/breadcrumb.js.map +1 -1
- package/esm/components/breadcrumb.spec.js +3 -3
- package/esm/components/breadcrumb.spec.js.map +1 -1
- package/esm/components/button-group.js +4 -4
- package/esm/components/button-group.js.map +1 -1
- package/esm/components/button.js +1 -1
- package/esm/components/button.js.map +1 -1
- package/esm/components/button.spec.js +1 -1
- package/esm/components/button.spec.js.map +1 -1
- package/esm/components/cache-view.js +1 -1
- package/esm/components/cache-view.js.map +1 -1
- package/esm/components/cache-view.spec.js +2 -2
- package/esm/components/cache-view.spec.js.map +1 -1
- package/esm/components/card.js +5 -5
- package/esm/components/card.js.map +1 -1
- package/esm/components/carousel.js +1 -1
- package/esm/components/carousel.js.map +1 -1
- package/esm/components/chip.js +1 -1
- package/esm/components/chip.js.map +1 -1
- package/esm/components/circular-progress.d.ts +2 -4
- package/esm/components/circular-progress.d.ts.map +1 -1
- package/esm/components/circular-progress.js +3 -6
- package/esm/components/circular-progress.js.map +1 -1
- package/esm/components/circular-progress.spec.js +19 -14
- package/esm/components/circular-progress.spec.js.map +1 -1
- package/esm/components/command-palette/command-palette-input.js +1 -1
- package/esm/components/command-palette/command-palette-input.js.map +1 -1
- package/esm/components/command-palette/command-palette-suggestion-list.js +1 -1
- package/esm/components/command-palette/command-palette-suggestion-list.js.map +1 -1
- package/esm/components/command-palette/command-palette-suggestion-list.spec.js +1 -1
- package/esm/components/command-palette/command-palette-suggestion-list.spec.js.map +1 -1
- package/esm/components/command-palette/index.js +1 -1
- package/esm/components/command-palette/index.js.map +1 -1
- package/esm/components/context-menu/context-menu-item.js +1 -1
- package/esm/components/context-menu/context-menu-item.js.map +1 -1
- package/esm/components/context-menu/context-menu.js +1 -1
- package/esm/components/context-menu/context-menu.js.map +1 -1
- package/esm/components/data-grid/body.js +1 -1
- package/esm/components/data-grid/body.js.map +1 -1
- package/esm/components/data-grid/data-grid-row.js +1 -1
- package/esm/components/data-grid/data-grid-row.js.map +1 -1
- package/esm/components/data-grid/data-grid.d.ts +5 -2
- package/esm/components/data-grid/data-grid.d.ts.map +1 -1
- package/esm/components/data-grid/data-grid.js +5 -3
- package/esm/components/data-grid/data-grid.js.map +1 -1
- package/esm/components/data-grid/data-grid.spec.js +60 -60
- package/esm/components/data-grid/data-grid.spec.js.map +1 -1
- package/esm/components/data-grid/filters/boolean-filter.d.ts +2 -2
- package/esm/components/data-grid/filters/boolean-filter.d.ts.map +1 -1
- package/esm/components/data-grid/filters/boolean-filter.js +4 -4
- package/esm/components/data-grid/filters/boolean-filter.js.map +1 -1
- package/esm/components/data-grid/filters/boolean-filter.spec.js +18 -17
- package/esm/components/data-grid/filters/boolean-filter.spec.js.map +1 -1
- package/esm/components/data-grid/filters/date-filter.d.ts +2 -2
- package/esm/components/data-grid/filters/date-filter.d.ts.map +1 -1
- package/esm/components/data-grid/filters/date-filter.js +6 -6
- package/esm/components/data-grid/filters/date-filter.js.map +1 -1
- package/esm/components/data-grid/filters/date-filter.spec.js +26 -21
- package/esm/components/data-grid/filters/date-filter.spec.js.map +1 -1
- package/esm/components/data-grid/filters/enum-filter.d.ts +2 -2
- package/esm/components/data-grid/filters/enum-filter.d.ts.map +1 -1
- package/esm/components/data-grid/filters/enum-filter.js +5 -5
- package/esm/components/data-grid/filters/enum-filter.js.map +1 -1
- package/esm/components/data-grid/filters/enum-filter.spec.js +21 -19
- package/esm/components/data-grid/filters/enum-filter.spec.js.map +1 -1
- package/esm/components/data-grid/filters/filter-dropdown.js +1 -1
- package/esm/components/data-grid/filters/filter-dropdown.js.map +1 -1
- package/esm/components/data-grid/filters/number-filter.d.ts +2 -2
- package/esm/components/data-grid/filters/number-filter.d.ts.map +1 -1
- package/esm/components/data-grid/filters/number-filter.js +5 -5
- package/esm/components/data-grid/filters/number-filter.js.map +1 -1
- package/esm/components/data-grid/filters/number-filter.spec.js +23 -21
- package/esm/components/data-grid/filters/number-filter.spec.js.map +1 -1
- package/esm/components/data-grid/filters/string-filter.d.ts +2 -2
- package/esm/components/data-grid/filters/string-filter.d.ts.map +1 -1
- package/esm/components/data-grid/filters/string-filter.js +5 -5
- package/esm/components/data-grid/filters/string-filter.js.map +1 -1
- package/esm/components/data-grid/filters/string-filter.spec.js +21 -19
- package/esm/components/data-grid/filters/string-filter.spec.js.map +1 -1
- package/esm/components/data-grid/footer.d.ts +2 -2
- package/esm/components/data-grid/footer.d.ts.map +1 -1
- package/esm/components/data-grid/footer.js +8 -13
- package/esm/components/data-grid/footer.js.map +1 -1
- package/esm/components/data-grid/footer.spec.js +38 -27
- package/esm/components/data-grid/footer.spec.js.map +1 -1
- package/esm/components/data-grid/header.d.ts +6 -6
- package/esm/components/data-grid/header.d.ts.map +1 -1
- package/esm/components/data-grid/header.js +16 -17
- package/esm/components/data-grid/header.js.map +1 -1
- package/esm/components/data-grid/header.spec.js +66 -60
- package/esm/components/data-grid/header.spec.js.map +1 -1
- package/esm/components/data-grid/selection-cell.js +1 -1
- package/esm/components/data-grid/selection-cell.js.map +1 -1
- package/esm/components/dialog.js +1 -1
- package/esm/components/dialog.js.map +1 -1
- package/esm/components/divider.js +1 -1
- package/esm/components/divider.js.map +1 -1
- package/esm/components/drawer/drawer-toggle-button.js +1 -1
- package/esm/components/drawer/drawer-toggle-button.js.map +1 -1
- package/esm/components/drawer/index.js +1 -1
- package/esm/components/drawer/index.js.map +1 -1
- package/esm/components/dropdown.js +1 -1
- package/esm/components/dropdown.js.map +1 -1
- package/esm/components/fab.js +1 -1
- package/esm/components/fab.js.map +1 -1
- package/esm/components/form.js +1 -1
- package/esm/components/form.js.map +1 -1
- package/esm/components/grid.js +1 -1
- package/esm/components/grid.js.map +1 -1
- package/esm/components/icons/icon.js +1 -1
- package/esm/components/icons/icon.js.map +1 -1
- package/esm/components/image.js +2 -2
- package/esm/components/image.js.map +1 -1
- package/esm/components/inputs/autocomplete.js +1 -1
- package/esm/components/inputs/autocomplete.js.map +1 -1
- package/esm/components/inputs/checkbox.js +1 -1
- package/esm/components/inputs/checkbox.js.map +1 -1
- package/esm/components/inputs/checkbox.spec.js +1 -1
- package/esm/components/inputs/checkbox.spec.js.map +1 -1
- package/esm/components/inputs/input-number.js +1 -1
- package/esm/components/inputs/input-number.js.map +1 -1
- package/esm/components/inputs/input-number.spec.js +1 -1
- package/esm/components/inputs/input-number.spec.js.map +1 -1
- package/esm/components/inputs/input.js +1 -1
- package/esm/components/inputs/input.js.map +1 -1
- package/esm/components/inputs/input.spec.js +1 -1
- package/esm/components/inputs/input.spec.js.map +1 -1
- package/esm/components/inputs/radio-group.js +1 -1
- package/esm/components/inputs/radio-group.js.map +1 -1
- package/esm/components/inputs/radio-group.spec.js +1 -1
- package/esm/components/inputs/radio-group.spec.js.map +1 -1
- package/esm/components/inputs/radio.js +1 -1
- package/esm/components/inputs/radio.js.map +1 -1
- package/esm/components/inputs/radio.spec.js +1 -1
- package/esm/components/inputs/radio.spec.js.map +1 -1
- package/esm/components/inputs/select.js +1 -1
- package/esm/components/inputs/select.js.map +1 -1
- package/esm/components/inputs/slider.js +1 -1
- package/esm/components/inputs/slider.js.map +1 -1
- package/esm/components/inputs/switch.js +1 -1
- package/esm/components/inputs/switch.js.map +1 -1
- package/esm/components/inputs/switch.spec.js +1 -1
- package/esm/components/inputs/switch.spec.js.map +1 -1
- package/esm/components/inputs/text-area.js +1 -1
- package/esm/components/inputs/text-area.js.map +1 -1
- package/esm/components/inputs/text-area.spec.js +1 -1
- package/esm/components/inputs/text-area.spec.js.map +1 -1
- package/esm/components/linear-progress.d.ts +2 -4
- package/esm/components/linear-progress.d.ts.map +1 -1
- package/esm/components/linear-progress.js +3 -6
- package/esm/components/linear-progress.js.map +1 -1
- package/esm/components/linear-progress.spec.js +21 -18
- package/esm/components/linear-progress.spec.js.map +1 -1
- package/esm/components/list/list-item.js +1 -1
- package/esm/components/list/list-item.js.map +1 -1
- package/esm/components/list/list.js +1 -1
- package/esm/components/list/list.js.map +1 -1
- package/esm/components/loader.js +1 -1
- package/esm/components/loader.js.map +1 -1
- package/esm/components/loader.spec.js +1 -1
- package/esm/components/loader.spec.js.map +1 -1
- package/esm/components/markdown/markdown-display.js +1 -1
- package/esm/components/markdown/markdown-display.js.map +1 -1
- package/esm/components/markdown/markdown-display.spec.js +1 -1
- package/esm/components/markdown/markdown-display.spec.js.map +1 -1
- package/esm/components/markdown/markdown-editor.js +1 -1
- package/esm/components/markdown/markdown-editor.js.map +1 -1
- package/esm/components/markdown/markdown-editor.spec.js +1 -1
- package/esm/components/markdown/markdown-editor.spec.js.map +1 -1
- package/esm/components/markdown/markdown-input.js +1 -1
- package/esm/components/markdown/markdown-input.js.map +1 -1
- package/esm/components/markdown/markdown-input.spec.js +1 -1
- package/esm/components/markdown/markdown-input.spec.js.map +1 -1
- package/esm/components/menu/menu.js +1 -1
- package/esm/components/menu/menu.js.map +1 -1
- package/esm/components/modal.js +1 -1
- package/esm/components/modal.js.map +1 -1
- package/esm/components/modal.spec.js +3 -3
- package/esm/components/modal.spec.js.map +1 -1
- package/esm/components/noty-list.js +2 -2
- package/esm/components/noty-list.js.map +1 -1
- package/esm/components/page-container/index.js +1 -1
- package/esm/components/page-container/index.js.map +1 -1
- package/esm/components/page-container/page-header.js +1 -1
- package/esm/components/page-container/page-header.js.map +1 -1
- package/esm/components/page-layout/index.js +1 -1
- package/esm/components/page-layout/index.js.map +1 -1
- package/esm/components/pagination.js +1 -1
- package/esm/components/pagination.js.map +1 -1
- package/esm/components/paper.js +1 -1
- package/esm/components/paper.js.map +1 -1
- package/esm/components/rating.js +1 -1
- package/esm/components/rating.js.map +1 -1
- package/esm/components/rating.spec.js +1 -1
- package/esm/components/rating.spec.js.map +1 -1
- package/esm/components/result.js +1 -1
- package/esm/components/result.js.map +1 -1
- package/esm/components/skeleton.js +1 -1
- package/esm/components/skeleton.js.map +1 -1
- package/esm/components/suggest/index.js +1 -1
- package/esm/components/suggest/index.js.map +1 -1
- package/esm/components/suggest/index.spec.js +1 -1
- package/esm/components/suggest/index.spec.js.map +1 -1
- package/esm/components/suggest/suggest-input.js +1 -1
- package/esm/components/suggest/suggest-input.js.map +1 -1
- package/esm/components/suggest/suggest-input.spec.js +1 -1
- package/esm/components/suggest/suggest-input.spec.js.map +1 -1
- package/esm/components/suggest/suggestion-list.js +1 -1
- package/esm/components/suggest/suggestion-list.js.map +1 -1
- package/esm/components/suggest/suggestion-list.spec.js +1 -1
- package/esm/components/suggest/suggestion-list.spec.js.map +1 -1
- package/esm/components/tabs.js +2 -2
- package/esm/components/tabs.js.map +1 -1
- package/esm/components/timeline.js +2 -2
- package/esm/components/timeline.js.map +1 -1
- package/esm/components/tooltip.js +1 -1
- package/esm/components/tooltip.js.map +1 -1
- package/esm/components/tree/tree-item.js +1 -1
- package/esm/components/tree/tree-item.js.map +1 -1
- package/esm/components/tree/tree.js +1 -1
- package/esm/components/tree/tree.js.map +1 -1
- package/esm/components/typography.js +1 -1
- package/esm/components/typography.js.map +1 -1
- package/esm/components/wizard/index.js +1 -1
- package/esm/components/wizard/index.js.map +1 -1
- package/esm/components/wizard/index.spec.js +3 -3
- package/esm/components/wizard/index.spec.js.map +1 -1
- package/package.json +3 -3
- package/src/components/accordion/accordion-item.tsx +1 -1
- package/src/components/accordion/accordion.tsx +1 -1
- package/src/components/alert.tsx +1 -1
- package/src/components/app-bar-link.tsx +1 -1
- package/src/components/app-bar.tsx +1 -1
- package/src/components/avatar.tsx +1 -1
- package/src/components/badge.tsx +1 -1
- package/src/components/breadcrumb.spec.tsx +3 -3
- package/src/components/breadcrumb.tsx +1 -1
- package/src/components/button-group.tsx +4 -4
- package/src/components/button.spec.tsx +1 -1
- package/src/components/button.tsx +1 -1
- package/src/components/cache-view.spec.tsx +2 -2
- package/src/components/cache-view.tsx +3 -3
- package/src/components/card.tsx +5 -5
- package/src/components/carousel.tsx +1 -1
- package/src/components/chip.tsx +1 -1
- package/src/components/circular-progress.spec.tsx +20 -14
- package/src/components/circular-progress.tsx +5 -11
- package/src/components/command-palette/command-palette-input.tsx +1 -1
- package/src/components/command-palette/command-palette-suggestion-list.spec.tsx +1 -1
- package/src/components/command-palette/command-palette-suggestion-list.tsx +1 -1
- package/src/components/command-palette/index.tsx +1 -1
- package/src/components/context-menu/context-menu-item.tsx +1 -1
- package/src/components/context-menu/context-menu.tsx +1 -1
- package/src/components/data-grid/body.tsx +1 -1
- package/src/components/data-grid/data-grid-row.tsx +1 -1
- package/src/components/data-grid/data-grid.spec.tsx +62 -36
- package/src/components/data-grid/data-grid.tsx +14 -8
- package/src/components/data-grid/filters/boolean-filter.spec.tsx +29 -18
- package/src/components/data-grid/filters/boolean-filter.tsx +6 -6
- package/src/components/data-grid/filters/date-filter.spec.tsx +35 -22
- package/src/components/data-grid/filters/date-filter.tsx +8 -8
- package/src/components/data-grid/filters/enum-filter.spec.tsx +35 -20
- package/src/components/data-grid/filters/enum-filter.tsx +7 -7
- package/src/components/data-grid/filters/filter-dropdown.tsx +1 -1
- package/src/components/data-grid/filters/number-filter.spec.tsx +32 -22
- package/src/components/data-grid/filters/number-filter.tsx +7 -7
- package/src/components/data-grid/filters/string-filter.spec.tsx +32 -20
- package/src/components/data-grid/filters/string-filter.tsx +7 -7
- package/src/components/data-grid/footer.spec.tsx +79 -31
- package/src/components/data-grid/footer.tsx +10 -15
- package/src/components/data-grid/header.spec.tsx +152 -68
- package/src/components/data-grid/header.tsx +64 -27
- package/src/components/data-grid/selection-cell.tsx +1 -1
- package/src/components/dialog.tsx +1 -1
- package/src/components/divider.tsx +1 -1
- package/src/components/drawer/drawer-toggle-button.tsx +1 -1
- package/src/components/drawer/index.tsx +1 -1
- package/src/components/dropdown.tsx +1 -1
- package/src/components/fab.tsx +1 -1
- package/src/components/form.tsx +1 -1
- package/src/components/grid.tsx +1 -1
- package/src/components/icons/icon.tsx +1 -1
- package/src/components/image.tsx +2 -2
- package/src/components/inputs/autocomplete.tsx +1 -1
- package/src/components/inputs/checkbox.spec.tsx +1 -1
- package/src/components/inputs/checkbox.tsx +1 -1
- package/src/components/inputs/input-number.spec.tsx +1 -1
- package/src/components/inputs/input-number.tsx +1 -1
- package/src/components/inputs/input.spec.tsx +1 -1
- package/src/components/inputs/input.tsx +1 -1
- package/src/components/inputs/radio-group.spec.tsx +1 -1
- package/src/components/inputs/radio-group.tsx +1 -1
- package/src/components/inputs/radio.spec.tsx +1 -1
- package/src/components/inputs/radio.tsx +1 -1
- package/src/components/inputs/select.tsx +1 -1
- package/src/components/inputs/slider.tsx +1 -1
- package/src/components/inputs/switch.spec.tsx +1 -1
- package/src/components/inputs/switch.tsx +1 -1
- package/src/components/inputs/text-area.spec.tsx +1 -1
- package/src/components/inputs/text-area.tsx +1 -1
- package/src/components/linear-progress.spec.tsx +22 -18
- package/src/components/linear-progress.tsx +5 -11
- package/src/components/list/list-item.tsx +1 -1
- package/src/components/list/list.tsx +1 -1
- package/src/components/loader.spec.tsx +1 -1
- package/src/components/loader.tsx +1 -1
- package/src/components/markdown/markdown-display.spec.tsx +1 -1
- package/src/components/markdown/markdown-display.tsx +1 -1
- package/src/components/markdown/markdown-editor.spec.tsx +1 -1
- package/src/components/markdown/markdown-editor.tsx +1 -1
- package/src/components/markdown/markdown-input.spec.tsx +1 -1
- package/src/components/markdown/markdown-input.tsx +1 -1
- package/src/components/menu/menu.tsx +1 -1
- package/src/components/modal.spec.tsx +3 -3
- package/src/components/modal.tsx +1 -1
- package/src/components/noty-list.tsx +2 -2
- package/src/components/page-container/index.tsx +1 -1
- package/src/components/page-container/page-header.tsx +1 -1
- package/src/components/page-layout/index.tsx +1 -1
- package/src/components/pagination.tsx +1 -1
- package/src/components/paper.tsx +1 -1
- package/src/components/rating.spec.tsx +1 -1
- package/src/components/rating.tsx +1 -1
- package/src/components/result.tsx +1 -1
- package/src/components/skeleton.tsx +1 -1
- package/src/components/suggest/index.spec.tsx +1 -1
- package/src/components/suggest/index.tsx +1 -1
- package/src/components/suggest/suggest-input.spec.tsx +1 -1
- package/src/components/suggest/suggest-input.tsx +1 -1
- package/src/components/suggest/suggestion-list.spec.tsx +1 -1
- package/src/components/suggest/suggestion-list.tsx +1 -1
- package/src/components/tabs.tsx +2 -2
- package/src/components/timeline.tsx +2 -2
- package/src/components/tooltip.tsx +1 -1
- package/src/components/tree/tree-item.tsx +1 -1
- package/src/components/tree/tree.tsx +1 -1
- package/src/components/typography.tsx +1 -1
- package/src/components/wizard/index.spec.tsx +3 -3
- package/src/components/wizard/index.tsx +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Injector } from '@furystack/inject';
|
|
2
2
|
import { createComponent, flushUpdates, initializeShadeRoot } from '@furystack/shades';
|
|
3
|
-
import {
|
|
3
|
+
import { usingAsync } from '@furystack/utils';
|
|
4
4
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
5
|
import { EnumFilter } from './enum-filter.js';
|
|
6
6
|
const enumValues = [
|
|
@@ -16,18 +16,18 @@ describe('EnumFilter', () => {
|
|
|
16
16
|
document.body.innerHTML = '';
|
|
17
17
|
});
|
|
18
18
|
const createFindOptions = (options = {}) => {
|
|
19
|
-
return
|
|
19
|
+
return options;
|
|
20
20
|
};
|
|
21
|
-
const renderEnumFilter = async (findOptions, field = 'role', values = enumValues, onClose = vi.fn()) => {
|
|
21
|
+
const renderEnumFilter = async (findOptions, field = 'role', values = enumValues, onClose = vi.fn(), onFindOptionsChange = vi.fn()) => {
|
|
22
22
|
const injector = new Injector();
|
|
23
23
|
const rootElement = document.getElementById('root');
|
|
24
24
|
initializeShadeRoot({
|
|
25
25
|
injector,
|
|
26
26
|
rootElement,
|
|
27
|
-
jsxElement: createComponent(EnumFilter, { field: field, values: values, findOptions: findOptions, onClose: onClose }),
|
|
27
|
+
jsxElement: (createComponent(EnumFilter, { field: field, values: values, findOptions: findOptions, onFindOptionsChange: onFindOptionsChange, onClose: onClose })),
|
|
28
28
|
});
|
|
29
29
|
await flushUpdates();
|
|
30
|
-
return { injector, onClose };
|
|
30
|
+
return { injector, onClose, onFindOptionsChange };
|
|
31
31
|
};
|
|
32
32
|
it('should render mode control and checkboxes for each value', async () => {
|
|
33
33
|
const findOptions = createFindOptions();
|
|
@@ -40,7 +40,7 @@ describe('EnumFilter', () => {
|
|
|
40
40
|
});
|
|
41
41
|
it('should apply $in filter when values are selected and Apply is clicked', async () => {
|
|
42
42
|
const findOptions = createFindOptions();
|
|
43
|
-
const { injector, onClose } = await renderEnumFilter(findOptions);
|
|
43
|
+
const { injector, onClose, onFindOptionsChange } = await renderEnumFilter(findOptions);
|
|
44
44
|
await usingAsync(injector, async () => {
|
|
45
45
|
const checkboxes = document.querySelectorAll('shade-checkbox input[type="checkbox"]');
|
|
46
46
|
const adminCheckbox = checkboxes[0];
|
|
@@ -49,13 +49,13 @@ describe('EnumFilter', () => {
|
|
|
49
49
|
const applyButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Apply');
|
|
50
50
|
applyButton?.click();
|
|
51
51
|
await flushUpdates();
|
|
52
|
-
expect(
|
|
52
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ filter: { role: { $in: ['admin'] } } }));
|
|
53
53
|
expect(onClose).toHaveBeenCalled();
|
|
54
54
|
});
|
|
55
55
|
});
|
|
56
56
|
it('should apply $nin filter when exclude mode is selected', async () => {
|
|
57
57
|
const findOptions = createFindOptions();
|
|
58
|
-
const { injector, onClose } = await renderEnumFilter(findOptions);
|
|
58
|
+
const { injector, onClose, onFindOptionsChange } = await renderEnumFilter(findOptions);
|
|
59
59
|
await usingAsync(injector, async () => {
|
|
60
60
|
const excludeButton = document.querySelector('shade-segmented-control button[data-value="exclude"]');
|
|
61
61
|
excludeButton?.click();
|
|
@@ -67,13 +67,13 @@ describe('EnumFilter', () => {
|
|
|
67
67
|
const applyButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Apply');
|
|
68
68
|
applyButton?.click();
|
|
69
69
|
await flushUpdates();
|
|
70
|
-
expect(
|
|
70
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ filter: { role: { $nin: ['guest'] } } }));
|
|
71
71
|
expect(onClose).toHaveBeenCalled();
|
|
72
72
|
});
|
|
73
73
|
});
|
|
74
74
|
it('should remove filter when no values are selected', async () => {
|
|
75
75
|
const findOptions = createFindOptions({ filter: { role: { $in: ['admin'] } } });
|
|
76
|
-
const { injector, onClose } = await renderEnumFilter(findOptions);
|
|
76
|
+
const { injector, onClose, onFindOptionsChange } = await renderEnumFilter(findOptions);
|
|
77
77
|
await usingAsync(injector, async () => {
|
|
78
78
|
const checkboxes = document.querySelectorAll('shade-checkbox input[type="checkbox"]');
|
|
79
79
|
const adminCheckbox = checkboxes[0];
|
|
@@ -82,36 +82,38 @@ describe('EnumFilter', () => {
|
|
|
82
82
|
const applyButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Apply');
|
|
83
83
|
applyButton?.click();
|
|
84
84
|
await flushUpdates();
|
|
85
|
-
|
|
85
|
+
const updatedOptions = onFindOptionsChange.mock.lastCall?.[0];
|
|
86
|
+
expect(updatedOptions.filter?.role).toBeUndefined();
|
|
86
87
|
expect(onClose).toHaveBeenCalled();
|
|
87
88
|
});
|
|
88
89
|
});
|
|
89
90
|
it('should clear filter when Clear button is clicked', async () => {
|
|
90
91
|
const findOptions = createFindOptions({ filter: { role: { $in: ['admin', 'user'] } } });
|
|
91
|
-
const { injector, onClose } = await renderEnumFilter(findOptions);
|
|
92
|
+
const { injector, onClose, onFindOptionsChange } = await renderEnumFilter(findOptions);
|
|
92
93
|
await usingAsync(injector, async () => {
|
|
93
94
|
const clearButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Clear');
|
|
94
95
|
clearButton?.click();
|
|
95
96
|
await flushUpdates();
|
|
96
|
-
|
|
97
|
+
const updatedOptions = onFindOptionsChange.mock.lastCall?.[0];
|
|
98
|
+
expect(updatedOptions.filter?.role).toBeUndefined();
|
|
97
99
|
expect(onClose).toHaveBeenCalled();
|
|
98
100
|
});
|
|
99
101
|
});
|
|
100
102
|
it('should preserve filters on other fields', async () => {
|
|
101
103
|
const findOptions = createFindOptions({ filter: { role: { $in: ['admin'] }, name: { $regex: 'keep' } } });
|
|
102
|
-
const { injector } = await renderEnumFilter(findOptions);
|
|
104
|
+
const { injector, onFindOptionsChange } = await renderEnumFilter(findOptions);
|
|
103
105
|
await usingAsync(injector, async () => {
|
|
104
106
|
const clearButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Clear');
|
|
105
107
|
clearButton?.click();
|
|
106
108
|
await flushUpdates();
|
|
107
|
-
const
|
|
108
|
-
expect(
|
|
109
|
-
expect(
|
|
109
|
+
const updatedOptions = onFindOptionsChange.mock.lastCall?.[0];
|
|
110
|
+
expect(updatedOptions.filter?.role).toBeUndefined();
|
|
111
|
+
expect(updatedOptions.filter?.name).toEqual({ $regex: 'keep' });
|
|
110
112
|
});
|
|
111
113
|
});
|
|
112
114
|
it('should reset skip to 0 when applying filter', async () => {
|
|
113
115
|
const findOptions = createFindOptions({ skip: 20 });
|
|
114
|
-
const { injector } = await renderEnumFilter(findOptions);
|
|
116
|
+
const { injector, onFindOptionsChange } = await renderEnumFilter(findOptions);
|
|
115
117
|
await usingAsync(injector, async () => {
|
|
116
118
|
const checkboxes = document.querySelectorAll('shade-checkbox input[type="checkbox"]');
|
|
117
119
|
const checkbox = checkboxes[0];
|
|
@@ -120,7 +122,7 @@ describe('EnumFilter', () => {
|
|
|
120
122
|
const applyButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Apply');
|
|
121
123
|
applyButton?.click();
|
|
122
124
|
await flushUpdates();
|
|
123
|
-
expect(
|
|
125
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ skip: 0 }));
|
|
124
126
|
});
|
|
125
127
|
});
|
|
126
128
|
it('should pre-check existing $in filter values', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum-filter.spec.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/enum-filter.spec.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACtF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"enum-filter.spec.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/enum-filter.spec.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { createComponent, Shade } from '@furystack/shades';
|
|
|
2
2
|
import { ClickAwayService } from '../../../services/click-away-service.js';
|
|
3
3
|
import { buildTransition, cssVariableTheme } from '../../../services/css-variable-theme.js';
|
|
4
4
|
export const FilterDropdown = Shade({
|
|
5
|
-
|
|
5
|
+
customElementName: 'data-grid-filter-dropdown',
|
|
6
6
|
css: {
|
|
7
7
|
fontFamily: cssVariableTheme.typography.fontFamily,
|
|
8
8
|
display: 'block',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-dropdown.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/filter-dropdown.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAM3F,MAAM,CAAC,MAAM,cAAc,GAAwE,KAAK,CAAC;IACvG,
|
|
1
|
+
{"version":3,"file":"filter-dropdown.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/filter-dropdown.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAM3F,MAAM,CAAC,MAAM,cAAc,GAAwE,KAAK,CAAC;IACvG,iBAAiB,EAAE,2BAA2B;IAC9C,GAAG,EAAE;QACH,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,UAAU;QAClD,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,MAAM;QACX,IAAI,EAAE,GAAG;QACT,MAAM,EAAE,IAAI;QACZ,0BAA0B,EAAE;YAC1B,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK;YAC7C,YAAY,EAAE,gBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACpD,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE;YACtC,MAAM,EAAE,aAAa,gBAAgB,CAAC,OAAO,EAAE;YAC/C,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,8BAA8B;YACzC,UAAU,EAAE,eAAe,CACzB,CAAC,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,EACnE,CAAC,WAAW,EAAE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CACtE;SACF;QACD,kCAAkC,EAAE;YAClC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,wBAAwB;SACpC;KACF;IACD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,CAAiB,OAAO,CAAC,CAAA;QAEhD,aAAa,CACX,WAAW,EACX,GAAG,EAAE,CACH,IAAI,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;YAClC,KAAK,CAAC,OAAO,EAAE,CAAA;QACjB,CAAC,CAAC,CACL,CAAA;QAED,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE;YAC9B,MAAM,EAAE,GAAG,qBAAqB,CAAC,GAAG,EAAE;gBACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAC5C,CAAC,CAAC,CAAA;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAA;QAC7D,CAAC,CAAC,CAAA;QAEF,OAAO,CACL,yBAAK,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAC,uBAAuB,EAAC,OAAO,EAAE,CAAC,EAAc,EAAE,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,IACpG,QAAQ,CACL,CACP,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { ObservableValue } from '@furystack/utils';
|
|
2
1
|
import type { FilterableFindOptions } from '../data-grid.js';
|
|
3
2
|
export declare const NumberFilter: (props: {
|
|
4
3
|
field: string;
|
|
5
|
-
findOptions:
|
|
4
|
+
findOptions: FilterableFindOptions;
|
|
5
|
+
onFindOptionsChange: (options: FilterableFindOptions) => void;
|
|
6
6
|
onClose: () => void;
|
|
7
7
|
} & Omit<Partial<HTMLElement>, "style"> & {
|
|
8
8
|
style?: Partial<CSSStyleDeclaration>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-filter.d.ts","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/number-filter.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"number-filter.d.ts","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/number-filter.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAc5D,eAAO,MAAM,YAAY;WAChB,MAAM;iBACA,qBAAqB;yBACb,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI;aACpD,MAAM,IAAI;;;;;sEA6FnB,CAAA"}
|
|
@@ -13,14 +13,14 @@ const operatorLabels = {
|
|
|
13
13
|
$lte: '<=',
|
|
14
14
|
};
|
|
15
15
|
export const NumberFilter = Shade({
|
|
16
|
-
|
|
16
|
+
customElementName: 'data-grid-number-filter',
|
|
17
17
|
css: {
|
|
18
18
|
...filterBaseCss,
|
|
19
19
|
fontFamily: cssVariableTheme.typography.fontFamily,
|
|
20
20
|
'& input': filterInputCss,
|
|
21
21
|
},
|
|
22
|
-
render: ({ props,
|
|
23
|
-
const
|
|
22
|
+
render: ({ props, useState }) => {
|
|
23
|
+
const { findOptions } = props;
|
|
24
24
|
const currentFilter = findOptions.filter?.[props.field];
|
|
25
25
|
const currentOperator = currentFilter
|
|
26
26
|
? (Object.keys(currentFilter).find((k) => k in operatorLabels) ?? '$eq')
|
|
@@ -35,13 +35,13 @@ export const NumberFilter = Shade({
|
|
|
35
35
|
else {
|
|
36
36
|
filter[props.field] = { [operator]: num };
|
|
37
37
|
}
|
|
38
|
-
|
|
38
|
+
props.onFindOptionsChange({ ...findOptions, filter, skip: 0 });
|
|
39
39
|
props.onClose();
|
|
40
40
|
};
|
|
41
41
|
const clearFilter = () => {
|
|
42
42
|
const filter = { ...findOptions.filter };
|
|
43
43
|
delete filter[props.field];
|
|
44
|
-
|
|
44
|
+
props.onFindOptionsChange({ ...findOptions, filter, skip: 0 });
|
|
45
45
|
props.onClose();
|
|
46
46
|
};
|
|
47
47
|
const [selectedOperator, setSelectedOperator] = useState('selectedOperator', currentOperator);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-filter.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/number-filter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"number-filter.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/number-filter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Injector } from '@furystack/inject';
|
|
2
2
|
import { createComponent, flushUpdates, initializeShadeRoot } from '@furystack/shades';
|
|
3
|
-
import {
|
|
3
|
+
import { usingAsync } from '@furystack/utils';
|
|
4
4
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
5
|
import { NumberFilter } from './number-filter.js';
|
|
6
6
|
describe('NumberFilter', () => {
|
|
@@ -11,18 +11,18 @@ describe('NumberFilter', () => {
|
|
|
11
11
|
document.body.innerHTML = '';
|
|
12
12
|
});
|
|
13
13
|
const createFindOptions = (options = {}) => {
|
|
14
|
-
return
|
|
14
|
+
return options;
|
|
15
15
|
};
|
|
16
|
-
const renderNumberFilter = async (findOptions, field = 'level', onClose = vi.fn()) => {
|
|
16
|
+
const renderNumberFilter = async (findOptions, field = 'level', onClose = vi.fn(), onFindOptionsChange = vi.fn()) => {
|
|
17
17
|
const injector = new Injector();
|
|
18
18
|
const rootElement = document.getElementById('root');
|
|
19
19
|
initializeShadeRoot({
|
|
20
20
|
injector,
|
|
21
21
|
rootElement,
|
|
22
|
-
jsxElement: createComponent(NumberFilter, { field: field, findOptions: findOptions, onClose: onClose }),
|
|
22
|
+
jsxElement: (createComponent(NumberFilter, { field: field, findOptions: findOptions, onFindOptionsChange: onFindOptionsChange, onClose: onClose })),
|
|
23
23
|
});
|
|
24
24
|
await flushUpdates();
|
|
25
|
-
return { injector, onClose };
|
|
25
|
+
return { injector, onClose, onFindOptionsChange };
|
|
26
26
|
};
|
|
27
27
|
it('should render operator segmented control and input', async () => {
|
|
28
28
|
const findOptions = createFindOptions();
|
|
@@ -35,7 +35,7 @@ describe('NumberFilter', () => {
|
|
|
35
35
|
});
|
|
36
36
|
it('should apply $eq filter on submit', async () => {
|
|
37
37
|
const findOptions = createFindOptions();
|
|
38
|
-
const { injector, onClose } = await renderNumberFilter(findOptions);
|
|
38
|
+
const { injector, onClose, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
39
39
|
await usingAsync(injector, async () => {
|
|
40
40
|
const input = document.querySelector('[data-testid="number-filter-value"]');
|
|
41
41
|
input.value = '42';
|
|
@@ -43,13 +43,13 @@ describe('NumberFilter', () => {
|
|
|
43
43
|
const form = document.querySelector('form');
|
|
44
44
|
form.dispatchEvent(new Event('submit', { bubbles: true }));
|
|
45
45
|
await flushUpdates();
|
|
46
|
-
expect(
|
|
46
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ filter: { level: { $eq: 42 } } }));
|
|
47
47
|
expect(onClose).toHaveBeenCalled();
|
|
48
48
|
});
|
|
49
49
|
});
|
|
50
50
|
it('should apply $gt operator when selected', async () => {
|
|
51
51
|
const findOptions = createFindOptions();
|
|
52
|
-
const { injector, onClose } = await renderNumberFilter(findOptions);
|
|
52
|
+
const { injector, onClose, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
53
53
|
await usingAsync(injector, async () => {
|
|
54
54
|
const gtButton = document.querySelector('shade-segmented-control button[data-value="$gt"]');
|
|
55
55
|
gtButton?.click();
|
|
@@ -60,13 +60,13 @@ describe('NumberFilter', () => {
|
|
|
60
60
|
const form = document.querySelector('form');
|
|
61
61
|
form.dispatchEvent(new Event('submit', { bubbles: true }));
|
|
62
62
|
await flushUpdates();
|
|
63
|
-
expect(
|
|
63
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ filter: { level: { $gt: 10 } } }));
|
|
64
64
|
expect(onClose).toHaveBeenCalled();
|
|
65
65
|
});
|
|
66
66
|
});
|
|
67
67
|
it('should apply $lte operator when selected', async () => {
|
|
68
68
|
const findOptions = createFindOptions();
|
|
69
|
-
const { injector, onClose } = await renderNumberFilter(findOptions);
|
|
69
|
+
const { injector, onClose, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
70
70
|
await usingAsync(injector, async () => {
|
|
71
71
|
const lteButton = document.querySelector('shade-segmented-control button[data-value="$lte"]');
|
|
72
72
|
lteButton?.click();
|
|
@@ -77,24 +77,25 @@ describe('NumberFilter', () => {
|
|
|
77
77
|
const form = document.querySelector('form');
|
|
78
78
|
form.dispatchEvent(new Event('submit', { bubbles: true }));
|
|
79
79
|
await flushUpdates();
|
|
80
|
-
expect(
|
|
80
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ filter: { level: { $lte: 99.5 } } }));
|
|
81
81
|
expect(onClose).toHaveBeenCalled();
|
|
82
82
|
});
|
|
83
83
|
});
|
|
84
84
|
it('should clear filter when Clear button is clicked', async () => {
|
|
85
85
|
const findOptions = createFindOptions({ filter: { level: { $eq: 5 } } });
|
|
86
|
-
const { injector, onClose } = await renderNumberFilter(findOptions);
|
|
86
|
+
const { injector, onClose, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
87
87
|
await usingAsync(injector, async () => {
|
|
88
88
|
const clearButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Clear');
|
|
89
89
|
clearButton?.click();
|
|
90
90
|
await flushUpdates();
|
|
91
|
-
|
|
91
|
+
const updatedOptions = onFindOptionsChange.mock.lastCall?.[0];
|
|
92
|
+
expect(updatedOptions.filter?.level).toBeUndefined();
|
|
92
93
|
expect(onClose).toHaveBeenCalled();
|
|
93
94
|
});
|
|
94
95
|
});
|
|
95
96
|
it('should remove filter when submitting NaN value', async () => {
|
|
96
97
|
const findOptions = createFindOptions({ filter: { level: { $eq: 5 } } });
|
|
97
|
-
const { injector, onClose } = await renderNumberFilter(findOptions);
|
|
98
|
+
const { injector, onClose, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
98
99
|
await usingAsync(injector, async () => {
|
|
99
100
|
const input = document.querySelector('[data-testid="number-filter-value"]');
|
|
100
101
|
input.value = '';
|
|
@@ -102,25 +103,26 @@ describe('NumberFilter', () => {
|
|
|
102
103
|
const form = document.querySelector('form');
|
|
103
104
|
form.dispatchEvent(new Event('submit', { bubbles: true }));
|
|
104
105
|
await flushUpdates();
|
|
105
|
-
|
|
106
|
+
const updatedOptions = onFindOptionsChange.mock.lastCall?.[0];
|
|
107
|
+
expect(updatedOptions.filter?.level).toBeUndefined();
|
|
106
108
|
expect(onClose).toHaveBeenCalled();
|
|
107
109
|
});
|
|
108
110
|
});
|
|
109
111
|
it('should preserve filters on other fields', async () => {
|
|
110
112
|
const findOptions = createFindOptions({ filter: { level: { $gt: 10 }, name: { $regex: 'keep' } } });
|
|
111
|
-
const { injector } = await renderNumberFilter(findOptions);
|
|
113
|
+
const { injector, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
112
114
|
await usingAsync(injector, async () => {
|
|
113
115
|
const clearButton = Array.from(document.querySelectorAll('button')).find((b) => b.textContent?.trim() === 'Clear');
|
|
114
116
|
clearButton?.click();
|
|
115
117
|
await flushUpdates();
|
|
116
|
-
const
|
|
117
|
-
expect(
|
|
118
|
-
expect(
|
|
118
|
+
const updatedOptions = onFindOptionsChange.mock.lastCall?.[0];
|
|
119
|
+
expect(updatedOptions.filter?.level).toBeUndefined();
|
|
120
|
+
expect(updatedOptions.filter?.name).toEqual({ $regex: 'keep' });
|
|
119
121
|
});
|
|
120
122
|
});
|
|
121
123
|
it('should reset skip to 0 when applying filter', async () => {
|
|
122
124
|
const findOptions = createFindOptions({ skip: 20 });
|
|
123
|
-
const { injector } = await renderNumberFilter(findOptions);
|
|
125
|
+
const { injector, onFindOptionsChange } = await renderNumberFilter(findOptions);
|
|
124
126
|
await usingAsync(injector, async () => {
|
|
125
127
|
const input = document.querySelector('[data-testid="number-filter-value"]');
|
|
126
128
|
input.value = '5';
|
|
@@ -128,7 +130,7 @@ describe('NumberFilter', () => {
|
|
|
128
130
|
const form = document.querySelector('form');
|
|
129
131
|
form.dispatchEvent(new Event('submit', { bubbles: true }));
|
|
130
132
|
await flushUpdates();
|
|
131
|
-
expect(
|
|
133
|
+
expect(onFindOptionsChange).toHaveBeenCalledWith(expect.objectContaining({ skip: 0 }));
|
|
132
134
|
});
|
|
133
135
|
});
|
|
134
136
|
it('should show current filter value in input', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-filter.spec.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/number-filter.spec.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACtF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"number-filter.spec.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/number-filter.spec.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { ObservableValue } from '@furystack/utils';
|
|
2
1
|
import type { FilterableFindOptions } from '../data-grid.js';
|
|
3
2
|
export declare const StringFilter: (props: {
|
|
4
3
|
field: string;
|
|
5
|
-
findOptions:
|
|
4
|
+
findOptions: FilterableFindOptions;
|
|
5
|
+
onFindOptionsChange: (options: FilterableFindOptions) => void;
|
|
6
6
|
onClose: () => void;
|
|
7
7
|
} & Omit<Partial<HTMLElement>, "style"> & {
|
|
8
8
|
style?: Partial<CSSStyleDeclaration>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string-filter.d.ts","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/string-filter.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"string-filter.d.ts","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/string-filter.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAa5D,eAAO,MAAM,YAAY;WAChB,MAAM;iBACA,qBAAqB;yBACb,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI;aACpD,MAAM,IAAI;;;;;sEA2FnB,CAAA"}
|
|
@@ -12,14 +12,14 @@ const operatorLabels = {
|
|
|
12
12
|
$eq: 'Equals',
|
|
13
13
|
};
|
|
14
14
|
export const StringFilter = Shade({
|
|
15
|
-
|
|
15
|
+
customElementName: 'data-grid-string-filter',
|
|
16
16
|
css: {
|
|
17
17
|
...filterBaseCss,
|
|
18
18
|
fontFamily: cssVariableTheme.typography.fontFamily,
|
|
19
19
|
'& input': filterInputCss,
|
|
20
20
|
},
|
|
21
|
-
render: ({ props,
|
|
22
|
-
const
|
|
21
|
+
render: ({ props, useState }) => {
|
|
22
|
+
const { findOptions } = props;
|
|
23
23
|
const currentFilter = findOptions.filter?.[props.field];
|
|
24
24
|
const currentOperator = currentFilter
|
|
25
25
|
? (Object.keys(currentFilter).find((k) => k in operatorLabels) ?? '$regex')
|
|
@@ -33,13 +33,13 @@ export const StringFilter = Shade({
|
|
|
33
33
|
else {
|
|
34
34
|
filter[props.field] = { [operator]: value };
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
props.onFindOptionsChange({ ...findOptions, filter, skip: 0 });
|
|
37
37
|
props.onClose();
|
|
38
38
|
};
|
|
39
39
|
const clearFilter = () => {
|
|
40
40
|
const filter = { ...findOptions.filter };
|
|
41
41
|
delete filter[props.field];
|
|
42
|
-
|
|
42
|
+
props.onFindOptionsChange({ ...findOptions, filter, skip: 0 });
|
|
43
43
|
props.onClose();
|
|
44
44
|
};
|
|
45
45
|
const [selectedOperator, setSelectedOperator] = useState('selectedOperator', currentOperator);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string-filter.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/string-filter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"string-filter.js","sourceRoot":"","sources":["../../../../src/components/data-grid/filters/string-filter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAE1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAIlE,MAAM,cAAc,GAAmC;IACrD,MAAM,EAAE,UAAU;IAClB,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,WAAW;IACtB,GAAG,EAAE,QAAQ;CACd,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,CAK9B;IACD,iBAAiB,EAAE,yBAAyB;IAC5C,GAAG,EAAE;QACH,GAAG,aAAa;QAChB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,UAAU;QAClD,SAAS,EAAE,cAAc;KAC1B;IACD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9B,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;QAE7B,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAuC,CAAA;QAC7F,MAAM,eAAe,GAAmB,aAAa;YACnD,CAAC,CAAC,CAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,cAAc,CAAoB,IAAI,QAAQ,CAAC;YAC/F,CAAC,CAAC,QAAQ,CAAA;QACZ,MAAM,YAAY,GAAG,aAAa,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QAE3D,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAE,KAAa,EAAE,EAAE;YAC9D,MAAM,MAAM,GAAG,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,CAAA;YACxC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAC5B,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAA;YAC7C,CAAC;YACD,KAAK,CAAC,mBAAmB,CAAC,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;YAC9D,KAAK,CAAC,OAAO,EAAE,CAAA;QACjB,CAAC,CAAA;QAED,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,MAAM,MAAM,GAAG,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,CAAA;YACxC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAC1B,KAAK,CAAC,mBAAmB,CAAC,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;YAC9D,KAAK,CAAC,OAAO,EAAE,CAAA;QACjB,CAAC,CAAA;QAED,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAiB,kBAAkB,EAAE,eAAe,CAAC,CAAA;QAC7G,IAAI,UAAU,GAAG,YAAY,CAAA;QAE7B,OAAO,CACL,0BACE,QAAQ,EAAE,CAAC,EAAS,EAAE,EAAE;gBACtB,EAAE,CAAC,cAAc,EAAE,CAAA;gBACnB,WAAW,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAA;YAC3C,CAAC;YAED,yBAAK,SAAS,EAAC,YAAY;gBACzB,gBAAC,gBAAgB,IACf,IAAI,EAAC,OAAO,EACZ,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAmB,CAAC,EAC9D,OAAO,EAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAsB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACtE,KAAK,EAAE,EAAE;wBACT,KAAK,EAAE,cAAc,CAAC,EAAE,CAAC;qBAC1B,CAAC,CAAC,GACH,CACE;YACN,yBAAK,SAAS,EAAC,YAAY;gBACzB,0CACc,qBAAqB,EACjC,IAAI,EAAC,MAAM,EACX,WAAW,EAAC,iBAAiB,EAC7B,KAAK,EAAE,YAAY,EACnB,SAAS,QACT,OAAO,EAAE,CAAC,EAAS,EAAE,EAAE;wBACrB,UAAU,GAAI,EAAE,CAAC,MAA2B,CAAC,KAAK,CAAA;oBACpD,CAAC,GACD,CACE;YACN,yBAAK,SAAS,EAAC,gBAAgB;gBAC7B,gBAAC,MAAM,IACL,IAAI,EAAC,QAAQ,EACb,OAAO,EAAC,UAAU,EAClB,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,gBAAC,IAAI,IAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,GAAI,YAGvC;gBACT,gBAAC,MAAM,IACL,IAAI,EAAC,QAAQ,EACb,OAAO,EAAC,UAAU,EAClB,IAAI,EAAC,OAAO,EACZ,KAAK,EAAC,SAAS,EACf,SAAS,EAAE,gBAAC,IAAI,IAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,GAAI,YAGxC,CACL,CACD,CACR,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}
|