@droppii-org/chat-sdk 0.3.5 → 0.3.6

package/dist/components/group/AdminPermissionModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdminPermissionModal.d.ts","sourceRoot":"","sources":["../../../src/components/group/AdminPermissionModal.tsx"],"names":[],"mappings":"AAcA,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IAIpB,MAAM,CAAC,EAAE,OAAO,CAAC;IAKjB,MAAM,CAAC,EAAE,0BAA0B,CAAC;IAKpC,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC5E;AA8CD,QAAA,MAAM,oBAAoB,GAAI,uEAO3B,yBAAyB,mDA0L3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"AdminPermissionModal.d.ts","sourceRoot":"","sources":["../../../src/components/group/AdminPermissionModal.tsx"],"names":[],"mappings":"AAcA,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IAIpB,MAAM,CAAC,EAAE,OAAO,CAAC;IAKjB,MAAM,CAAC,EAAE,0BAA0B,CAAC;IAKpC,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC5E;AA6DD,QAAA,MAAM,oBAAoB,GAAI,uEAO3B,yBAAyB,mDA2M3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/dist/components/group/AdminPermissionModal.js

@@ -3,19 +3,29 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { ConfigProvider, Modal, Switch, message } from "antd";
 import { useTranslation } from "react-i18next";
+import { GroupMemberRole } from "@droppii-org/wasm-client-sdk";
 import { useGroupPermission } from "../../hooks/group/useGroupPermission";
+import { useGroupMembers } from "../../hooks/group/useGroupMembers";
 import { useSetGroupMemberPermissions } from "../../hooks/group/useGroupMemberActions";
 import { Icon } from "../../components/icon";
 import { PERMISSION_SWITCH_COLOR } from "../../constants";
 import { GROUP_PERMISSION_KEY } from "../../constants/im";
-import useGroupPermissionOverridesStore from "../../store/groupPermissionOverrides";
+// "Cập nhật thông tin nhóm" is one switch in the UI but bundles 3 BE
+// permission keys (name/avatar/description) — DROPPII-30533 fix: reading
+// only checked UPDATE_GROUP_NAME, so turning the switch off only ever
+// stripped that one key, leaving avatar/description at the role default.
+const UPDATE_GROUP_INFO_KEYS = [
+    GROUP_PERMISSION_KEY.updateGroupName,
+    GROUP_PERMISSION_KEY.updateGroupAvatar,
+    GROUP_PERMISSION_KEY.updateGroupDescription,
+];
 const permissionListToOverrides = (permissionList) => ({
     sendMessage: permissionList.includes(GROUP_PERMISSION_KEY.sendMessage),
     pinMessage: permissionList.includes(GROUP_PERMISSION_KEY.pinMessage),
     viewMemberInformation: permissionList.includes(GROUP_PERMISSION_KEY.viewMemberInformation),
     addMember: permissionList.includes(GROUP_PERMISSION_KEY.addMember),
     removeMember: permissionList.includes(GROUP_PERMISSION_KEY.removeMember),
-    updateGroupInfo: permissionList.includes(GROUP_PERMISSION_KEY.updateGroupName),
+    updateGroupInfo: UPDATE_GROUP_INFO_KEYS.every((key) => permissionList.includes(key)),
 });
 const overridesToPermissionList = (overrides, currentPermissionList) => {
     const desired = {
@@ -25,6 +35,8 @@ const overridesToPermissionList = (overrides, currentPermissionList) => {
         [GROUP_PERMISSION_KEY.addMember]: overrides.addMember,
         [GROUP_PERMISSION_KEY.removeMember]: overrides.removeMember,
         [GROUP_PERMISSION_KEY.updateGroupName]: overrides.updateGroupInfo,
+        [GROUP_PERMISSION_KEY.updateGroupAvatar]: overrides.updateGroupInfo,
+        [GROUP_PERMISSION_KEY.updateGroupDescription]: overrides.updateGroupInfo,
     };
     const managedKeys = new Set(Object.keys(desired));
     const untouched = currentPermissionList.filter((permission) => !managedKeys.has(permission));
@@ -33,19 +45,23 @@ const overridesToPermissionList = (overrides, currentPermissionList) => {
         .map(([permission]) => permission);
     return [...untouched, ...enabled];
 };
-// Mocked config UI (DROPPII-30248 follow-up, "Configure Admin Permissions")
-// when used group-wide (no `member`, e.g. from GroupThreadInfo) — applies
-// to the whole Admin role in the group, no BE persistence yet, committed to
-// the in-memory override store on "Lưu" only. When `member` is passed
-// (from the member list's per-row menu), it instead patches that member's
-// own permission list via the same setGroupMemberInfo call used to mute a
-// member — real BE persistence, scoped to that user.
+// "Configure Admin Permissions" (DROPPII-30248 follow-up). When `member` is
+// passed (from the member list's per-row menu), it patches that one
+// member's permission list via setGroupMemberInfo. When used group-wide (no
+// `member`, e.g. from GroupThreadInfo's group settings), "Lưu" applies the
+// same permission set to every current Admin in the group (DROPPII-30529/
+// 30531 fix) — there is no separate BE endpoint for a role-wide default, so
+// this fans out the existing per-member call to each current Admin instead
+// of only writing to a local override store.
 const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member, onMemberPermissionsSaved, }) => {
     const { t } = useTranslation();
     const groupPermissions = useGroupPermission(groupID);
-    const setAdminOverrides = useGroupPermissionOverridesStore((state) => state.setAdminOverrides);
+    const { members: groupMembers } = useGroupMembers(member ? undefined : groupID);
     const { mutateAsync: setMemberPermissions } = useSetGroupMemberPermissions();
     const [isSaving, setIsSaving] = useState(false);
+    const isGroupInfoEditable = groupPermissions.updateGroupName &&
+        groupPermissions.updateGroupAvatar &&
+        groupPermissions.updateGroupDescription;
     const initialOverrides = () => member
         ? permissionListToOverrides(member.permissions)
         : {
@@ -54,7 +70,7 @@ const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member,
             viewMemberInformation: groupPermissions.viewMemberInformation,
             addMember: groupPermissions.addMember,
             removeMember: groupPermissions.removeMember,
-            updateGroupInfo: groupPermissions.updateGroupName,
+            updateGroupInfo: isGroupInfoEditable,
         };
     const [pending, setPending] = useState(initialOverrides);
     useEffect(() => {
@@ -71,7 +87,7 @@ const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member,
             viewMemberInformation: groupPermissions.viewMemberInformation,
             addMember: groupPermissions.addMember,
             removeMember: groupPermissions.removeMember,
-            updateGroupInfo: groupPermissions.updateGroupName,
+            updateGroupInfo: isGroupInfoEditable,
         };
     const hasChanges = pending.sendMessage !== baseline.sendMessage ||
         pending.pinMessage !== baseline.pinMessage ||
@@ -95,7 +111,15 @@ const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member,
                 onMemberPermissionsSaved === null || onMemberPermissionsSaved === void 0 ? void 0 : onMemberPermissionsSaved(member.userID, nextPermissions);
             }
             else {
-                setAdminOverrides(groupID, pending);
+                const admins = groupMembers.filter((groupMember) => groupMember.roleLevel === GroupMemberRole.Admin);
+                await Promise.all(admins.map((admin) => {
+                    var _a;
+                    return setMemberPermissions({
+                        groupID,
+                        userID: admin.userID,
+                        permissions: overridesToPermissionList(pending, (_a = admin.permissions) !== null && _a !== void 0 ? _a : []),
+                    });
+                }));
             }
             message.success(t("update_admin_permissions_success"));
             onClose();

package/dist/components/message/GroupMembersDrawer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupMembersDrawer.d.ts","sourceRoot":"","sources":["../../../src/components/message/GroupMembersDrawer.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAiB/C,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA0CD,QAAA,MAAM,kBAAkB,GAAI,wDAKzB,uBAAuB,4CA6hBzB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"GroupMembersDrawer.d.ts","sourceRoot":"","sources":["../../../src/components/message/GroupMembersDrawer.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAiB/C,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA0CD,QAAA,MAAM,kBAAkB,GAAI,wDAKzB,uBAAuB,4CAwjBzB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/components/message/GroupMembersDrawer.js

@@ -202,6 +202,16 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
             message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) || t("update_group_info_failed"));
         }
     };
+    const handleConfirmAssignAdmin = async () => {
+        if ((confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) !== "assign-admin")
+            return;
+        try {
+            await handleToggleAdminRole(confirmMemberAction.member);
+        }
+        finally {
+            setConfirmMemberAction(null);
+        }
+    };
     const handleConfirmTransferOwner = async () => {
         var _a, _b;
         if (!groupID || (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) !== "transfer-owner")
@@ -256,7 +266,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                 const leaveGroupItem = {
                     key: "leave-group",
                     label: t("leave_group"),
-                    icon: _jsx(Icon, { icon: "logout-b", size: 16 }),
+                    icon: _jsx(Icon, { icon: "logout-o", size: 16 }),
                     onClick: handleLeaveGroup,
                     danger: true,
                 };
@@ -266,7 +276,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                             {
                                 key: "mute",
                                 label: t("mute_member"),
-                                icon: _jsx(Icon, { icon: "bell-off-b", size: 16 }),
+                                icon: _jsx(Icon, { icon: "bell-off-o", size: 16 }),
                                 disabled: true,
                             },
                             leaveGroupItem,
@@ -276,7 +286,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                         {
                             key: "send-message",
                             label: t("send_message"),
-                            icon: _jsx(Icon, { icon: "send-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "send-o", size: 16 }),
                             disabled: true,
                         },
                         {
@@ -284,14 +294,14 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                             label: member.isSendMessageDisabled
                                 ? t("unmute_member")
                                 : t("mute_member"),
-                            icon: _jsx(Icon, { icon: "bell-off-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "bell-off-o", size: 16 }),
                             disabled: !permissions.removeMember,
                             onClick: () => void handleToggleMemberSendMessage(member),
                         },
                         {
                             key: "transfer-owner",
                             label: t("transfer_owner"),
-                            icon: _jsx(Icon, { icon: "key-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "key-o", size: 16 }),
                             disabled: !permissions.transferOwnership,
                             onClick: () => setConfirmMemberAction({ type: "transfer-owner", member }),
                         },
@@ -307,7 +317,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                                 {
                                     key: "remove-admin",
                                     label: t("remove_from_admin"),
-                                    icon: _jsx(Icon, { icon: "shield-fail-b", size: 16 }),
+                                    icon: _jsx(Icon, { icon: "shield-fail-o", size: 16 }),
                                     disabled: !permissions.addAdmin,
                                     onClick: () => void handleToggleAdminRole(member),
                                 },
@@ -316,15 +326,15 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                                 {
                                     key: "assign-admin",
                                     label: t("assign_as_admin"),
-                                    icon: _jsx(Icon, { icon: "shield-b", size: 16 }),
+                                    icon: _jsx(Icon, { icon: "shield-o", size: 16 }),
                                     disabled: !permissions.addAdmin,
-                                    onClick: () => void handleToggleAdminRole(member),
+                                    onClick: () => setConfirmMemberAction({ type: "assign-admin", member }),
                                 },
                             ]),
                         {
                             key: "remove-member",
                             label: t("remove_from_group"),
-                            icon: _jsx(Icon, { icon: "user-del-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "user-del-o", size: 16 }),
                             danger: true,
                             disabled: !permissions.removeMember,
                             onClick: () => setConfirmMemberAction({ type: "remove", member }),
@@ -332,7 +342,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                         {
                             key: "remove-and-block",
                             label: t("remove_and_block"),
-                            icon: _jsx(Icon, { icon: "user-octagon-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "user-octagon-o", size: 16 }),
                             danger: true,
                             disabled: true,
                         },
@@ -340,7 +350,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                 return (_jsxs("div", { className: "flex items-center gap-3 px-4 py-2", children: [_jsx(Avatar, { src: member.faceURL, size: 40, className: "shrink-0", children: member.nickname.charAt(0) || "A" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsxs("div", { className: "flex items-center gap-2 min-w-0", children: [_jsx("p", { className: "text-sm font-semibold text-gray-900 truncate", children: member.nickname }), member.isCurrentUser && (_jsx("span", { className: "text-xs text-blue-500 shrink-0", children: t("current_account") }))] }), member.roleLabel && (_jsx("p", { className: "text-sm text-gray-500 truncate", children: member.roleLabel }))] }), (isRealGroup || member.isCurrentUser) && (_jsx(Dropdown, { menu: { items: menuItems }, trigger: ["click"], placement: "bottomRight", children: _jsx("button", { type: "button", className: "flex items-center justify-center w-8 h-8 rounded-full text-gray-500 hover:bg-gray-100", onClick: (event) => event.stopPropagation(), children: _jsx(Icon, { icon: "more-horizontal-b", size: 18 }) }) }))] }, member.userID));
             }) }));
     };
-    return (_jsxs("div", { className: "inline-flex shrink-0", children: [_jsx(Button, { type: "text", shape: "default", className: "text-gray-500 w-8 h-8 p-0", onClick: handleOpenDrawer, disabled: disabled || !groupID, children: _jsx(Icon, { icon: "user-two-check-b", size: 22 }) }), _jsx(Drawer, { open: isOpen, onClose: handleCloseDrawer, mask: false, closeIcon: false, styles: {
+    return (_jsxs("div", { className: "inline-flex shrink-0", children: [_jsx(Button, { type: "text", shape: "default", className: "text-gray-500 w-8 h-8 p-0", onClick: handleOpenDrawer, disabled: disabled || !groupID, children: _jsx(Icon, { icon: "user-two-check-o", size: 22 }) }), _jsx(Drawer, { open: isOpen, onClose: handleCloseDrawer, mask: false, closeIcon: false, styles: {
                     body: {
                         padding: 0,
                         height: "100%",
@@ -354,6 +364,8 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                         name: confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.member.nickname,
                     }) }) }), _jsx(Modal, { centered: true, open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "transfer-owner", onOk: handleConfirmTransferOwner, onCancel: () => setConfirmMemberAction(null), title: t("transfer_owner_confirm_title"), okText: t("transfer_owner"), cancelText: t("cancel"), okType: "danger", getContainer: false, forceRender: true, children: _jsx("p", { children: t("transfer_owner_confirm_message", {
                         name: confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.member.nickname,
+                    }) }) }), _jsx(Modal, { centered: true, open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "assign-admin", onOk: handleConfirmAssignAdmin, onCancel: () => setConfirmMemberAction(null), title: t("assign_admin_confirm_title"), okText: t("agree"), cancelText: t("cancel"), getContainer: false, forceRender: true, children: _jsx("p", { children: t("assign_admin_confirm_message", {
+                        name: confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.member.nickname,
                     }) }) })] }));
 };
 export default GroupMembersDrawer;

package/dist/components/message/item/index.js

@@ -154,7 +154,7 @@ const MessageItem = ({ message, allMessages, isGroupChat = false, forceHideTip =
             _jsx(GroupNotificationMessageItem, { message: message })));
     }
     const bubbleNode = (_jsx(MessageBubble, { isMine: isMine, isInternal: isInternalMessage, senderName: message === null || message === void 0 ? void 0 : message.senderNickname, showSenderName: showSenderName, showTip: showTip, id: `${MSG_ITEM_CONTENT_PREFIX}${message === null || message === void 0 ? void 0 : message.clientMsgID}`, content: renderBubbleContent(message, onPressQuoteMessage), isTransparent: isStickerMessage }));
-    const showPinnedBadge = Boolean(message === null || message === void 0 ? void 0 : message.isPinned) && Boolean(onPinMessage);
+    const showPinnedBadge = Boolean(message === null || message === void 0 ? void 0 : message.isPinned);
     const pinnedBadgeNode = showPinnedBadge ? (_jsx("span", { "data-testid": "message-pinned-badge", className: clsx("absolute -top-2.5 z-[1] flex h-[22px] w-[26px] items-center justify-center rounded-full border border-white bg-gray-25", isMine ? "left-0" : "right-0"), children: _jsx(Icon, { icon: "thumbtack-b", size: 12, className: "text-primary-400" }) })) : null;
     const wrappedBubble = hasContextMenu ? (_jsx(Dropdown, { menu: { items: contextMenuItems }, trigger: ["contextMenu"], open: contextMenuOpen, onOpenChange: onContextMenuOpenChange, overlayClassName: MESSAGE_TOOLBOX_OVERLAY_CLASSNAME, children: _jsxs("div", { ref: bubbleWrapperRef, className: "relative min-w-0", children: [bubbleNode, pinnedBadgeNode] }) })) : (_jsxs("div", { className: "relative min-w-0", children: [bubbleNode, pinnedBadgeNode] }));
     return (_createElement("div", Object.assign({}, messageContainerProps, { key: message === null || message === void 0 ? void 0 : message.clientMsgID }),

package/dist/hooks/group/useGroupPermission.js

@@ -48,7 +48,7 @@ const ROLE_DEFAULT_PERMISSIONS = {
 };
 export const permissionListToGroupPermissions = (permissionList, roleLevel) => {
     var _a;
-    if (!permissionList) {
+    if (!permissionList || permissionList.length === 0) {
         return ((_a = ROLE_DEFAULT_PERMISSIONS[roleLevel]) !== null && _a !== void 0 ? _a : ROLE_DEFAULT_PERMISSIONS[GroupMemberRole.Normal]);
     }
     return Object.fromEntries(Object.entries(GROUP_PERMISSION_KEY).map(([field, permissionString]) => [

package/dist/locales/vi/common.json

@@ -160,6 +160,9 @@
   "transfer_owner_confirm_message": "Bạn có chắc muốn chuyển quyền chủ nhóm cho {{name}}? Bạn sẽ trở thành quản trị viên.",
   "assign_as_admin": "Chỉ định làm quản trị viên",
   "assign_as_admin_success": "Đã chỉ định làm quản trị viên",
+  "assign_admin_confirm_title": "Cấp quyền quản trị viên",
+  "assign_admin_confirm_message": "Bạn chắc chắn muốn cấp quyền quản trị viên cho \"{{name}}\" ?",
+  "agree": "Đồng ý",
   "remove_from_admin": "Xoá khỏi quản trị viên",
   "remove_from_admin_success": "Đã xoá khỏi quản trị viên",
   "remove_from_group": "Xoá khỏi nhóm",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-sdk",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Droppii React Chat SDK",
   "repository": {
     "type": "git",