@selfcommunity/react-ui 0.7.9-alpha.9 → 0.7.10-alpha.0

package/lib/esm/components/Notification/Notification.js

@@ -33,6 +33,7 @@ import { SCNotificationTypologyType } from '@selfcommunity/types';
 import UserDeletedSnackBar from '../../shared/UserDeletedSnackBar';
 import UserAvatar from '../../shared/UserAvatar';
 import { PREFIX } from './constants';
+import GroupNotification from './Group';
 const messages = defineMessages({
     receivePrivateMessage: {
         id: 'ui.notification.receivePrivateMessage',
@@ -149,7 +150,7 @@ export default function UserNotification(inProps) {
     }
     /**
      * Handles vote
-     * @param comment
+     * @param index
      */
     const handleVote = (index) => {
         return (contribution) => {
@@ -194,6 +195,32 @@ export default function UserNotification(inProps) {
                         b: (...chunks) => React.createElement("strong", null, chunks)
                     })) }));
         }
+        /**
+         * Group notifications header
+         */
+        if (notificationObject.aggregated &&
+            (notificationObject.aggregated[0].type === SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP ||
+                notificationObject.aggregated[0].type === SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP ||
+                notificationObject.aggregated[0].type === SCNotificationTypologyType.USER_ADDED_TO_GROUP ||
+                notificationObject.aggregated[0].type === SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP)) {
+            let groupNotification = notificationObject.aggregated[0];
+            return (React.createElement(CardHeader, { className: classes.header, avatar: React.createElement(Link, Object.assign({}, (!groupNotification.user.deleted && {
+                    to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, groupNotification.user)
+                }), { onClick: groupNotification.user.deleted ? () => setOpenAlert(true) : null }),
+                    React.createElement(UserAvatar, { hide: !groupNotification.user.community_badge, smaller: true },
+                        React.createElement(Avatar, { className: classes.avatar, alt: groupNotification.user.username, variant: "circular", src: groupNotification.user.avatar }))), titleTypographyProps: { className: classes.title, variant: 'subtitle1' }, title: React.createElement(React.Fragment, null,
+                    React.createElement(Link, Object.assign({}, (!groupNotification.user.deleted && {
+                        to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, groupNotification.user)
+                    }), { onClick: groupNotification.user.deleted ? () => setOpenAlert(true) : null, className: classes.username }), groupNotification.user.username),
+                    ' ',
+                    React.createElement(FormattedMessage, { id: `ui.notification.${notificationObject.aggregated[0].type}`, defaultMessage: `ui.notification.${notificationObject.aggregated[0].type}`, values: {
+                            group: groupNotification.group.name,
+                            link: (...chunks) => (React.createElement(Link, { to: notificationObject.aggregated[0].type === SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP ||
+                                    notificationObject.aggregated[0].type === SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP
+                                    ? scRoutingContext.url(SCRoutes.GROUP_MEMBERS_ROUTE_NAME, groupNotification.group)
+                                    : scRoutingContext.url(SCRoutes.GROUP_ROUTE_NAME, groupNotification.group) }, chunks))
+                        } })) }));
+        }
         /**
          * Comment, NestedComment, Follow Contribution header
          */
@@ -276,6 +303,12 @@ export default function UserNotification(inProps) {
         else if (n.type === SCNotificationTypologyType.CONTRIBUTION) {
             return React.createElement(ContributionNotification, { notificationObject: n, key: i, onVote: handleVote(i) });
         }
+        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 });
+        }
         return null;
     }
     /**

package/lib/esm/components/Notification/PrivateMessage/PrivateMessage.js

@@ -39,6 +39,7 @@ const Root = styled(NotificationItem, {
  * @param props
  */
 export default function PrivateMessageNotification(props) {
+    var _a, _b, _c, _d, _e;
     // PROPS
     const { notificationObject, id = `n_${props.notificationObject['sid']}`, className, template = SCNotificationObjectTemplateType.DETAIL } = props, rest = __rest(props, ["notificationObject", "id", "className", "template"]);
     // CONTEXT
@@ -89,7 +90,9 @@ export default function PrivateMessageNotification(props) {
                     React.createElement(FormattedMessage, { id: 'ui.userToastNotifications.privateMessage.sentMessage', defaultMessage: 'ui.userToastNotifications.privateMessage.sentMessage' }),
                     ":",
                     React.createElement(Box, { className: classes.messageWrap },
-                        React.createElement(Link, { to: scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender), className: classes.message },
+                        React.createElement(Link, { to: ((_a = notificationObject.message) === null || _a === void 0 ? void 0 : _a.group)
+                                ? scRoutingContext.url(SCRoutes.GROUP_MESSAGES_ROUTE_NAME, notificationObject.message.group)
+                                : scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender), className: classes.message },
                             React.createElement(Typography, { variant: "body2", dangerouslySetInnerHTML: { __html: notificationObject.message.message } }))))),
                 isSnippetTemplate && (React.createElement(Box, null,
                     React.createElement(Typography, { component: "div", color: "inherit" },
@@ -97,13 +100,17 @@ export default function PrivateMessageNotification(props) {
                             to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, notificationObject.message.sender)
                         }), { onClick: notificationObject.message.sender.deleted ? () => setOpenAlert(true) : null, className: classes.username }), notificationObject.message.sender.username),
                         ' ',
-                        React.createElement(Link, { to: scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender), className: classes.messageLabel }, intl.formatMessage(messages.receivePrivateMessage, {
+                        React.createElement(Link, { to: ((_b = notificationObject.message) === null || _b === void 0 ? void 0 : _b.group)
+                                ? scRoutingContext.url(SCRoutes.GROUP_MESSAGES_ROUTE_NAME, notificationObject.message.group)
+                                : scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender), className: classes.messageLabel }, intl.formatMessage(messages.receivePrivateMessage, {
                             total: 1,
                             b: (...chunks) => React.createElement("strong", null, chunks)
                         })))))), footer: isToastTemplate && (React.createElement(Stack, { direction: "row", justifyContent: "space-between", alignItems: "center", spacing: 2 },
                 React.createElement(DateTimeAgo, { date: notificationObject.active_at }),
                 React.createElement(Typography, { color: "primary" },
-                    React.createElement(Link, { to: scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender) }, scUserContext.user && follower ? (React.createElement(FormattedMessage, { id: "ui.userToastNotifications.replyMessage", defaultMessage: 'ui.userToastNotifications.replyMessage' })) : (React.createElement(FormattedMessage, { id: "ui.userToastNotifications.viewMessage", defaultMessage: 'ui.userToastNotifications.viewMessage' })))))) }, rest)));
+                    React.createElement(Link, { to: ((_c = notificationObject.message) === null || _c === void 0 ? void 0 : _c.group)
+                            ? scRoutingContext.url(SCRoutes.GROUP_MESSAGES_ROUTE_NAME, notificationObject.message.group)
+                            : scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender) }, scUserContext.user && follower ? (React.createElement(FormattedMessage, { id: "ui.userToastNotifications.replyMessage", defaultMessage: 'ui.userToastNotifications.replyMessage' })) : (React.createElement(FormattedMessage, { id: "ui.userToastNotifications.viewMessage", defaultMessage: 'ui.userToastNotifications.viewMessage' })))))) }, rest)));
     }
     return (React.createElement(React.Fragment, null,
         React.createElement(Root, Object.assign({ id: id, className: classNames(classes.root, className, `${PREFIX}-${template}`), template: template, isNew: notificationObject.is_new, disableTypography: true, actions: React.createElement(Stack, { direction: "row", justifyContent: "space-between", alignItems: "center", spacing: 2 },
@@ -112,8 +119,12 @@ export default function PrivateMessageNotification(props) {
                         ? null
                         : scUserContext.user
                             ? follower === null || manager.isLoading(notificationObject.message.sender)
-                            : null, to: scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender) }, scUserContext.user && follower ? (React.createElement(FormattedMessage, { id: "ui.notification.privateMessage.btnReplyLabel", defaultMessage: "ui.notification.privateMessage.btnReplyLabel" })) : (React.createElement(FormattedMessage, { id: "ui.notification.privateMessage.btnViewLabel", defaultMessage: "ui.notification.privateMessage.btnViewLabel" })))), primary: React.createElement(Box, { className: classes.messageWrap },
-                React.createElement(Link, { to: scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender), className: classes.message },
+                            : null, to: ((_d = notificationObject.message) === null || _d === void 0 ? void 0 : _d.group)
+                        ? scRoutingContext.url(SCRoutes.GROUP_MESSAGES_ROUTE_NAME, notificationObject.message.group)
+                        : scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender) }, scUserContext.user && follower ? (React.createElement(FormattedMessage, { id: "ui.notification.privateMessage.btnReplyLabel", defaultMessage: "ui.notification.privateMessage.btnReplyLabel" })) : (React.createElement(FormattedMessage, { id: "ui.notification.privateMessage.btnViewLabel", defaultMessage: "ui.notification.privateMessage.btnViewLabel" })))), primary: React.createElement(Box, { className: classes.messageWrap },
+                React.createElement(Link, { to: ((_e = notificationObject.message) === null || _e === void 0 ? void 0 : _e.group)
+                        ? scRoutingContext.url(SCRoutes.GROUP_MESSAGES_ROUTE_NAME, notificationObject.message.group)
+                        : scRoutingContext.url(SCRoutes.USER_PRIVATE_MESSAGES_ROUTE_NAME, notificationObject.message.sender), className: classes.message },
                     React.createElement(Typography, { variant: "body2", dangerouslySetInnerHTML: { __html: notificationObject.message.message } }))) }, rest)),
         openAlert && React.createElement(UserDeletedSnackBar, { open: openAlert, handleClose: () => setOpenAlert(false) })));
 }

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

@@ -1,14 +1,20 @@
+import { SCPrivateMessageType } from '@selfcommunity/types';
 export interface PrivateMessageComponentProps {
     /**
      * Thread receiver id
      * @default null
      */
     id?: number | string;
+    /**
+     * Thread type
+     * @default null
+     */
+    type?: SCPrivateMessageType;
     /**
      * Handler on message click
      * @default null
      */
-    onItemClick?: (id: any) => void;
+    onItemClick?: (id: any, type: any) => void;
     /**
      * Handler on single message open
      * @default null

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';
@@ -55,7 +55,7 @@ export default function PrivateMessageComponent(inProps) {
         props: inProps,
         name: PREFIX
     });
-    const { id = null, className = null, onItemClick = null, onThreadBack = null, onSingleMessageOpen = null } = props, rest = __rest(props, ["id", "className", "onItemClick", "onThreadBack", "onSingleMessageOpen"]);
+    const { id = null, type = null, className = null, onItemClick = null, onThreadBack = null, onSingleMessageOpen = null } = props, rest = __rest(props, ["id", "type", "className", "onItemClick", "onThreadBack", "onSingleMessageOpen"]);
     // CONTEXT
     const scUserContext = useSCUser();
     const scPreferences = useSCPreferences();
@@ -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(type);
     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);
@@ -82,14 +83,19 @@ export default function PrivateMessageComponent(inProps) {
     useEffect(() => {
         setObj(id !== null && id !== void 0 ? id : null);
     }, [id]);
+    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);
     };
     /**
@@ -105,7 +111,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 +128,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 +155,14 @@ export default 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.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/PrivateMessageSettingsIconButton/PrivateMessageSettingsIconButton.js

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

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

@@ -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/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, type = null, snippetActions, clearSearch } = props, rest = __rest(props, ["className", "threadObj", "type", "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(type);
     // 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 && threadObj !== SCPrivateMessageType.NEW) {
+                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 threadType = msg.group !== null ? SCPrivateMessageType.GROUP : SCPrivateMessageType.USER;
+        _setType(threadType);
+        snippetActions && snippetActions.onSnippetClick(msg, threadType);
         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,20 @@ 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);
+                setSingleMessageThread(false);
+            })
+                .catch((error) => {
+                setLoadingMessageObjs(false);
+                console.log(error);
+                Logger.error(SCOPE_SC_UI, { error });
+            });
+        }
     }
     const isNewerThan60Seconds = (creationTime) => {
         const date = new Date(creationTime);
@@ -353,11 +369,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 +423,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 +444,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 +471,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 +509,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()));
 }