@selfcommunity/react-ui 0.7.9-alpha.8 → 0.7.9-alpha.81

package/lib/cjs/components/PrivateMessageComponent/PrivateMessageComponent.js

@@ -57,7 +57,7 @@ function PrivateMessageComponent(inProps) {
         props: inProps,
         name: constants_1.PREFIX
     });
-    const { id = null, className = null, onItemClick = null, onThreadBack = null, onSingleMessageOpen = null } = props, rest = tslib_1.__rest(props, ["id", "className", "onItemClick", "onThreadBack", "onSingleMessageOpen"]);
+    const { id = null, type = null, className = null, onItemClick = null, onThreadBack = null, onSingleMessageOpen = null } = props, rest = tslib_1.__rest(props, ["id", "type", "className", "onItemClick", "onThreadBack", "onSingleMessageOpen"]);
     // CONTEXT
     const scUserContext = (0, react_core_1.useSCUser)();
     const scPreferences = (0, react_core_1.useSCPreferences)();
@@ -67,6 +67,7 @@ function PrivateMessageComponent(inProps) {
     const isMobile = (0, material_1.useMediaQuery)(theme.breakpoints.down('md'));
     const [layout, setLayout] = (0, react_1.useState)('default');
     const [obj, setObj] = (0, react_1.useState)(id !== null && id !== void 0 ? id : null);
+    const [_type, _setType] = (0, react_1.useState)(type);
     const isNew = obj && obj === types_1.SCPrivateMessageStatusType.NEW;
     const [openNewMessage, setOpenNewMessage] = (0, react_1.useState)(isNew !== null && isNew !== void 0 ? isNew : false);
     const mobileSnippetsView = (layout === 'default' && !obj) || (layout === 'mobile' && !obj);
@@ -84,14 +85,19 @@ function PrivateMessageComponent(inProps) {
     (0, react_1.useEffect)(() => {
         setObj(id !== null && id !== void 0 ? id : null);
     }, [id]);
+    (0, react_1.useEffect)(() => {
+        _setType(type !== null && type !== void 0 ? type : null);
+    }, [type]);
     //  HANDLERS
     /**
      * Handles thread opening on click
      * @param item
+     * @param type
      */
-    const handleThreadOpening = (item) => {
-        onItemClick && onItemClick(messageReceiver(item, authUserId));
-        setObj(messageReceiver(item, authUserId));
+    const handleThreadOpening = (item, type) => {
+        onItemClick && onItemClick(item.group ? item.group.id : messageReceiver(item, authUserId), type);
+        _setType(type);
+        setObj(item.group ? item : messageReceiver(item, authUserId));
         setOpenNewMessage(false);
     };
     /**
@@ -107,7 +113,8 @@ function PrivateMessageComponent(inProps) {
     const handleOpenNewMessage = () => {
         setOpenNewMessage(!openNewMessage);
         setObj(types_1.SCPrivateMessageStatusType.NEW);
-        onItemClick && onItemClick(types_1.SCPrivateMessageStatusType.NEW);
+        _setType(types_1.SCPrivateMessageType.NEW);
+        onItemClick && onItemClick(types_1.SCPrivateMessageStatusType.NEW, types_1.SCPrivateMessageType.NEW);
     };
     /**
      * Handles new messages open from user profile page or notifications section
@@ -123,13 +130,14 @@ function PrivateMessageComponent(inProps) {
         id && setLayout('mobile');
         setOpenNewMessage(false);
         setObj(null);
+        _setType(null);
         onThreadBack && onThreadBack();
     };
     /**
      * Handles state update when a new message is sent
      */
     const handleOnNewMessageSent = (msg, isOne) => {
-        onItemClick && onItemClick(isOne ? messageReceiver(msg, authUserId) : '');
+        onItemClick && onItemClick(isOne ? messageReceiver(msg, authUserId) : '', msg.group ? types_1.SCPrivateMessageType.GROUP : types_1.SCPrivateMessageType.USER);
         setObj(isOne ? messageReceiver(msg, authUserId) : null);
         setOpenNewMessage(false);
     };
@@ -149,14 +157,14 @@ function PrivateMessageComponent(inProps) {
                     onSnippetClick: handleThreadOpening,
                     onNewMessageClick: handleOpenNewMessage,
                     onDeleteConfirm: handleDeleteThread
-                }, userObj: obj, clearSearch: clear, elevation: 0 })));
+                }, threadObj: obj, clearSearch: clear, elevation: 0, type: _type })));
     }
     /**
      * Renders thread section
      */
     function renderThread() {
         return (react_1.default.createElement(material_1.Grid, { item: true, xs: 12, md: 7, className: (0, classnames_1.default)(classes.threadBox, { [classes.hide]: isMobile && mobileSnippetsView }) },
-            react_1.default.createElement(PrivateMessageThread_1.default, { userObj: obj, openNewMessage: openNewMessage, onNewMessageClose: handleMessageBack, onNewMessageSent: handleOnNewMessageSent, onSingleMessageOpen: handleSingleMessage, elevation: 0 })));
+            react_1.default.createElement(PrivateMessageThread_1.default, { threadObj: obj, type: _type, openNewMessage: openNewMessage, onNewMessageClose: handleMessageBack, onNewMessageSent: handleOnNewMessageSent, onSingleMessageOpen: handleSingleMessage, elevation: 0 })));
     }
     /**
      * Renders the component (if not hidden by autoHide prop)

package/lib/cjs/components/PrivateMessageSettingsIconButton/PrivateMessageSettingsIconButton.js

@@ -116,7 +116,7 @@ function PrivateMessageSettingsIconButton(inProps) {
         }
         else {
             return [
-                user && (react_1.default.createElement(material_1.MenuItem, { className: classes.item, component: react_core_1.Link, to: scRoutingContext.url(react_core_1.SCRoutes.USER_PROFILE_ROUTE_NAME, user), key: "profile" },
+                user && (react_1.default.createElement(material_1.MenuItem, { className: classes.item, component: react_core_1.Link, to: scRoutingContext.url(react_core_1.SCRoutes.USER_PROFILE_ROUTE_NAME, user), key: "profile", onClick: handleCloseDialog },
                     react_1.default.createElement(material_1.ListItemIcon, null,
                         react_1.default.createElement(Icon_1.default, { fontSize: "small" }, "people_alt")),
                     react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.privateMessageSettingsIconButton.item.profile", defaultMessage: "ui.privateMessageSettingsIconButton.item.profile" }))),

package/lib/cjs/components/PrivateMessageSnippetItem/PrivateMessageSnippetItem.js

@@ -74,10 +74,12 @@ function PrivateMessageSnippetItem(inProps) {
     // STATE
     const hasBadge = () => {
         var _a;
-        if ((message === null || message === void 0 ? void 0 : message.receiver.id) !== ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.id)) {
-            return message === null || message === void 0 ? void 0 : message.receiver.community_badge;
+        if (message.receiver) {
+            if ((message === null || message === void 0 ? void 0 : message.receiver.id) !== ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.id)) {
+                return message === null || message === void 0 ? void 0 : message.receiver.community_badge;
+            }
+            return message === null || message === void 0 ? void 0 : message.sender.community_badge;
         }
-        return message === null || message === void 0 ? void 0 : message.sender.community_badge;
     };
     if (!message) {
         return react_1.default.createElement(Skeleton_1.default, { elevation: 0 });
@@ -88,10 +90,13 @@ function PrivateMessageSnippetItem(inProps) {
     return (react_1.default.createElement(Root, Object.assign({ className: (0, classnames_1.default)(classes.root, className) }, rest, { secondaryAction: secondaryAction, disablePadding: true }),
         react_1.default.createElement(material_1.ListItemButton, { onClick: onItemClick, classes: { root: (0, classnames_1.default)({ [classes.unread]: message.thread_status === types_1.SCPrivateMessageStatusType.NEW }) } },
             react_1.default.createElement(material_1.ListItemAvatar, null,
-                react_1.default.createElement(UserAvatar_1.default, { hide: !hasBadge() },
-                    react_1.default.createElement(material_1.Avatar, { alt: ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.username) === message.receiver.username ? message.sender.username : message.receiver.username, src: ((_b = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _b === void 0 ? void 0 : _b.username) === message.receiver.username ? message.sender.avatar : message.receiver.avatar }))),
+                react_1.default.createElement(UserAvatar_1.default, { hide: !hasBadge() }, message.group ? (react_1.default.createElement(material_1.Avatar, { alt: message.group.name, src: message.group.image_big })) : (react_1.default.createElement(material_1.Avatar, { alt: ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.username) === message.receiver.username ? message.sender.username : message.receiver.username, src: ((_b = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _b === void 0 ? void 0 : _b.username) === message.receiver.username ? message.sender.avatar : message.receiver.avatar })))),
             react_1.default.createElement(material_1.ListItemText, { primary: react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(material_1.Typography, { component: "span", className: classes.username }, ((_c = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _c === void 0 ? void 0 : _c.username) === message.receiver.username ? message.sender.username : message.receiver.username),
+                    react_1.default.createElement(material_1.Typography, { component: "span", className: classes.username }, message.group
+                        ? message.group.name
+                        : ((_c = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _c === void 0 ? void 0 : _c.username) === message.receiver.username
+                            ? message.sender.username
+                            : message.receiver.username),
                     hasBadge() && preferences && (react_1.default.createElement(material_1.Chip, { component: "span", className: classes.badgeLabel, size: "small", label: preferences[react_core_1.SCPreferences.STAFF_STAFF_BADGE_LABEL] })),
                     react_1.default.createElement(material_1.Typography, { color: "secondary", className: classes.time, component: "span" }, `${intl.formatDate(message.last_message_at, {
                         day: '2-digit',

package/lib/cjs/components/PrivateMessageSnippets/PrivateMessageSnippets.d.ts

@@ -1,5 +1,5 @@
 import { CardProps } from '@mui/material';
-import { SCPrivateMessageSnippetType } from '@selfcommunity/types';
+import { SCPrivateMessageSnippetType, SCPrivateMessageType } from '@selfcommunity/types';
 export interface PrivateMessageSnippetsProps extends CardProps {
     /**
      * Snippets list
@@ -20,7 +20,7 @@ export interface PrivateMessageSnippetsProps extends CardProps {
      *
      */
     snippetActions?: {
-        onSnippetClick?: (msg: any) => void;
+        onSnippetClick?: (msg: any, type: any) => void;
         onNewMessageClick?: () => void;
         onDeleteConfirm?: (msg: any) => void;
     };
@@ -29,10 +29,15 @@ export interface PrivateMessageSnippetsProps extends CardProps {
      */
     [p: string]: any;
     /**
-     * thread user object
+     * thread user/ group object
      * @default null
      */
-    userObj?: any;
+    threadObj?: any;
+    /**
+     * Thread type
+     * @default SCPrivateMessageType.USER
+     */
+    type?: SCPrivateMessageType;
 }
 /**
  * > API documentation for the Community-JS PrivateMessageSnippets component. Learn about the available props and the CSS API.

package/lib/cjs/components/PrivateMessageSnippets/PrivateMessageSnippets.js

@@ -71,25 +71,30 @@ function PrivateMessageSnippets(inProps) {
         props: inProps,
         name: constants_1.PREFIX
     });
-    const { className = null, userObj = null, snippetActions, clearSearch } = props, rest = tslib_1.__rest(props, ["className", "userObj", "snippetActions", "clearSearch"]);
+    const { className = null, threadObj = null, type = null, snippetActions, clearSearch } = props, rest = tslib_1.__rest(props, ["className", "threadObj", "type", "snippetActions", "clearSearch"]);
     // STATE
     const theme = (0, material_1.useTheme)();
     const isMobile = (0, useMediaQuery_1.default)(theme.breakpoints.down('md'));
     const { data, updateSnippets } = (0, react_core_1.useSCFetchPrivateMessageSnippets)({ cacheStrategy: utils_1.CacheStrategies.CACHE_FIRST });
     const [search, setSearch] = (0, react_1.useState)('');
-    const isObj = typeof userObj === 'object';
+    const isObj = typeof threadObj === 'object';
     const scUserContext = (0, react_1.useContext)(react_core_1.SCUserContext);
     const authUserId = scUserContext.user ? scUserContext.user.id : null;
+    const [_type, _setType] = (0, react_1.useState)(type);
     // INTL
     const intl = (0, react_intl_1.useIntl)();
     // REFS
     const refreshSubscription = (0, react_1.useRef)(null);
     // CONST
     const filteredSnippets = data.snippets.filter((el) => {
+        var _a;
         if (search === '') {
             return el;
         }
-        else if (el.receiver.id === authUserId) {
+        else if (el.group) {
+            return el.group.slug.includes(search.toLowerCase());
+        }
+        else if (((_a = el === null || el === void 0 ? void 0 : el.receiver) === null || _a === void 0 ? void 0 : _a.id) === authUserId) {
             return el.sender.username.includes(search.toLowerCase());
         }
         return el.receiver.username.includes(search.toLowerCase());
@@ -101,6 +106,18 @@ function PrivateMessageSnippets(inProps) {
         }
         return ((_b = item === null || item === void 0 ? void 0 : item.receiver) === null || _b === void 0 ? void 0 : _b.id) !== loggedUserId ? (_c = item === null || item === void 0 ? void 0 : item.receiver) === null || _c === void 0 ? void 0 : _c.id : (_d = item === null || item === void 0 ? void 0 : item.sender) === null || _d === void 0 ? void 0 : _d.id;
     };
+    const isSelected = (0, react_1.useMemo)(() => {
+        return (message) => {
+            var _a, _b;
+            if (threadObj && _type === types_1.SCPrivateMessageType.GROUP) {
+                return ((_a = message === null || message === void 0 ? void 0 : message.group) === null || _a === void 0 ? void 0 : _a.id) === (isObj ? (_b = threadObj === null || threadObj === void 0 ? void 0 : threadObj.group) === null || _b === void 0 ? void 0 : _b.id : threadObj);
+            }
+            else if (threadObj && threadObj !== types_1.SCPrivateMessageType.NEW) {
+                return messageReceiver(message, authUserId) === (isObj ? messageReceiver(threadObj, authUserId) : threadObj);
+            }
+            return null;
+        };
+    }, [threadObj, authUserId, _type]);
     //HANDLERS
     const handleChange = (event) => {
         setSearch(event.target.value);
@@ -116,7 +133,9 @@ function PrivateMessageSnippets(inProps) {
         snippetActions && snippetActions.onDeleteConfirm(msg);
     };
     function handleOpenThread(msg) {
-        snippetActions && snippetActions.onSnippetClick(msg);
+        const threadType = msg.group !== null ? types_1.SCPrivateMessageType.GROUP : types_1.SCPrivateMessageType.USER;
+        _setType(threadType);
+        snippetActions && snippetActions.onSnippetClick(msg, threadType);
         handleClear();
         updateSnippetsParams(msg.id, 'seen');
     }
@@ -221,7 +240,6 @@ function PrivateMessageSnippets(inProps) {
                     } }),
                 react_1.default.createElement(material_1.List, null, filteredSnippets.map((message) => (react_1.default.createElement(PrivateMessageSnippetItem_1.default, { message: message, key: message.id, onItemClick: () => handleOpenThread(message), secondaryAction: react_1.default.createElement(react_1.default.Fragment, null,
                         message.thread_status === types_1.SCPrivateMessageStatusType.NEW && (react_1.default.createElement(material_1.Icon, { fontSize: "small", color: "secondary" }, "fiber_manual_record")),
-                        !isMobile && (react_1.default.createElement(PrivateMessageSettingsIconButton_1.default, { threadToDelete: messageReceiver(message, authUserId), onItemDeleteConfirm: () => handleDeleteConversation(messageReceiver(message, authUserId)), user: messageReceiver(message, authUserId, true) }))), selected: userObj !== types_1.SCPrivateMessageStatusType.NEW &&
-                        messageReceiver(message, authUserId) === (isObj ? messageReceiver(userObj, authUserId) : userObj) })))))))));
+                        !isMobile && (react_1.default.createElement(PrivateMessageSettingsIconButton_1.default, { threadToDelete: messageReceiver(message, authUserId), onItemDeleteConfirm: () => handleDeleteConversation(messageReceiver(message, authUserId)), user: messageReceiver(message, authUserId, true) }))), selected: isSelected(message) })))))))));
 }
 exports.default = PrivateMessageSnippets;

package/lib/cjs/components/PrivateMessageThread/PrivateMessageThread.d.ts

@@ -1,10 +1,11 @@
+import { SCPrivateMessageType } from '@selfcommunity/types';
 import { CardProps } from '@mui/material';
 export interface PrivateMessageThreadProps extends CardProps {
     /**
      * Thread object or thread id
      * default null
      */
-    userObj?: any;
+    threadObj?: any;
     /**
      * Overrides or extends the styles applied to the component.
      * @default null
@@ -30,6 +31,10 @@ export interface PrivateMessageThreadProps extends CardProps {
      * @default null
      */
     onSingleMessageOpen?: (open: boolean) => void;
+    /**
+     * The Thread type
+     */
+    type?: SCPrivateMessageType;
     /**
      * Any other properties
      */

package/lib/cjs/components/PrivateMessageThread/PrivateMessageThread.js

@@ -43,6 +43,8 @@ const classes = {
     newMessageContent: `${constants_1.PREFIX}-new-message-content`,
     sender: `${constants_1.PREFIX}-sender`,
     receiver: `${constants_1.PREFIX}-receiver`,
+    avatar: `${constants_1.PREFIX}-avatar`,
+    item: `${constants_1.PREFIX}-item`,
     autocomplete: `${constants_1.PREFIX}-autocomplete`,
     autocompleteDialog: `${constants_1.PREFIX}-autocomplete-dialog`,
     editor: `${constants_1.PREFIX}-editor`
@@ -95,7 +97,7 @@ function PrivateMessageThread(inProps) {
         props: inProps,
         name: constants_1.PREFIX
     });
-    const { userObj, openNewMessage = false, onNewMessageClose = null, onNewMessageSent = null, onSingleMessageOpen = null, className } = props, rest = tslib_1.__rest(props, ["userObj", "openNewMessage", "onNewMessageClose", "onNewMessageSent", "onSingleMessageOpen", "className"]);
+    const { threadObj, openNewMessage = false, onNewMessageClose = null, onNewMessageSent = null, onSingleMessageOpen = null, className, type } = props, rest = tslib_1.__rest(props, ["threadObj", "openNewMessage", "onNewMessageClose", "onNewMessageSent", "onSingleMessageOpen", "className", "type"]);
     // CONTEXT
     const scUserContext = (0, react_1.useContext)(react_core_1.SCUserContext);
     // STATE
@@ -106,7 +108,7 @@ function PrivateMessageThread(inProps) {
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [isHovered, setIsHovered] = (0, react_1.useState)({});
     const [followers, setFollowers] = (0, react_1.useState)([]);
-    const isNew = userObj && userObj === types_1.SCPrivateMessageStatusType.NEW;
+    const isNew = threadObj && threadObj === types_1.SCPrivateMessageStatusType.NEW;
     const authUserId = scUserContext.user ? scUserContext.user.id : null;
     const [singleMessageUser, setSingleMessageUser] = (0, react_1.useState)(null);
     const [receiver, setReceiver] = (0, react_1.useState)(null);
@@ -115,7 +117,7 @@ function PrivateMessageThread(inProps) {
     const [openDeleteMessageDialog, setOpenDeleteMessageDialog] = (0, react_1.useState)(false);
     const [recipients, setRecipients] = (0, react_1.useState)([]);
     const { enqueueSnackbar, closeSnackbar } = (0, notistack_1.useSnackbar)();
-    const isNumber = typeof userObj === 'number';
+    const isNumber = typeof threadObj === 'number';
     const messageReceiver = (item, loggedUserId) => {
         var _a, _b, _c;
         return ((_a = item === null || item === void 0 ? void 0 : item.receiver) === null || _a === void 0 ? void 0 : _a.id) !== loggedUserId ? (_b = item === null || item === void 0 ? void 0 : item.receiver) === null || _b === void 0 ? void 0 : _b.id : (_c = item === null || item === void 0 ? void 0 : item.sender) === null || _c === void 0 ? void 0 : _c.id;
@@ -128,7 +130,7 @@ function PrivateMessageThread(inProps) {
     // HOOKS
     // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
     // @ts-ignore
-    const { scUser } = (0, react_core_1.useSCFetchUser)({ id: userObj, userObj });
+    const { scUser } = (0, react_core_1.useSCFetchUser)({ id: threadObj, threadObj });
     const messagesEndRef = (0, react_1.useRef)(null);
     const scrollToBottom = () => {
         var _a;
@@ -256,9 +258,9 @@ function PrivateMessageThread(inProps) {
      * Fetches thread
      */
     function fetchThread() {
-        if (userObj && typeof userObj !== 'string') {
+        if (threadObj && typeof threadObj !== 'string' && type !== types_1.SCPrivateMessageType.GROUP) {
             setLoadingMessageObjs(true);
-            const _userObjId = isNumber ? userObj : messageReceiver(userObj, authUserId);
+            const _userObjId = isNumber ? threadObj : messageReceiver(threadObj, authUserId);
             api_services_1.PrivateMessageService.getAThread({ user: _userObjId, limit: 10 })
                 .then((res) => {
                 setMessageObjs(res.results);
@@ -291,6 +293,20 @@ function PrivateMessageThread(inProps) {
                 utils_1.Logger.error(Errors_1.SCOPE_SC_UI, { error });
             });
         }
+        else if (type === types_1.SCPrivateMessageType.GROUP) {
+            api_services_1.PrivateMessageService.getAThread({ group: isNumber ? threadObj : threadObj.group.id, limit: 10 })
+                .then((res) => {
+                setMessageObjs(res.results);
+                setPrevious(res.next && updateAndDeleteURLParameters(res.next, 'before_message', res.results[0].id, 'offset'));
+                setLoadingMessageObjs(false);
+                setSingleMessageThread(false);
+            })
+                .catch((error) => {
+                setLoadingMessageObjs(false);
+                console.log(error);
+                utils_1.Logger.error(Errors_1.SCOPE_SC_UI, { error });
+            });
+        }
     }
     const isNewerThan60Seconds = (creationTime) => {
         const date = new Date(creationTime);
@@ -355,11 +371,15 @@ function PrivateMessageThread(inProps) {
                 .request({
                 url: api_services_1.Endpoints.SendMessage.url(),
                 method: api_services_1.Endpoints.SendMessage.method,
-                data: {
-                    recipients: openNewMessage || isNew || singleMessageThread ? ids : [isNumber && userObj ? userObj : messageReceiver(userObj, authUserId)],
-                    message: message,
-                    file_uuid: file && !message ? file : null
-                }
+                data: Object.assign(Object.assign({}, (type === types_1.SCPrivateMessageType.GROUP
+                    ? { group: isNumber ? threadObj : threadObj.group.id }
+                    : {
+                        recipients: openNewMessage || isNew || singleMessageThread
+                            ? ids
+                            : [isNumber && threadObj ? threadObj : messageReceiver(threadObj, authUserId)]
+                    })), { 
+                    // recipients: openNewMessage || isNew || singleMessageThread ? ids : [isNumber && threadObj ? threadObj : messageReceiver(threadObj, authUserId)],
+                    message: message, file_uuid: file && !message ? file : null })
             })
                 .then((res) => {
                 const isOne = res.data.length <= 1;
@@ -405,13 +425,13 @@ function PrivateMessageThread(inProps) {
         if (!authUserId) {
             return;
         }
-        if (userObj) {
+        if (threadObj) {
             fetchThread();
         }
         else {
             reset();
         }
-    }, [userObj, authUserId, scUser]);
+    }, [threadObj, authUserId, scUser]);
     /**
      * Notification subscriber
      */
@@ -426,7 +446,7 @@ function PrivateMessageThread(inProps) {
         if (index !== -1) {
             setMessageObjs((prev) => [...prev, res.notification_obj.message]);
         }
-        if (isNumber ? userObj === res.thread_id : userObj.id === res.thread_id) {
+        if (isNumber ? threadObj === res.thread_id : threadObj.id === res.thread_id) {
             scrollToBottom();
         }
     };
@@ -453,11 +473,17 @@ function PrivateMessageThread(inProps) {
                     react_1.default.createElement("ul", null,
                         react_1.default.createElement(material_1.ListSubheader, null,
                             react_1.default.createElement(material_1.Typography, { align: "center", className: classes.subHeader }, key)),
-                        formattedMessages[key].map((msg) => (react_1.default.createElement(PrivateMessageThreadItem_1.default, { className: authUserId === msg.sender.id ? classes.sender : classes.receiver, message: msg, key: msg.id, mouseEvents: {
-                                onMouseEnter: () => handleMouseEnter(msg.id),
-                                onMouseLeave: () => handleMouseLeave(msg.id)
-                            }, isHovering: isHovered[msg.id], showMenuIcon: authUserId === msg.sender.id, onMenuIconClick: () => handleOpenDeleteMessageDialog(msg) }))))))))),
-            react_1.default.createElement(PrivateMessageEditor_1.default, { className: classes.editor, send: handleSend, autoHide: !(scUser === null || scUser === void 0 ? void 0 : scUser.can_send_pm_to), autoHideDeletion: (receiver === null || receiver === void 0 ? void 0 : receiver.deleted) || (scUser === null || scUser === void 0 ? void 0 : scUser.deleted), onThreadChangeId: isNumber ? userObj : userObj.receiver.id, error: error, onErrorRemove: () => setError(false) }),
+                        formattedMessages[key].map((msg) => {
+                            var _a;
+                            return (react_1.default.createElement(material_1.Box, { className: classes.item, key: msg.id },
+                                msg.group && ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.username) !== msg.sender.username && (react_1.default.createElement(material_1.ListItemAvatar, null,
+                                    react_1.default.createElement(material_1.Avatar, { alt: msg.sender.username, src: msg.sender.avatar, className: classes.avatar }))),
+                                react_1.default.createElement(PrivateMessageThreadItem_1.default, { className: authUserId === msg.sender.id ? classes.sender : classes.receiver, message: msg, key: msg.id, mouseEvents: {
+                                        onMouseEnter: () => handleMouseEnter(msg.id),
+                                        onMouseLeave: () => handleMouseLeave(msg.id)
+                                    }, isHovering: isHovered[msg.id], showMenuIcon: authUserId === msg.sender.id, onMenuIconClick: () => handleOpenDeleteMessageDialog(msg) })));
+                        }))))))),
+            react_1.default.createElement(PrivateMessageEditor_1.default, { className: classes.editor, send: handleSend, autoHide: type !== types_1.SCPrivateMessageType.GROUP && !(scUser === null || scUser === void 0 ? void 0 : scUser.can_send_pm_to), autoHideDeletion: type === types_1.SCPrivateMessageType.USER && ((receiver === null || receiver === void 0 ? void 0 : receiver.deleted) || (scUser === null || scUser === void 0 ? void 0 : scUser.deleted)), onThreadChangeId: isNumber ? threadObj : type === types_1.SCPrivateMessageType.USER ? threadObj.receiver.id : threadObj.group.id, error: error, onErrorRemove: () => setError(false) }),
             openDeleteMessageDialog && (react_1.default.createElement(ConfirmDialog_1.default, { open: openDeleteMessageDialog, title: react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.privateMessage.component.delete.message.dialog.msg", defaultMessage: "ui.privateMessage.component.delete.message.dialog.msg" }), btnConfirm: react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.privateMessage.component.delete.message.dialog.confirm", defaultMessage: "ui.privateMessage.component.delete.message.dialog.confirm" }), onConfirm: handleDeleteMessage, onClose: handleCloseDeleteMessageDialog }))));
     }
     /**
@@ -485,6 +511,6 @@ function PrivateMessageThread(inProps) {
     /**
      * Renders the component
      */
-    return (react_1.default.createElement(Root, Object.assign({}, rest, { className: (0, classnames_1.default)(classes.root, className) }), userObj !== null && !isNew && !singleMessageThread ? renderThread() : renderNewOrNoMessageBox()));
+    return (react_1.default.createElement(Root, Object.assign({}, rest, { className: (0, classnames_1.default)(classes.root, className) }), threadObj !== null && !isNew && !singleMessageThread ? renderThread() : renderNewOrNoMessageBox()));
 }
 exports.default = PrivateMessageThread;

package/lib/cjs/components/PrivateMessageThreadItem/PrivateMessageThreadItem.js

@@ -10,6 +10,7 @@ const types_1 = require("@selfcommunity/types");
 const Icon_1 = tslib_1.__importDefault(require("@mui/material/Icon"));
 const classnames_1 = tslib_1.__importDefault(require("classnames"));
 const system_1 = require("@mui/system");
+const react_core_1 = require("@selfcommunity/react-core");
 const useMediaQuery_1 = tslib_1.__importDefault(require("@mui/material/useMediaQuery"));
 const PrivateMessageSettingsIconButton_1 = tslib_1.__importDefault(require("../PrivateMessageSettingsIconButton"));
 const sizeCoverter_1 = require("../../utils/sizeCoverter");
@@ -21,6 +22,7 @@ const constants_1 = require("./constants");
 const thumbnailCoverter_1 = require("../../utils/thumbnailCoverter");
 const classes = {
     root: `${constants_1.PREFIX}-root`,
+    username: `${constants_1.PREFIX}-username`,
     text: `${constants_1.PREFIX}-text`,
     img: `${constants_1.PREFIX}-img`,
     document: `${constants_1.PREFIX}-document`,
@@ -72,6 +74,7 @@ const Root = (0, styles_1.styled)(material_1.ListItem, {
  * @param inProps
  */
 function PrivateMessageThreadItem(inProps) {
+    var _a;
     // PROPS
     const props = (0, system_1.useThemeProps)({
         props: inProps,
@@ -80,6 +83,8 @@ function PrivateMessageThreadItem(inProps) {
     const { message = null, className = null, mouseEvents = {}, isHovering = null, showMenuIcon = false, onMenuIconClick = null } = props, rest = tslib_1.__rest(props, ["message", "className", "mouseEvents", "isHovering", "showMenuIcon", "onMenuIconClick"]);
     // INTL
     const intl = (0, react_intl_1.useIntl)();
+    // CONTEXT
+    const scUserContext = (0, react_1.useContext)(react_core_1.SCUserContext);
     // STATE
     const theme = (0, material_1.useTheme)();
     const isMobile = (0, useMediaQuery_1.default)(theme.breakpoints.down('md'));
@@ -167,6 +172,7 @@ function PrivateMessageThreadItem(inProps) {
     return (react_1.default.createElement(Root, Object.assign({ className: (0, classnames_1.default)(classes.root, className) }, getMouseEvents(mouseEvents.onMouseEnter, mouseEvents.onMouseLeave), rest, { secondaryAction: (isHovering || isMobile) &&
             showMenuIcon &&
             message.status !== types_1.SCPrivateMessageStatusType.HIDDEN && react_1.default.createElement(PrivateMessageSettingsIconButton_1.default, { onMenuItemDeleteClick: handleMenuItemClick }) }),
+        message.group && ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.username) !== message.sender.username && (react_1.default.createElement(material_1.Typography, { color: "secondary", variant: "h4", className: classes.username }, message.sender.username)),
         react_1.default.createElement(react_1.default.Fragment, null,
             hasFile && message.status !== types_1.SCPrivateMessageStatusType.HIDDEN ? (renderMessageFile(message)) : (react_1.default.createElement(material_1.Box, { className: classes.text },
                 react_1.default.createElement(material_1.Typography, { component: "span", dangerouslySetInnerHTML: { __html: message.message } }))),

package/lib/cjs/components/SearchAutocomplete/SearchAutocomplete.js

@@ -75,6 +75,25 @@ function SearchAutocomplete(inProps) {
         setOptions([]);
         onClear && onClear();
     };
+    const getOptionData = (option) => {
+        let data = {};
+        if (option.type === types_1.SuggestionType.USER) {
+            data.name = option[types_1.SuggestionType.USER]['username'];
+            data.image = option[types_1.SuggestionType.USER]['avatar'];
+            data.variant = 'circular';
+        }
+        else if (option.type === types_1.SuggestionType.CATEGORY) {
+            data.name = option[types_1.SuggestionType.CATEGORY]['name'];
+            data.image = option[types_1.SuggestionType.CATEGORY]['image_medium'];
+            data.variant = 'square';
+        }
+        else if (option.type === types_1.SuggestionType.GROUP) {
+            data.name = option[types_1.SuggestionType.GROUP]['name'];
+            data.image = option[types_1.SuggestionType.GROUP]['image_big'];
+            data.variant = 'circular';
+        }
+        return data;
+    };
     function fetchResults() {
         setIsLoading(true);
         api_services_1.SuggestionService.getSearchSuggestion(value)
@@ -98,11 +117,9 @@ function SearchAutocomplete(inProps) {
                 return option;
             }
             return (_a = option[option.type]['username']) !== null && _a !== void 0 ? _a : option[option.type]['name'];
-        }, renderOption: (props, option) => (react_1.default.createElement(material_1.Box, Object.assign({ component: "li" }, props), option.type === types_1.SuggestionType.USER ? (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(material_1.Avatar, { alt: option[types_1.SuggestionType.USER]['username'], src: option[types_1.SuggestionType.USER]['avatar'] }),
-            react_1.default.createElement(material_1.Typography, { ml: 1 }, option[types_1.SuggestionType.USER]['username']))) : (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(material_1.Avatar, { alt: option[types_1.SuggestionType.CATEGORY]['name'], src: option[types_1.SuggestionType.CATEGORY]['image_medium'], variant: "square" }),
-            react_1.default.createElement(material_1.Typography, { ml: 1 }, option[types_1.SuggestionType.CATEGORY]['name']))))), renderInput: (params) => (react_1.default.createElement(material_1.TextField, Object.assign({}, params, { placeholder: `${intl.formatMessage(messages.placeholder, {
+        }, renderOption: (props, option) => (react_1.default.createElement(material_1.Box, Object.assign({ component: "li" }, props),
+            react_1.default.createElement(material_1.Avatar, { alt: getOptionData(option).name, src: getOptionData(option).image, variant: getOptionData(option).variant }),
+            react_1.default.createElement(material_1.Typography, { ml: 1 }, getOptionData(option).name))), renderInput: (params) => (react_1.default.createElement(material_1.TextField, Object.assign({}, params, { placeholder: `${intl.formatMessage(messages.placeholder, {
                 community: scPreferences.preferences[react_core_1.SCPreferences.TEXT_APPLICATION_NAME].value
             })}`, InputProps: Object.assign(Object.assign({}, params.InputProps), { autoFocus, name: 'search-autocomplete', className: classes.input, startAdornment: react_1.default.createElement(Icon_1.default, { className: classes.icon }, "search"), endAdornment: (react_1.default.createElement(material_1.Fade, { in: value.length > 0 || Boolean(onClear), appear: false },
                     react_1.default.createElement(material_1.IconButton, { className: classes.clear, onClick: handleClear, size: "small" },

package/lib/cjs/components/SnippetNotifications/SnippetNotifications.js

@@ -33,6 +33,7 @@ const system_1 = require("@mui/system");
 const Contribution_1 = tslib_1.__importDefault(require("../Notification/Contribution"));
 const NotificationItem_1 = tslib_1.__importDefault(require("../../shared/NotificationItem"));
 const constants_1 = require("./constants");
+const Group_1 = tslib_1.__importDefault(require("../Notification/Group"));
 const classes = {
     root: `${constants_1.PREFIX}-root`,
     notificationsWrap: `${constants_1.PREFIX}-notifications-wrap`,
@@ -254,6 +255,12 @@ function SnippetNotifications(inProps) {
         else if (type === types_2.SCNotificationTypologyType.CONTRIBUTION) {
             content = react_1.default.createElement(Contribution_1.default, { notificationObject: n, key: i, template: types_1.SCNotificationObjectTemplateType.SNIPPET });
         }
+        else if (n.type === types_2.SCNotificationTypologyType.USER_ADDED_TO_GROUP ||
+            n.type === types_2.SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP ||
+            n.type === types_2.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP ||
+            n.type === types_2.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP) {
+            return react_1.default.createElement(Group_1.default, { notificationObject: n, key: i, template: types_1.SCNotificationObjectTemplateType.SNIPPET });
+        }
         if (type && handleNotification) {
             /** Override content */
             content = handleNotification(type, n, content);

package/lib/cjs/components/ToastNotifications/ToastNotifications.js

@@ -24,6 +24,7 @@ const Message_1 = tslib_1.__importDefault(require("../BroadcastMessages/Message"
 const system_1 = require("@mui/system");
 const Contribution_1 = tslib_1.__importDefault(require("../Notification/Contribution"));
 const constants_1 = require("./constants");
+const Group_1 = tslib_1.__importDefault(require("../Notification/Group"));
 const Root = (0, styles_1.styled)(material_1.Box, {
     name: constants_1.PREFIX,
     slot: 'Root'
@@ -111,6 +112,12 @@ function UserToastNotifications(inProps) {
             else if (type === types_1.SCNotificationTypologyType.CONTRIBUTION) {
                 content = react_1.default.createElement(Contribution_1.default, { notificationObject: n.notification_obj, template: types_2.SCNotificationObjectTemplateType.TOAST });
             }
+            else if (type === types_1.SCNotificationTypologyType.USER_ADDED_TO_GROUP ||
+                type === types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP ||
+                type === types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP ||
+                type === types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP) {
+                content = react_1.default.createElement(Group_1.default, { notificationObject: n.notification_obj, template: types_2.SCNotificationObjectTemplateType.TOAST });
+            }
         }
         if (n.activity_type && n.activity_type === types_1.SCNotificationTypologyType.NOTIFICATION_BANNER) {
             /** Notification of type: 'notification_banner' */

package/lib/cjs/components/User/User.d.ts

@@ -34,6 +34,11 @@ export interface UserProps extends WidgetProps {
      * Badge content to show as user avatar badge if show reaction is true.
      */
     badgeContent?: any;
+    /**
+     * If true, shows a custom label next to the user username
+     * @default false
+     */
+    isGroupAdmin?: boolean;
     /**
      * Prop to add actions
      * @default null
@@ -43,7 +48,7 @@ export interface UserProps extends WidgetProps {
      * Props to spread to the button
      * @default {}
      */
-    buttonProps?: ButtonBaseProps;
+    buttonProps?: ButtonBaseProps | null;
     /**
      * Any other properties
      */

package/lib/cjs/components/User/User.js

@@ -23,7 +23,8 @@ const messages = (0, react_intl_1.defineMessages)({
 const classes = {
     root: `${constants_1.PREFIX}-root`,
     avatar: `${constants_1.PREFIX}-avatar`,
-    staffBadgeLabel: `${constants_1.PREFIX}-staff-badge-label`
+    staffBadgeLabel: `${constants_1.PREFIX}-staff-badge-label`,
+    groupAdminBadgeLabel: `${constants_1.PREFIX}-group-admin-badge-label`
 };
 const Root = (0, styles_1.styled)(BaseItemButton_1.default, {
     name: constants_1.PREFIX,
@@ -66,7 +67,7 @@ function User(inProps) {
         props: inProps,
         name: constants_1.PREFIX
     });
-    const { userId = null, user = null, handleIgnoreAction, className = null, followConnectUserButtonProps = {}, showFollowers = false, elevation, badgeContent = null, actions = null, buttonProps = {} } = props, rest = tslib_1.__rest(props, ["userId", "user", "handleIgnoreAction", "className", "followConnectUserButtonProps", "showFollowers", "elevation", "badgeContent", "actions", "buttonProps"]);
+    const { userId = null, user = null, handleIgnoreAction, className = null, followConnectUserButtonProps = {}, showFollowers = false, elevation, badgeContent = null, actions = null, isGroupAdmin = false, buttonProps = null } = props, rest = tslib_1.__rest(props, ["userId", "user", "handleIgnoreAction", "className", "followConnectUserButtonProps", "showFollowers", "elevation", "badgeContent", "actions", "isGroupAdmin", "buttonProps"]);
     // STATE
     const { scUser, setSCUser } = (0, react_core_1.useSCFetchUser)({ id: userId, user });
     // CONTEXT
@@ -106,9 +107,9 @@ function User(inProps) {
                 ? { onClick: () => setOpenAlert(true) }
                 : { component: react_core_1.Link, to: scRoutingContext.url(react_core_1.SCRoutes.USER_PROFILE_ROUTE_NAME, scUser) }), image: badgeContent ? (react_1.default.createElement(material_1.Badge, { overlap: "circular", anchorOrigin: { vertical: 'bottom', horizontal: 'right' }, badgeContent: badgeContent },
                 react_1.default.createElement(material_1.Avatar, { alt: scUser.username, src: scUser.avatar, className: classes.avatar }))) : (react_1.default.createElement(UserAvatar_1.default, { hide: !hasBadge },
-                react_1.default.createElement(material_1.Avatar, { alt: scUser.username, src: scUser.avatar, className: classes.avatar }))), primary: hasBadge && preferences ? (react_1.default.createElement(react_1.default.Fragment, null,
+                react_1.default.createElement(material_1.Avatar, { alt: scUser.username, src: scUser.avatar, className: classes.avatar }))), primary: (hasBadge && preferences) || isGroupAdmin ? (react_1.default.createElement(react_1.default.Fragment, null,
                 scUser.username,
-                react_1.default.createElement(material_1.Chip, { component: "span", className: classes.staffBadgeLabel, size: "small", label: preferences[react_core_1.SCPreferences.STAFF_STAFF_BADGE_LABEL] }))) : (scUser.username), secondary: showFollowers ? `${intl.formatMessage(messages.userFollowers, { total: scUser.followers_counter })}` : scUser.description, actions: actions !== null && actions !== void 0 ? actions : renderAuthenticatedActions() })),
+                react_1.default.createElement(material_1.Chip, { component: "span", className: isGroupAdmin ? classes.groupAdminBadgeLabel : classes.staffBadgeLabel, size: "small", label: isGroupAdmin ? (react_1.default.createElement(react_intl_1.FormattedMessage, { defaultMessage: "ui.user.group.admin", id: "ui.user.group.admin" })) : (preferences[react_core_1.SCPreferences.STAFF_STAFF_BADGE_LABEL]) }))) : (scUser.username), secondary: showFollowers ? `${intl.formatMessage(messages.userFollowers, { total: scUser.followers_counter })}` : scUser.description, actions: actions !== null && actions !== void 0 ? actions : renderAuthenticatedActions() })),
         openAlert && react_1.default.createElement(UserDeletedSnackBar_1.default, { open: openAlert, handleClose: () => setOpenAlert(false) })));
 }
 exports.default = User;

package/lib/cjs/components/UserSubscribedGroupsWidget/Skeleton.d.ts

@@ -0,0 +1,21 @@
+/**
+ * > API documentation for the Community-JS User Profile Categories Followed Widget Skeleton component. Learn about the available props and the CSS API.
+
+ #### Import
+
+ ```jsx
+ import {UserSubscribedGroupsWidgetSkeleton} from '@selfcommunity/react-ui';
+ ```
+
+ #### Component Name
+
+ The name `SCUserCategoriesFollowedWidget-skeleton-root` can be used when providing style overrides in the theme.
+
+ #### CSS
+
+ |Rule Name|Global class|Description|
+ |---|---|---|
+ |root|.SCUserSubscribedGroupsWidget-skeleton-root|Styles applied to the root element.|
+ *
+ */
+export default function UserSubscribedGroupsWidgetSkeleton(props: any): JSX.Element;