Skip to content

Data widgets v3.0 #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
+705 −399
Open

Data widgets v3.0 #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9aced30
chore: add attributes to settings
iobuhov Feb 26, 2025
51f972a
chore: change interface
iobuhov Feb 27, 2025
bfed956
chore: rename controller
iobuhov Feb 28, 2025
6e6da81
refactor: rename interface
iobuhov Feb 28, 2025
4564605
feat: add filter observer
iobuhov Feb 28, 2025
8c16a36
refactor: rename type
iobuhov Feb 28, 2025
aca5453
refactor: remove dead code
iobuhov Feb 28, 2025
95747af
feat: add filter observer to filter api
iobuhov Feb 28, 2025
c0a1d94
chore: change personalization
iobuhov Mar 3, 2025
149072b
chore: change attr type
iobuhov Mar 3, 2025
d57bf00
feat: add custom text filter
iobuhov Mar 3, 2025
ea8c786
chore: merge filters
iobuhov Mar 4, 2025
6137dab
feat: add state persistence
iobuhov Mar 4, 2025
02a5ba5
chore: change tag exp to not equal
iobuhov Mar 4, 2025
5c4a8b9
chore: add condition tagging
iobuhov Mar 4, 2025
7601851
chore: add filter initialization
iobuhov Mar 4, 2025
c18dc96
chore: remove placeholder tag
iobuhov Mar 4, 2025
a37e32a
test: fix unit tests
iobuhov Mar 4, 2025
654051e
test: fix unit tests
iobuhov Mar 4, 2025
d58fbd1
chore: change label
iobuhov Mar 5, 2025
812f36f
chore: fix types
iobuhov Mar 5, 2025
b9f0df7
fix: update types
iobuhov Mar 7, 2025
a2a8a37
fix: update types
iobuhov Mar 7, 2025
2a2be0d
fix: update types
iobuhov Mar 7, 2025
44e5b23
fix: change types
iobuhov Mar 7, 2025
1303f90
test: update settings schema
iobuhov Mar 7, 2025
3f6e1e0
chore: update lockfile
iobuhov Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions ...ableWidgets/datagrid-date-filter-web/src/components/__tests__/DatagridDateFilter.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "@testing-library/jest-dom";
import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context";
import { FilterAPI } from "@mendix/widget-plugin-filtering/context";
import {
HeaderFiltersStore,
HeaderFiltersStoreProps
HeaderFiltersStoreSpec
} from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore";
import {
actionValue,
Expand All @@ -15,11 +15,7 @@ import { createContext, createElement } from "react";
import DatagridDateFilter from "../../DatagridDateFilter";
import { DatagridDateFilterContainerProps } from "../../../typings/DatagridDateFilterProps";
import { MXGlobalObject, MXSessionConfig } from "../../../typings/global";

interface StaticInfo {
name: string;
filtersChannelName: string;
}
import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver";

function createMXObjectMock(
code: string,
Expand Down Expand Up @@ -54,13 +50,17 @@ const commonProps: DatagridDateFilterContainerProps = {
advanced: false
};

const headerFilterStoreInfo: StaticInfo = {
name: commonProps.name,
filtersChannelName: ""
};

const mxObject = createMXObjectMock("en_US", "en-US");

const mockSpec = (spec: Partial<HeaderFiltersStoreSpec>): HeaderFiltersStoreSpec => ({
filterList: [],
filterChannelName: "datagrid/1",
headerInitFilter: [],
sharedInitFilter: [],
customFilterHost: {} as FilterObserver,
...spec
});

describe("Date Filter", () => {
describe("with single instance", () => {
afterEach(() => {
Expand All @@ -69,13 +69,13 @@ describe("Date Filter", () => {

describe("with single attribute", () => {
beforeEach(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{ filter: new ListAttributeValueBuilder().withType("DateTime").withFilterable(true).build() }
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
(window as any).mx = mxObject;
Expand Down Expand Up @@ -144,7 +144,7 @@ describe("Date Filter", () => {

describe("with double attributes", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -161,9 +161,9 @@ describe("Date Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
(window as any).mx = mxObject;
Expand All @@ -184,13 +184,13 @@ describe("Date Filter", () => {

describe("with wrong attribute's type", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{ filter: new ListAttributeValueBuilder().withType("Decimal").withFilterable(true).build() }
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
(window as any).mx = mxObject;
Expand All @@ -211,7 +211,7 @@ describe("Date Filter", () => {

describe("with wrong multiple attributes' types", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -228,9 +228,9 @@ describe("Date Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
(window as any).mx = mxObject;
Expand Down Expand Up @@ -267,13 +267,13 @@ describe("Date Filter", () => {

describe("with multiple instances", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{ filter: new ListAttributeValueBuilder().withType("DateTime").withFilterable(true).build() }
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
(window as any).mx = mxObject;
Expand All @@ -296,13 +296,13 @@ describe("Date Filter", () => {

describe("with session config", () => {
beforeEach(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{ filter: new ListAttributeValueBuilder().withType("DateTime").withFilterable(true).build() }
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withDateFilterAPI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export function withDateFilterAPI<P extends object>(
Component: (props: P & Date_FilterAPIv2) => React.ReactElement
): (props: P) => React.ReactElement {
return function FilterAPIProvider(props) {
const api = useDateFilterAPI("");
const api = useDateFilterAPI();

if (api.hasError) {
return <Alert bootstrapStyle="danger">{api.error.message}</Alert>;
Expand Down
78 changes: 39 additions & 39 deletions ...ets/datagrid-dropdown-filter-web/src/components/__tests__/DataGridDropdownFilter.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import "@testing-library/jest-dom";
import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context";
import { FilterAPI } from "@mendix/widget-plugin-filtering/context";
import {
HeaderFiltersStore,
HeaderFiltersStoreProps
HeaderFiltersStoreSpec
} from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore";
import { dynamicValue, ListAttributeValueBuilder } from "@mendix/widget-plugin-test-utils";
import { createContext, createElement } from "react";
import DatagridDropdownFilter from "../../DatagridDropdownFilter";
import { fireEvent, render, screen, waitFor } from "@testing-library/react";

interface StaticInfo {
name: string;
filtersChannelName: string;
}
import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver";

const commonProps = {
class: "filter-custom-class",
Expand All @@ -26,10 +22,14 @@ const commonProps = {
selectedItemsStyle: "text" as const
};

const headerFilterStoreInfo: StaticInfo = {
name: commonProps.name,
filtersChannelName: ""
};
const mockSpec = (spec: Partial<HeaderFiltersStoreSpec>): HeaderFiltersStoreSpec => ({
filterList: [],
filterChannelName: "datagrid/1",
headerInitFilter: [],
sharedInitFilter: [],
customFilterHost: {} as FilterObserver,
...spec
});

const consoleError = global.console.error;
jest.spyOn(global.console, "error").mockImplementation((...args: any[]) => {
Expand All @@ -50,7 +50,7 @@ describe("Dropdown Filter", () => {

describe("with single attribute", () => {
function mockCtx(universe: string[]): void {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -64,9 +64,9 @@ describe("Dropdown Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
}
Expand Down Expand Up @@ -207,7 +207,7 @@ describe("Dropdown Filter", () => {

describe("with multiple attributes", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -234,9 +234,9 @@ describe("Dropdown Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand Down Expand Up @@ -267,15 +267,15 @@ describe("Dropdown Filter", () => {

describe("with wrong attribute's type", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder().withType("String").withFilterable(true).build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand All @@ -297,7 +297,7 @@ describe("Dropdown Filter", () => {

describe("with wrong multiple attributes' types", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -314,9 +314,9 @@ describe("Dropdown Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand Down Expand Up @@ -354,7 +354,7 @@ describe("Dropdown Filter", () => {

describe("with invalid values", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -364,9 +364,9 @@ describe("Dropdown Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand All @@ -392,7 +392,7 @@ describe("Dropdown Filter", () => {

describe("with multiple invalid values", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -409,9 +409,9 @@ describe("Dropdown Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand Down Expand Up @@ -442,7 +442,7 @@ describe("Dropdown Filter", () => {

describe("with multiple instances", () => {
beforeAll(() => {
const props: HeaderFiltersStoreProps = {
const spec = mockSpec({
filterList: [
{
filter: new ListAttributeValueBuilder()
Expand All @@ -456,9 +456,9 @@ describe("Dropdown Filter", () => {
.build()
}
]
};
const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPIv2>(
});
const headerFilterStore = new HeaderFiltersStore(spec);
(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext<FilterAPI>(
headerFilterStore.context
);
});
Expand Down
Loading
Loading