@mercurjs/admin 2.3.1 → 2.3.2-canary.1

package/dist/{user-invite-WG57KWD3.js → user-invite-WHBNPT4I.js}

@@ -1,9 +1,20 @@
+import {
+  useFeatureFlag,
+  usePermissions,
+  useRbacAssignableRoles
+} from "./chunk-PVEB24HU.js";
 import {
   isFetchError
 } from "./chunk-C6SUTRP2.js";
+import {
+  ListSummary
+} from "./chunk-4F5GP7J7.js";
 import {
   useUserInviteTableQuery
-} from "./chunk-N5IUYCUZ.js";
+} from "./chunk-UYQY4B7J.js";
+import {
+  Combobox
+} from "./chunk-SR3DYN52.js";
 import {
   KeyboundForm
 } from "./chunk-SITRHMZZ.js";
@@ -64,7 +75,8 @@ import { Trans, useTranslation } from "react-i18next";
 import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var InviteUserSchema = zod.object({
-  email: zod.string().email()
+  email: zod.string().email(),
+  roles: zod.array(zod.string()).optional()
 });
 var PAGE_SIZE = 10;
 var PREFIX = "usr_invite";
@@ -79,15 +91,47 @@ var getBaseUrl = () => {
 var INVITE_URL = `${window.location.origin}${getBaseUrl()}/invite?token=`;
 var InviteUserForm = () => {
   const { t } = useTranslation();
+  const isRbacEnabled = useFeatureFlag("rbac");
+  const { hasPermission } = usePermissions();
+  const canReadRbacRoles = hasPermission("rbac_role:read");
+  const showRbacRolesField = isRbacEnabled && canReadRbacRoles;
   const form = useForm({
     defaultValues: {
-      email: ""
+      email: "",
+      roles: []
     },
     resolver: zodResolver(InviteUserSchema)
   });
+  const { data: assignableData, isPending: isRolesLoading } = useRbacAssignableRoles(
+    { limit: 200, order: "name" },
+    { enabled: showRbacRolesField }
+  );
+  const roleOptions = useMemo(() => {
+    return (assignableData?.roles ?? []).map((role) => ({
+      label: role.name,
+      value: role.id
+    }));
+  }, [assignableData?.roles]);
+  const inviteFields = useMemo(() => {
+    if (!showRbacRolesField) {
+      return void 0;
+    }
+    return [
+      "id",
+      "email",
+      "accepted",
+      "token",
+      "expires_at",
+      "created_at",
+      "updated_at",
+      "rbac_roles.id",
+      "rbac_roles.name"
+    ].join(",");
+  }, [showRbacRolesField]);
   const { raw, searchParams } = useUserInviteTableQuery({
     prefix: PREFIX,
-    pageSize: PAGE_SIZE
+    pageSize: PAGE_SIZE,
+    fields: inviteFields
   });
   const {
     invites,
@@ -96,7 +140,7 @@ var InviteUserForm = () => {
     isError,
     error
   } = useInvites(searchParams);
-  const columns = useColumns();
+  const columns = useColumns({ isRbacEnabled: showRbacRolesField });
   const { table } = useDataTable({
     data: invites ?? [],
     columns,
@@ -109,7 +153,13 @@ var InviteUserForm = () => {
   const { mutateAsync, isPending } = useCreateInvite();
   const handleSubmit = form.handleSubmit(async (values) => {
     try {
-      await mutateAsync({ email: values.email });
+      const payload = {
+        email: values.email
+      };
+      if (showRbacRolesField && values.roles?.length) {
+        payload.roles = values.roles;
+      }
+      await mutateAsync(payload);
       form.reset();
     } catch (error2) {
       if (isFetchError(error2) && error2.status === 400) {
@@ -165,26 +215,63 @@ var InviteUserForm = () => {
                   className: "flex flex-col gap-y-4",
                   "data-testid": "user-invite-form-email-section",
                   children: [
-                    /* @__PURE__ */ jsx("div", { className: "grid grid-cols-2 gap-4", children: /* @__PURE__ */ jsx(
-                      Form.Field,
-                      {
-                        control: form.control,
-                        name: "email",
-                        render: ({ field }) => {
-                          return /* @__PURE__ */ jsxs(Form.Item, { "data-testid": "user-invite-form-email-item", children: [
-                            /* @__PURE__ */ jsx(Form.Label, { "data-testid": "user-invite-form-email-label", children: t("fields.email") }),
-                            /* @__PURE__ */ jsx(Form.Control, { "data-testid": "user-invite-form-email-control", children: /* @__PURE__ */ jsx(
-                              Input,
-                              {
-                                ...field,
-                                "data-testid": "user-invite-form-email-input"
-                              }
-                            ) }),
-                            /* @__PURE__ */ jsx(Form.ErrorMessage, { "data-testid": "user-invite-form-email-error" })
-                          ] });
+                    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+                      /* @__PURE__ */ jsx(
+                        Form.Field,
+                        {
+                          control: form.control,
+                          name: "email",
+                          render: ({ field }) => {
+                            return /* @__PURE__ */ jsxs(Form.Item, { "data-testid": "user-invite-form-email-item", children: [
+                              /* @__PURE__ */ jsx(Form.Label, { "data-testid": "user-invite-form-email-label", children: t("fields.email") }),
+                              /* @__PURE__ */ jsx(Form.Control, { "data-testid": "user-invite-form-email-control", children: /* @__PURE__ */ jsx(
+                                Input,
+                                {
+                                  ...field,
+                                  "data-testid": "user-invite-form-email-input"
+                                }
+                              ) }),
+                              /* @__PURE__ */ jsx(Form.ErrorMessage, { "data-testid": "user-invite-form-email-error" })
+                            ] });
+                          }
                         }
-                      }
-                    ) }),
+                      ),
+                      showRbacRolesField && /* @__PURE__ */ jsx(
+                        Form.Field,
+                        {
+                          control: form.control,
+                          name: "roles",
+                          render: ({ field }) => {
+                            return /* @__PURE__ */ jsxs(Form.Item, { "data-testid": "user-invite-form-roles-item", children: [
+                              /* @__PURE__ */ jsx(
+                                Form.Label,
+                                {
+                                  optional: true,
+                                  tooltip: t("users.inviteRolesTooltip"),
+                                  "data-testid": "user-invite-form-roles-label",
+                                  children: t("roles.domain")
+                                }
+                              ),
+                              /* @__PURE__ */ jsx(Form.Control, { "data-testid": "user-invite-form-roles-control", children: /* @__PURE__ */ jsx(
+                                Combobox,
+                                {
+                                  ...field,
+                                  value: field.value ?? [],
+                                  onChange: (value) => {
+                                    field.onChange(value ?? []);
+                                  },
+                                  options: roleOptions,
+                                  placeholder: t("labels.selectValues"),
+                                  disabled: isRolesLoading,
+                                  "data-testid": "user-invite-form-roles-input"
+                                }
+                              ) }),
+                              /* @__PURE__ */ jsx(Form.ErrorMessage, { "data-testid": "user-invite-form-roles-error" })
+                            ] });
+                          }
+                        }
+                      )
+                    ] }),
                     /* @__PURE__ */ jsx("div", { className: "flex items-center justify-end", children: /* @__PURE__ */ jsx(
                       Button,
                       {
@@ -306,7 +393,7 @@ var InviteActions = ({ invite }) => {
   );
 };
 var columnHelper = createColumnHelper();
-var useColumns = () => {
+var useColumns = ({ isRbacEnabled }) => {
   const { t } = useTranslation();
   return useMemo(
     () => [
@@ -316,6 +403,19 @@ var useColumns = () => {
           return getValue();
         }
       }),
+      ...isRbacEnabled ? [
+        columnHelper.display({
+          id: "roles",
+          header: t("roles.domain"),
+          cell: ({ row }) => {
+            const roleNames = row.original.rbac_roles?.map((role) => role.name) ?? [];
+            if (!roleNames.length) {
+              return /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "-" });
+            }
+            return /* @__PURE__ */ jsx("div", { className: "flex items-center", children: /* @__PURE__ */ jsx(ListSummary, { inline: true, n: 1, list: roleNames }) });
+          }
+        })
+      ] : [],
       columnHelper.accessor("accepted", {
         header: t("fields.status"),
         cell: ({ getValue, row }) => {
@@ -382,7 +482,7 @@ var useColumns = () => {
         cell: ({ row }) => /* @__PURE__ */ jsx(InviteActions, { invite: row.original })
       })
     ],
-    [t]
+    [t, isRbacEnabled]
   );
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/admin",
-  "version": "2.3.1",
+  "version": "2.3.2-canary.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",
@@ -34,8 +34,8 @@
     "lint": "oxlint --max-warnings 0"
   },
   "dependencies": {
-    "@mercurjs/dashboard-shared": "2.3.1",
-    "@mercurjs/client": "2.3.1",
+    "@mercurjs/dashboard-shared": "2.3.2-canary.1",
+    "@mercurjs/client": "2.3.2-canary.1",
     "@ariakit/react": "^0.4.15",
     "@babel/runtime": "^8.0.0",
     "@dnd-kit/core": "^6.1.0",
@@ -88,8 +88,8 @@
     "tsup": "^8.0.2",
     "typescript": "5.9.3",
     "@medusajs/types": "2.18.0",
-    "@mercurjs/core": "2.3.1",
-    "@mercurjs/dashboard-sdk": "2.3.1",
-    "@mercurjs/types": "2.3.1"
+    "@mercurjs/core": "2.3.2-canary.1",
+    "@mercurjs/dashboard-sdk": "2.3.2-canary.1",
+    "@mercurjs/types": "2.3.2-canary.1"
   }
 }