Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Convert DefaultParametersSection and GroupMappingsWidget specs to TS (#75060)

Andrei Chernykhf6105b3cf202
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.jsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsx
similarity index 83%
rename from frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.jsx
rename to frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsx
index 184cd54bc2d..836665e328a 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsx
@@ -2,11 +2,12 @@ import userEvent from "@testing-library/user-event";
import { render, screen, waitFor } from "__support__/ui";
import { FormProvider } from "metabase/forms";
+import type { GroupId, GroupInfo } from "metabase-types/api";
import { createMockGroup } from "metabase-types/api/mocks";
import { GroupMappingsWidgetView } from "./GroupMappingsWidgetView";
-const defaultGroups = [
+const defaultGroups: GroupInfo[] = [
createMockGroup({
id: 1,
name: "Administrators",
@@ -14,7 +15,19 @@ const defaultGroups = [
magic_group_type: "admin",
}),
];
-const defaultMappings = { "group=Administrators": [1] };
+const defaultMappings: Record<string, GroupId[]> = {
+ "group=Administrators": [1],
+};
+
+type SetupOptions = {
+ mappings?: Record<string, GroupId[]>;
+ mappingSetting?: string;
+ clearGroupMember?: jest.Mock;
+ deleteGroup?: jest.Mock;
+ updateSetting?: jest.Mock;
+ setting?: { key: string; value: boolean };
+ groups?: GroupInfo[];
+};
const setup = ({
mappings = defaultMappings,
@@ -22,16 +35,17 @@ const setup = ({
clearGroupMember = jest.fn(),
deleteGroup = jest.fn(),
updateSetting = jest.fn(),
- onSuccess = jest.fn(),
setting = { key: "key", value: true },
groups = defaultGroups,
-} = {}) => {
+}: SetupOptions = {}) => {
render(
<FormProvider
initialValues={{ [setting.key]: setting.value }}
onSubmit={() => {}}
>
<GroupMappingsWidgetView
+ groupHeading=""
+ groupPlaceholder=""
allGroups={groups}
mappings={mappings}
mappingSetting={mappingSetting}
@@ -39,7 +53,6 @@ const setup = ({
clearGroupMember={clearGroupMember}
deleteGroup={deleteGroup}
updateSetting={updateSetting}
- onSuccess={onSuccess}
/>
</FormProvider>,
);
@@ -134,13 +147,34 @@ describe("GroupMappingsWidgetView", () => {
});
describe("when a mapping is set for more than one group", () => {
- const mappings = { "cn=People": [3, 4] };
+ const mappings: Record<string, GroupId[]> = { "cn=People": [3, 4] };
+ // magic_group_type: null so these aren't filtered out by isDefaultGroup.
const groups = [
- { id: 1, name: "All Users", member_count: 5 },
- { id: 2, name: "Administrators", member_count: 1 },
- { id: 3, name: "Group 1", member_count: 2 },
- { id: 4, name: "Group 2", member_count: 2 },
+ createMockGroup({
+ id: 1,
+ name: "All Users",
+ member_count: 5,
+ magic_group_type: null,
+ }),
+ createMockGroup({
+ id: 2,
+ name: "Administrators",
+ member_count: 1,
+ magic_group_type: null,
+ }),
+ createMockGroup({
+ id: 3,
+ name: "Group 1",
+ member_count: 2,
+ magic_group_type: null,
+ }),
+ createMockGroup({
+ id: 4,
+ name: "Group 2",
+ member_count: 2,
+ magic_group_type: null,
+ }),
];
it("handles clearing mapped groups after deleting mapping", async () => {
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.unit.spec.jsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.unit.spec.tsx
similarity index 89%
rename from frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.unit.spec.jsx
rename to frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.unit.spec.tsx
index 73e2f32da0a..739dbf3672a 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.unit.spec.jsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.unit.spec.tsx
@@ -21,12 +21,8 @@ jest.mock("metabase/parameters/utils/date-formatting", () => ({
}));
describe("DefaultParametersSection", () => {
- const setup = (parameters) => {
- renderWithProviders(<DefaultParametersSection parameters={parameters} />);
- };
-
it("should render the heading and info text", () => {
- setup([]);
+ renderWithProviders(<DefaultParametersSection parameters={[]} />);
expect(screen.getByText("Filter values")).toBeInTheDocument();
expect(
screen.getByText(
@@ -46,7 +42,7 @@ describe("DefaultParametersSection", () => {
default: "CA",
}),
];
- setup(parameters);
+ renderWithProviders(<DefaultParametersSection parameters={parameters} />);
expect(screen.getByText("State: CA")).toBeInTheDocument();
});
@@ -58,7 +54,7 @@ describe("DefaultParametersSection", () => {
default: ["Organic", "Direct"],
}),
];
- setup(parameters);
+ renderWithProviders(<DefaultParametersSection parameters={parameters} />);
expect(
screen.getByText(t`Source: ${"Organic"} and ${"Direct"}`),
).toBeInTheDocument();
@@ -72,7 +68,7 @@ describe("DefaultParametersSection", () => {
default: "2024-01-15",
}),
];
- setup(parameters);
+ renderWithProviders(<DefaultParametersSection parameters={parameters} />);
expect(
screen.getByText("Created At: January 15, 2024"),
).toBeInTheDocument();
@@ -86,7 +82,7 @@ describe("DefaultParametersSection", () => {
default: "past30days",
}),
];
- setup(parameters);
+ renderWithProviders(<DefaultParametersSection parameters={parameters} />);
expect(
screen.getByText("Date Range: Previous 30 Days"),
).toBeInTheDocument();
@@ -106,7 +102,7 @@ describe("DefaultParametersSection", () => {
}),
createMockParameter({ name: "Category", type: "category" }), // No default
];
- setup(parameters);
+ renderWithProviders(<DefaultParametersSection parameters={parameters} />);
expect(screen.getByText("State: NY")).toBeInTheDocument();
expect(screen.getByText("Timeframe: Previous 30 Days")).toBeInTheDocument();
expect(screen.queryByText(/Category:/)).not.toBeInTheDocument();