Skip to content

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

Move FormGroupsWidget inline (#73621)

Fraser369373f2deac
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index b87e37ff21a..bca9e1d784e 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -65,6 +65,7 @@ const elements = [
createElement({ type: "shared", name: "comments", enforceOutgoing: true }),
createElement({ type: "shared", name: "data-grid", enforceOutgoing: true }),
createElement({ type: "shared", name: "databases", enforceOutgoing: true }),
+ createElement({ type: "shared", name: "forms", enforceOutgoing: true }),
createElement({ type: "shared", name: "history", enforceOutgoing: true }),
createElement({ type: "shared", name: "hoc", enforceOutgoing: true }),
createElement({ type: "shared", name: "hooks", enforceOutgoing: true }),
diff --git a/frontend/src/metabase/admin/people/forms/UserForm.tsx b/frontend/src/metabase/admin/people/forms/UserForm.tsx
index 481b9d17e3a..66cea3b875a 100644
--- a/frontend/src/metabase/admin/people/forms/UserForm.tsx
+++ b/frontend/src/metabase/admin/people/forms/UserForm.tsx
@@ -1,11 +1,16 @@
+import { useField } from "formik";
+import type { HTMLAttributes } from "react";
import { t } from "ttag";
+import _ from "underscore";
import * as Yup from "yup";
+import { MembershipSelect } from "metabase/admin/people/components/MembershipSelect";
+import { useListPermissionsGroupsQuery } from "metabase/api";
+import { FormField } from "metabase/common/components/FormField";
import { FormFooter } from "metabase/common/components/FormFooter";
import {
Form,
FormErrorMessage,
- FormGroupsWidget,
FormProvider,
FormSubmitButton,
FormTextInput,
@@ -16,7 +21,8 @@ import {
} from "metabase/plugins";
import { Button } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
-import type { User, UserId } from "metabase-types/api";
+import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
+import type { GroupId, Member, User, UserId } from "metabase-types/api";
const localUserSchema = Yup.object({
first_name: Yup.string().nullable().max(100, Errors.maxLength).default(null),
@@ -28,6 +34,109 @@ const externalUserSchema = localUserSchema.shape({
tenant_id: Yup.number().required(Errors.required),
});
+interface FormGroupsWidgetProps extends HTMLAttributes<HTMLDivElement> {
+ name: string;
+ external?: boolean;
+}
+
+const FormGroupsWidget = ({
+ name,
+ className,
+ style,
+ title = t`Groups`,
+ external,
+}: FormGroupsWidgetProps) => {
+ const [{ value: formValue }, , { setValue }] =
+ useField<{ id: GroupId; is_group_manager?: boolean }[]>(name);
+
+ const { data: groups, isLoading } = useListPermissionsGroupsQuery({
+ tenancy: external ? "external" : "internal",
+ });
+
+ if (isLoading || !groups) {
+ return null;
+ }
+
+ const adminGroup = _.find(groups, isAdminGroup);
+ const defaultGroup = _.find(
+ groups,
+ external ? PLUGIN_TENANTS.isExternalUsersGroup : isDefaultGroup,
+ );
+
+ const value = formValue ?? [
+ { id: defaultGroup?.id, is_group_manager: false },
+ ];
+
+ const memberships = value.reduce((acc, { id, ...membershipData }) => {
+ if (id != null) {
+ acc.set(id, membershipData);
+ }
+ return acc;
+ }, new Map());
+
+ const isUserAdmin = memberships.has(adminGroup?.id);
+
+ const handleAdd = (groupId: GroupId, membershipData: Partial<Member>) => {
+ const updatedValue = Array.from(memberships.entries()).map(
+ ([id, membershipData]) => {
+ return {
+ id,
+ ...membershipData,
+ };
+ },
+ );
+
+ updatedValue.push({ id: groupId, ...membershipData });
+ setValue(updatedValue);
+ };
+
+ const handleRemove = (groupId: GroupId) => {
+ const updatedValue = Array.from(memberships.entries())
+ .map(([id, membershipData]) => {
+ if (id === groupId) {
+ return null;
+ }
+
+ return {
+ id,
+ ...membershipData,
+ };
+ })
+ .filter(Boolean);
+
+ setValue(updatedValue);
+ };
+ const handleChange = (
+ groupId: GroupId,
+ newMembershipData: Partial<Member>,
+ ) => {
+ const updatedValue = Array.from(memberships.entries()).map(
+ ([id, membershipData]) => {
+ const data = groupId === id ? newMembershipData : membershipData;
+ return {
+ id,
+ ...data,
+ };
+ },
+ );
+
+ setValue(updatedValue);
+ };
+
+ return (
+ <FormField className={className} style={style} title={title}>
+ <MembershipSelect
+ groups={groups}
+ memberships={memberships}
+ onAdd={handleAdd}
+ onRemove={handleRemove}
+ onChange={handleChange}
+ isUserAdmin={isUserAdmin}
+ />
+ </FormField>
+ );
+};
+
interface UserFormProps {
initialValues?: Partial<User>;
onSubmit: (val: Partial<User>) => void;
diff --git a/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx b/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
deleted file mode 100644
index d0f3192cc63..00000000000
--- a/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { useField } from "formik";
-import type { HTMLAttributes } from "react";
-import { t } from "ttag";
-import _ from "underscore";
-
-import { MembershipSelect } from "metabase/admin/people/components/MembershipSelect";
-import { useListPermissionsGroupsQuery } from "metabase/api";
-import { FormField } from "metabase/common/components/FormField";
-import { PLUGIN_TENANTS } from "metabase/plugins";
-import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
-import type { GroupId, Member } from "metabase-types/api";
-
-interface FormGroupsWidgetProps extends HTMLAttributes<HTMLDivElement> {
- name: string;
- external?: boolean;
-}
-
-export const FormGroupsWidget = ({
- name,
- className,
- style,
- title = t`Groups`,
- external,
-}: FormGroupsWidgetProps) => {
- const [{ value: formValue }, , { setValue }] =
- useField<{ id: GroupId; is_group_manager?: boolean }[]>(name);
-
- const { data: groups, isLoading } = useListPermissionsGroupsQuery({
- tenancy: external ? "external" : "internal",
- });
-
- if (isLoading || !groups) {
- return null;
- }
-
- const adminGroup = _.find(groups, isAdminGroup);
- const defaultGroup = _.find(
- groups,
- external ? PLUGIN_TENANTS.isExternalUsersGroup : isDefaultGroup,
- );
-
- const value = formValue ?? [
- { id: defaultGroup?.id, is_group_manager: false },
- ];
-
- const memberships = value.reduce((acc, { id, ...membershipData }) => {
- if (id != null) {
- acc.set(id, membershipData);
- }
- return acc;
- }, new Map());
-
- const isUserAdmin = memberships.has(adminGroup?.id);
-
- const handleAdd = (groupId: GroupId, membershipData: Partial<Member>) => {
- const updatedValue = Array.from(memberships.entries()).map(
- ([id, membershipData]) => {
- return {
- id,
- ...membershipData,
- };
- },
- );
-
- updatedValue.push({ id: groupId, ...membershipData });
- setValue(updatedValue);
- };
-
- const handleRemove = (groupId: GroupId) => {
- const updatedValue = Array.from(memberships.entries())
- .map(([id, membershipData]) => {
- if (id === groupId) {
- return null;
- }
-
- return {
- id,
- ...membershipData,
- };
- })
- .filter(Boolean);
-
- setValue(updatedValue);
- };
- const handleChange = (
- groupId: GroupId,
- newMembershipData: Partial<Member>,
- ) => {
- const updatedValue = Array.from(memberships.entries()).map(
- ([id, membershipData]) => {
- const data = groupId === id ? newMembershipData : membershipData;
- return {
- id,
- ...data,
- };
- },
- );
-
- setValue(updatedValue);
- };
-
- return (
- <FormField className={className} style={style} title={title}>
- <MembershipSelect
- groups={groups}
- memberships={memberships}
- onAdd={handleAdd}
- onRemove={handleRemove}
- onChange={handleChange}
- isUserAdmin={isUserAdmin}
- />
- </FormField>
- );
-};
diff --git a/frontend/src/metabase/forms/components/FormGroupsWidget/index.ts b/frontend/src/metabase/forms/components/FormGroupsWidget/index.ts
deleted file mode 100644
index c2fa5f39a2d..00000000000
--- a/frontend/src/metabase/forms/components/FormGroupsWidget/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./FormGroupsWidget";
diff --git a/frontend/src/metabase/forms/components/index.ts b/frontend/src/metabase/forms/components/index.ts
index a5161b3d92c..ec6be4f174b 100644
--- a/frontend/src/metabase/forms/components/index.ts
+++ b/frontend/src/metabase/forms/components/index.ts
@@ -5,7 +5,6 @@ export * from "./FormChipGroup";
export * from "./FormDateInput";
export * from "./FormErrorMessage";
export * from "./FormField";
-export * from "./FormGroupsWidget";
export * from "./FormGroupWidget";
export * from "./FormInlineUpdater";
export * from "./FormMessage";