@selfcommunity/react-ui 0.7.9-alpha.6 → 0.7.9-alpha.60

package/lib/esm/components/PrivateMessageComponent/PrivateMessageComponent.js

@@ -5,7 +5,7 @@ import { Grid, useMediaQuery, useTheme } from '@mui/material';
 import { useSCPreferences, useSCUser } from '@selfcommunity/react-core';
 import classNames from 'classnames';
 import { useThemeProps } from '@mui/system';
-import { SCFeatureName, SCPrivateMessageStatusType } from '@selfcommunity/types';
+import { SCFeatureName, SCPrivateMessageStatusType, SCPrivateMessageType } from '@selfcommunity/types';
 import PrivateMessageThread from '../PrivateMessageThread';
 import PrivateMessageSnippets from '../PrivateMessageSnippets';
 import { PREFIX } from './constants';
@@ -65,6 +65,7 @@ export default function PrivateMessageComponent(inProps) {
     const isMobile = useMediaQuery(theme.breakpoints.down('md'));
     const [layout, setLayout] = useState('default');
     const [obj, setObj] = useState(id !== null && id !== void 0 ? id : null);
+    const [type, setType] = useState(null);
     const isNew = obj && obj === SCPrivateMessageStatusType.NEW;
     const [openNewMessage, setOpenNewMessage] = useState(isNew !== null && isNew !== void 0 ? isNew : false);
     const mobileSnippetsView = (layout === 'default' && !obj) || (layout === 'mobile' && !obj);
@@ -86,10 +87,12 @@ export default function PrivateMessageComponent(inProps) {
     /**
      * 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);
     };
     /**
@@ -105,7 +108,8 @@ export default function PrivateMessageComponent(inProps) {
     const handleOpenNewMessage = () => {
         setOpenNewMessage(!openNewMessage);
         setObj(SCPrivateMessageStatusType.NEW);
-        onItemClick && onItemClick(SCPrivateMessageStatusType.NEW);
+        setType(SCPrivateMessageType.NEW);
+        onItemClick && onItemClick(SCPrivateMessageStatusType.NEW, SCPrivateMessageType.NEW);
     };
     /**
      * Handles new messages open from user profile page or notifications section
@@ -121,13 +125,14 @@ export default 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 ? SCPrivateMessageType.GROUP : SCPrivateMessageType.USER);
         setObj(isOne ? messageReceiver(msg, authUserId) : null);
         setOpenNewMessage(false);
     };
@@ -147,14 +152,14 @@ export default function PrivateMessageComponent(inProps) {
                     onSnippetClick: handleThreadOpening,
                     onNewMessageClick: handleOpenNewMessage,
                     onDeleteConfirm: handleDeleteThread
-                }, userObj: obj, clearSearch: clear, elevation: 0 })));
+                }, threadObj: obj, clearSearch: clear, elevation: 0 })));
     }
     /**
      * Renders thread section
      */
     function renderThread() {
         return (React.createElement(Grid, { item: true, xs: 12, md: 7, className: classNames(classes.threadBox, { [classes.hide]: isMobile && mobileSnippetsView }) },
-            React.createElement(PrivateMessageThread, { userObj: obj, openNewMessage: openNewMessage, onNewMessageClose: handleMessageBack, onNewMessageSent: handleOnNewMessageSent, onSingleMessageOpen: handleSingleMessage, elevation: 0 })));
+            React.createElement(PrivateMessageThread, { 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/esm/components/PrivateMessageSnippetItem/PrivateMessageSnippetItem.js

@@ -72,10 +72,12 @@ export default 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.createElement(PrivateMessageSnippetItemSkeleton, { elevation: 0 });
@@ -86,10 +88,13 @@ export default function PrivateMessageSnippetItem(inProps) {
     return (React.createElement(Root, Object.assign({ className: classNames(classes.root, className) }, rest, { secondaryAction: secondaryAction, disablePadding: true }),
         React.createElement(ListItemButton, { onClick: onItemClick, classes: { root: classNames({ [classes.unread]: message.thread_status === SCPrivateMessageStatusType.NEW }) } },
             React.createElement(ListItemAvatar, null,
-                React.createElement(UserAvatar, { hide: !hasBadge() },
-                    React.createElement(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.createElement(UserAvatar, { hide: !hasBadge() }, message.group ? (React.createElement(Avatar, { alt: message.group.name, src: message.group.image_big })) : (React.createElement(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.createElement(ListItemText, { primary: React.createElement(React.Fragment, null,
-                    React.createElement(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.createElement(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.createElement(Chip, { component: "span", className: classes.badgeLabel, size: "small", label: preferences[SCPreferences.STAFF_STAFF_BADGE_LABEL] })),
                     React.createElement(Typography, { color: "secondary", className: classes.time, component: "span" }, `${intl.formatDate(message.last_message_at, {
                         day: '2-digit',

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

@@ -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,10 @@ export interface PrivateMessageSnippetsProps extends CardProps {
      */
     [p: string]: any;
     /**
-     * thread user object
+     * thread user/ group object
      * @default null
      */
-    userObj?: any;
+    threadObj?: any;
 }
 /**
  * > API documentation for the Community-JS PrivateMessageSnippets component. Learn about the available props and the CSS API.

package/lib/esm/components/PrivateMessageSnippets/PrivateMessageSnippets.js

@@ -1,9 +1,9 @@
 import { __rest } from "tslib";
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { Button, Card, CardContent, Icon, IconButton, List, TextField, useTheme } from '@mui/material';
 import PubSub from 'pubsub-js';
-import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType } from '@selfcommunity/types';
+import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType, SCPrivateMessageType } from '@selfcommunity/types';
 import PrivateMessageSnippetsSkeleton from './Skeleton';
 import PrivateMessageSnippetItem from '../PrivateMessageSnippetItem';
 import classNames from 'classnames';
@@ -69,25 +69,30 @@ export default function PrivateMessageSnippets(inProps) {
         props: inProps,
         name: PREFIX
     });
-    const { className = null, userObj = null, snippetActions, clearSearch } = props, rest = __rest(props, ["className", "userObj", "snippetActions", "clearSearch"]);
+    const { className = null, threadObj = null, snippetActions, clearSearch } = props, rest = __rest(props, ["className", "threadObj", "snippetActions", "clearSearch"]);
     // STATE
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down('md'));
     const { data, updateSnippets } = useSCFetchPrivateMessageSnippets({ cacheStrategy: CacheStrategies.CACHE_FIRST });
     const [search, setSearch] = useState('');
-    const isObj = typeof userObj === 'object';
+    const isObj = typeof threadObj === 'object';
     const scUserContext = useContext(SCUserContext);
     const authUserId = scUserContext.user ? scUserContext.user.id : null;
+    const [type, setType] = useState(null);
     // INTL
     const intl = useIntl();
     // REFS
     const refreshSubscription = 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());
@@ -99,6 +104,18 @@ export default 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 = useMemo(() => {
+        return (message) => {
+            var _a, _b;
+            if (threadObj && type === 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 && type === SCPrivateMessageType.USER) {
+                return messageReceiver(message, authUserId) === (isObj ? messageReceiver(threadObj, authUserId) : threadObj);
+            }
+            return null;
+        };
+    }, [threadObj, authUserId, type]);
     //HANDLERS
     const handleChange = (event) => {
         setSearch(event.target.value);
@@ -114,7 +131,9 @@ export default function PrivateMessageSnippets(inProps) {
         snippetActions && snippetActions.onDeleteConfirm(msg);
     };
     function handleOpenThread(msg) {
-        snippetActions && snippetActions.onSnippetClick(msg);
+        const _type = msg.group !== null ? SCPrivateMessageType.GROUP : SCPrivateMessageType.USER;
+        setType(_type);
+        snippetActions && snippetActions.onSnippetClick(msg, _type);
         handleClear();
         updateSnippetsParams(msg.id, 'seen');
     }
@@ -219,6 +238,5 @@ export default function PrivateMessageSnippets(inProps) {
                     } }),
                 React.createElement(List, null, filteredSnippets.map((message) => (React.createElement(PrivateMessageSnippetItem, { message: message, key: message.id, onItemClick: () => handleOpenThread(message), secondaryAction: React.createElement(React.Fragment, null,
                         message.thread_status === SCPrivateMessageStatusType.NEW && (React.createElement(Icon, { fontSize: "small", color: "secondary" }, "fiber_manual_record")),
-                        !isMobile && (React.createElement(PrivateMessageSettingsIconButton, { threadToDelete: messageReceiver(message, authUserId), onItemDeleteConfirm: () => handleDeleteConversation(messageReceiver(message, authUserId)), user: messageReceiver(message, authUserId, true) }))), selected: userObj !== SCPrivateMessageStatusType.NEW &&
-                        messageReceiver(message, authUserId) === (isObj ? messageReceiver(userObj, authUserId) : userObj) })))))))));
+                        !isMobile && (React.createElement(PrivateMessageSettingsIconButton, { threadToDelete: messageReceiver(message, authUserId), onItemDeleteConfirm: () => handleDeleteConversation(messageReceiver(message, authUserId)), user: messageReceiver(message, authUserId, true) }))), selected: isSelected(message) })))))))));
 }

package/lib/esm/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/esm/components/PrivateMessageThread/PrivateMessageThread.js

@@ -3,11 +3,11 @@ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState }
 import { styled } from '@mui/material/styles';
 import { Endpoints, http, PrivateMessageService } from '@selfcommunity/api-services';
 import { SCUserContext, UserUtils, useSCFetchUser } from '@selfcommunity/react-core';
-import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType } from '@selfcommunity/types';
+import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType, SCPrivateMessageType } from '@selfcommunity/types';
 import PrivateMessageThreadItem, { PrivateMessageThreadItemSkeleton } from '../PrivateMessageThreadItem';
 import PubSub from 'pubsub-js';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-import { Box, Card, CardContent, IconButton, List, ListSubheader, TextField, Typography } from '@mui/material';
+import { Avatar, Box, Card, CardContent, IconButton, List, ListItemAvatar, ListSubheader, TextField, Typography } from '@mui/material';
 import PrivateMessageEditor from '../PrivateMessageEditor';
 import Autocomplete from '@mui/material/Autocomplete';
 import classNames from 'classnames';
@@ -41,6 +41,8 @@ const classes = {
     newMessageContent: `${PREFIX}-new-message-content`,
     sender: `${PREFIX}-sender`,
     receiver: `${PREFIX}-receiver`,
+    avatar: `${PREFIX}-avatar`,
+    item: `${PREFIX}-item`,
     autocomplete: `${PREFIX}-autocomplete`,
     autocompleteDialog: `${PREFIX}-autocomplete-dialog`,
     editor: `${PREFIX}-editor`
@@ -93,7 +95,7 @@ export default function PrivateMessageThread(inProps) {
         props: inProps,
         name: PREFIX
     });
-    const { userObj, openNewMessage = false, onNewMessageClose = null, onNewMessageSent = null, onSingleMessageOpen = null, className } = props, rest = __rest(props, ["userObj", "openNewMessage", "onNewMessageClose", "onNewMessageSent", "onSingleMessageOpen", "className"]);
+    const { threadObj, openNewMessage = false, onNewMessageClose = null, onNewMessageSent = null, onSingleMessageOpen = null, className, type } = props, rest = __rest(props, ["threadObj", "openNewMessage", "onNewMessageClose", "onNewMessageSent", "onSingleMessageOpen", "className", "type"]);
     // CONTEXT
     const scUserContext = useContext(SCUserContext);
     // STATE
@@ -104,7 +106,7 @@ export default function PrivateMessageThread(inProps) {
     const [loading, setLoading] = useState(false);
     const [isHovered, setIsHovered] = useState({});
     const [followers, setFollowers] = useState([]);
-    const isNew = userObj && userObj === SCPrivateMessageStatusType.NEW;
+    const isNew = threadObj && threadObj === SCPrivateMessageStatusType.NEW;
     const authUserId = scUserContext.user ? scUserContext.user.id : null;
     const [singleMessageUser, setSingleMessageUser] = useState(null);
     const [receiver, setReceiver] = useState(null);
@@ -113,7 +115,7 @@ export default function PrivateMessageThread(inProps) {
     const [openDeleteMessageDialog, setOpenDeleteMessageDialog] = useState(false);
     const [recipients, setRecipients] = useState([]);
     const { enqueueSnackbar, closeSnackbar } = 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;
@@ -126,7 +128,7 @@ export default function PrivateMessageThread(inProps) {
     // HOOKS
     // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
     // @ts-ignore
-    const { scUser } = useSCFetchUser({ id: userObj, userObj });
+    const { scUser } = useSCFetchUser({ id: threadObj, threadObj });
     const messagesEndRef = useRef(null);
     const scrollToBottom = () => {
         var _a;
@@ -254,9 +256,9 @@ export default function PrivateMessageThread(inProps) {
      * Fetches thread
      */
     function fetchThread() {
-        if (userObj && typeof userObj !== 'string') {
+        if (threadObj && typeof threadObj !== 'string' && type !== SCPrivateMessageType.GROUP) {
             setLoadingMessageObjs(true);
-            const _userObjId = isNumber ? userObj : messageReceiver(userObj, authUserId);
+            const _userObjId = isNumber ? threadObj : messageReceiver(threadObj, authUserId);
             PrivateMessageService.getAThread({ user: _userObjId, limit: 10 })
                 .then((res) => {
                 setMessageObjs(res.results);
@@ -289,6 +291,19 @@ export default function PrivateMessageThread(inProps) {
                 Logger.error(SCOPE_SC_UI, { error });
             });
         }
+        else if (type === SCPrivateMessageType.GROUP) {
+            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);
+            })
+                .catch((error) => {
+                setLoadingMessageObjs(false);
+                console.log(error);
+                Logger.error(SCOPE_SC_UI, { error });
+            });
+        }
     }
     const isNewerThan60Seconds = (creationTime) => {
         const date = new Date(creationTime);
@@ -353,11 +368,15 @@ export default function PrivateMessageThread(inProps) {
                 .request({
                 url: Endpoints.SendMessage.url(),
                 method: 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 === 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;
@@ -403,13 +422,13 @@ export default function PrivateMessageThread(inProps) {
         if (!authUserId) {
             return;
         }
-        if (userObj) {
+        if (threadObj) {
             fetchThread();
         }
         else {
             reset();
         }
-    }, [userObj, authUserId, scUser]);
+    }, [threadObj, authUserId, scUser]);
     /**
      * Notification subscriber
      */
@@ -424,7 +443,7 @@ export default 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();
         }
     };
@@ -451,11 +470,17 @@ export default function PrivateMessageThread(inProps) {
                     React.createElement("ul", null,
                         React.createElement(ListSubheader, null,
                             React.createElement(Typography, { align: "center", className: classes.subHeader }, key)),
-                        formattedMessages[key].map((msg) => (React.createElement(PrivateMessageThreadItem, { 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.createElement(PrivateMessageEditor, { 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.createElement(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.createElement(ListItemAvatar, null,
+                                    React.createElement(Avatar, { alt: msg.sender.username, src: msg.sender.avatar, className: classes.avatar }))),
+                                React.createElement(PrivateMessageThreadItem, { 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.createElement(PrivateMessageEditor, { className: classes.editor, send: handleSend, autoHide: type !== SCPrivateMessageType.GROUP && !(scUser === null || scUser === void 0 ? void 0 : scUser.can_send_pm_to), autoHideDeletion: type === SCPrivateMessageType.USER && ((receiver === null || receiver === void 0 ? void 0 : receiver.deleted) || (scUser === null || scUser === void 0 ? void 0 : scUser.deleted)), onThreadChangeId: isNumber ? threadObj : type === SCPrivateMessageType.USER ? threadObj.receiver.id : threadObj.group.id, error: error, onErrorRemove: () => setError(false) }),
             openDeleteMessageDialog && (React.createElement(ConfirmDialog, { open: openDeleteMessageDialog, title: React.createElement(FormattedMessage, { id: "ui.privateMessage.component.delete.message.dialog.msg", defaultMessage: "ui.privateMessage.component.delete.message.dialog.msg" }), btnConfirm: React.createElement(FormattedMessage, { id: "ui.privateMessage.component.delete.message.dialog.confirm", defaultMessage: "ui.privateMessage.component.delete.message.dialog.confirm" }), onConfirm: handleDeleteMessage, onClose: handleCloseDeleteMessageDialog }))));
     }
     /**
@@ -483,5 +508,5 @@ export default function PrivateMessageThread(inProps) {
     /**
      * Renders the component
      */
-    return (React.createElement(Root, Object.assign({}, rest, { className: classNames(classes.root, className) }), userObj !== null && !isNew && !singleMessageThread ? renderThread() : renderNewOrNoMessageBox()));
+    return (React.createElement(Root, Object.assign({}, rest, { className: classNames(classes.root, className) }), threadObj !== null && !isNew && !singleMessageThread ? renderThread() : renderNewOrNoMessageBox()));
 }

package/lib/esm/components/PrivateMessageThreadItem/PrivateMessageThreadItem.js

@@ -1,5 +1,5 @@
 import { __awaiter, __rest } from "tslib";
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { ListItem, Typography, IconButton, Box, useTheme, Button } from '@mui/material';
 import PrivateMessageThreadItemSkeleton from './Skeleton';
@@ -8,6 +8,7 @@ import { SCMessageFileType, SCPrivateMessageStatusType } from '@selfcommunity/ty
 import Icon from '@mui/material/Icon';
 import classNames from 'classnames';
 import { useThemeProps } from '@mui/system';
+import { SCUserContext } from '@selfcommunity/react-core';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import PrivateMessageSettingsIconButton from '../PrivateMessageSettingsIconButton';
 import { bytesToSize } from '../../utils/sizeCoverter';
@@ -19,6 +20,7 @@ import { PREFIX } from './constants';
 import { isSupportedVideoFormat } from '../../utils/thumbnailCoverter';
 const classes = {
     root: `${PREFIX}-root`,
+    username: `${PREFIX}-username`,
     text: `${PREFIX}-text`,
     img: `${PREFIX}-img`,
     document: `${PREFIX}-document`,
@@ -70,6 +72,7 @@ const Root = styled(ListItem, {
  * @param inProps
  */
 export default function PrivateMessageThreadItem(inProps) {
+    var _a;
     // PROPS
     const props = useThemeProps({
         props: inProps,
@@ -78,6 +81,8 @@ export default function PrivateMessageThreadItem(inProps) {
     const { message = null, className = null, mouseEvents = {}, isHovering = null, showMenuIcon = false, onMenuIconClick = null } = props, rest = __rest(props, ["message", "className", "mouseEvents", "isHovering", "showMenuIcon", "onMenuIconClick"]);
     // INTL
     const intl = useIntl();
+    // CONTEXT
+    const scUserContext = useContext(SCUserContext);
     // STATE
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down('md'));
@@ -165,6 +170,7 @@ export default function PrivateMessageThreadItem(inProps) {
     return (React.createElement(Root, Object.assign({ className: classNames(classes.root, className) }, getMouseEvents(mouseEvents.onMouseEnter, mouseEvents.onMouseLeave), rest, { secondaryAction: (isHovering || isMobile) &&
             showMenuIcon &&
             message.status !== SCPrivateMessageStatusType.HIDDEN && React.createElement(PrivateMessageSettingsIconButton, { 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.createElement(Typography, { color: "secondary", variant: "h4", className: classes.username }, message.sender.username)),
         React.createElement(React.Fragment, null,
             hasFile && message.status !== SCPrivateMessageStatusType.HIDDEN ? (renderMessageFile(message)) : (React.createElement(Box, { className: classes.text },
                 React.createElement(Typography, { component: "span", dangerouslySetInnerHTML: { __html: message.message } }))),

package/lib/esm/components/SearchAutocomplete/SearchAutocomplete.js

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

package/lib/esm/components/SnippetNotifications/SnippetNotifications.js

@@ -31,6 +31,7 @@ import { useThemeProps } from '@mui/system';
 import ContributionNotification from '../Notification/Contribution';
 import NotificationItem from '../../shared/NotificationItem';
 import { PREFIX } from './constants';
+import GroupNotification from '../Notification/Group';
 const classes = {
     root: `${PREFIX}-root`,
     notificationsWrap: `${PREFIX}-notifications-wrap`,
@@ -252,6 +253,12 @@ export default function SnippetNotifications(inProps) {
         else if (type === SCNotificationTypologyType.CONTRIBUTION) {
             content = React.createElement(ContributionNotification, { notificationObject: n, key: i, template: SCNotificationObjectTemplateType.SNIPPET });
         }
+        else if (n.type === SCNotificationTypologyType.USER_ADDED_TO_GROUP ||
+            n.type === SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP ||
+            n.type === SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP ||
+            n.type === SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP) {
+            return React.createElement(GroupNotification, { notificationObject: n, key: i, template: SCNotificationObjectTemplateType.SNIPPET });
+        }
         if (type && handleNotification) {
             /** Override content */
             content = handleNotification(type, n, content);

package/lib/esm/components/ToastNotifications/ToastNotifications.js

@@ -21,6 +21,7 @@ import Message from '../BroadcastMessages/Message';
 import { useThemeProps } from '@mui/system';
 import ContributionNotification from '../Notification/Contribution';
 import { PREFIX } from './constants';
+import GroupNotification from '../Notification/Group';
 const Root = styled(Box, {
     name: PREFIX,
     slot: 'Root'
@@ -108,6 +109,12 @@ export default function UserToastNotifications(inProps) {
             else if (type === SCNotificationTypologyType.CONTRIBUTION) {
                 content = React.createElement(ContributionNotification, { notificationObject: n.notification_obj, template: SCNotificationObjectTemplateType.TOAST });
             }
+            else if (type === SCNotificationTypologyType.USER_ADDED_TO_GROUP ||
+                type === SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP ||
+                type === SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP ||
+                type === SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP) {
+                content = React.createElement(GroupNotification, { notificationObject: n.notification_obj, template: SCNotificationObjectTemplateType.TOAST });
+            }
         }
         if (n.activity_type && n.activity_type === SCNotificationTypologyType.NOTIFICATION_BANNER) {
             /** Notification of type: 'notification_banner' */

package/lib/esm/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/esm/components/User/User.js

@@ -21,7 +21,8 @@ const messages = defineMessages({
 const classes = {
     root: `${PREFIX}-root`,
     avatar: `${PREFIX}-avatar`,
-    staffBadgeLabel: `${PREFIX}-staff-badge-label`
+    staffBadgeLabel: `${PREFIX}-staff-badge-label`,
+    groupAdminBadgeLabel: `${PREFIX}-group-admin-badge-label`
 };
 const Root = styled(BaseItemButton, {
     name: PREFIX,
@@ -64,7 +65,7 @@ export default function User(inProps) {
         props: inProps,
         name: PREFIX
     });
-    const { userId = null, user = null, handleIgnoreAction, className = null, followConnectUserButtonProps = {}, showFollowers = false, elevation, badgeContent = null, actions = null, buttonProps = {} } = props, rest = __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 = __rest(props, ["userId", "user", "handleIgnoreAction", "className", "followConnectUserButtonProps", "showFollowers", "elevation", "badgeContent", "actions", "isGroupAdmin", "buttonProps"]);
     // STATE
     const { scUser, setSCUser } = useSCFetchUser({ id: userId, user });
     // CONTEXT
@@ -104,8 +105,8 @@ export default function User(inProps) {
                 ? { onClick: () => setOpenAlert(true) }
                 : { component: Link, to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, scUser) }), image: badgeContent ? (React.createElement(Badge, { overlap: "circular", anchorOrigin: { vertical: 'bottom', horizontal: 'right' }, badgeContent: badgeContent },
                 React.createElement(Avatar, { alt: scUser.username, src: scUser.avatar, className: classes.avatar }))) : (React.createElement(UserAvatar, { hide: !hasBadge },
-                React.createElement(Avatar, { alt: scUser.username, src: scUser.avatar, className: classes.avatar }))), primary: hasBadge && preferences ? (React.createElement(React.Fragment, null,
+                React.createElement(Avatar, { alt: scUser.username, src: scUser.avatar, className: classes.avatar }))), primary: (hasBadge && preferences) || isGroupAdmin ? (React.createElement(React.Fragment, null,
                 scUser.username,
-                React.createElement(Chip, { component: "span", className: classes.staffBadgeLabel, size: "small", label: preferences[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.createElement(Chip, { component: "span", className: isGroupAdmin ? classes.groupAdminBadgeLabel : classes.staffBadgeLabel, size: "small", label: isGroupAdmin ? (React.createElement(FormattedMessage, { defaultMessage: "ui.user.group.admin", id: "ui.user.group.admin" })) : (preferences[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.createElement(UserDeletedSnackBar, { open: openAlert, handleClose: () => setOpenAlert(false) })));
 }

package/lib/esm/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;