@selfcommunity/react-ui 0.7.9-alpha.15 → 0.7.9-alpha.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/lib/cjs/components/ChangeGroupPicture/ChangeGroupPicture.js +13 -10
  2. package/lib/cjs/components/Composer/Composer.js +1 -1
  3. package/lib/cjs/components/Composer/Layer/AudienceLayer/AudienceLayer.js +4 -4
  4. package/lib/cjs/components/FeedObject/FeedObject.d.ts +1 -0
  5. package/lib/cjs/components/FeedObject/FeedObject.js +17 -5
  6. package/lib/cjs/components/Group/Group.js +3 -2
  7. package/lib/cjs/components/GroupForm/GroupForm.js +3 -3
  8. package/lib/cjs/components/GroupHeader/GroupHeader.js +2 -2
  9. package/lib/cjs/components/PrivateMessageComponent/PrivateMessageComponent.d.ts +1 -1
  10. package/lib/cjs/components/PrivateMessageComponent/PrivateMessageComponent.js +10 -7
  11. package/lib/cjs/components/PrivateMessageSnippetItem/PrivateMessageSnippetItem.js +11 -6
  12. package/lib/cjs/components/PrivateMessageSnippets/PrivateMessageSnippets.d.ts +3 -3
  13. package/lib/cjs/components/PrivateMessageSnippets/PrivateMessageSnippets.js +19 -5
  14. package/lib/cjs/components/PrivateMessageThread/PrivateMessageThread.d.ts +6 -1
  15. package/lib/cjs/components/PrivateMessageThread/PrivateMessageThread.js +33 -16
  16. package/lib/esm/components/ChangeGroupPicture/ChangeGroupPicture.js +13 -10
  17. package/lib/esm/components/Composer/Composer.js +1 -1
  18. package/lib/esm/components/Composer/Layer/AudienceLayer/AudienceLayer.js +4 -4
  19. package/lib/esm/components/FeedObject/FeedObject.d.ts +1 -0
  20. package/lib/esm/components/FeedObject/FeedObject.js +18 -6
  21. package/lib/esm/components/Group/Group.js +3 -2
  22. package/lib/esm/components/GroupForm/GroupForm.js +3 -3
  23. package/lib/esm/components/GroupHeader/GroupHeader.js +2 -2
  24. package/lib/esm/components/PrivateMessageComponent/PrivateMessageComponent.d.ts +1 -1
  25. package/lib/esm/components/PrivateMessageComponent/PrivateMessageComponent.js +11 -8
  26. package/lib/esm/components/PrivateMessageSnippetItem/PrivateMessageSnippetItem.js +11 -6
  27. package/lib/esm/components/PrivateMessageSnippets/PrivateMessageSnippets.d.ts +3 -3
  28. package/lib/esm/components/PrivateMessageSnippets/PrivateMessageSnippets.js +21 -7
  29. package/lib/esm/components/PrivateMessageThread/PrivateMessageThread.d.ts +6 -1
  30. package/lib/esm/components/PrivateMessageThread/PrivateMessageThread.js +34 -17
  31. package/lib/umd/react-ui.js +1 -1
  32. package/package.json +6 -6
@@ -57,12 +57,12 @@ export default function ChangeGroupPicture(inProps) {
57
57
  name: PREFIX
58
58
  });
59
59
  const { groupId, onChange, autoHide, className, isCreationMode = false } = props, rest = __rest(props, ["groupId", "onChange", "autoHide", "className", "isCreationMode"]);
60
+ //CONTEXT
61
+ const scUserContext = useContext(SCUserContext);
60
62
  //STATE
63
+ let fileInput = useRef(null);
61
64
  const [loading, setLoading] = useState(false);
62
65
  const [alert, setAlert] = useState(null);
63
- let fileInput = useRef(null);
64
- //CONTEXT
65
- const scUserContext = useContext(SCUserContext);
66
66
  // INTL
67
67
  const intl = useIntl();
68
68
  // Anonymous
@@ -73,8 +73,8 @@ export default function ChangeGroupPicture(inProps) {
73
73
  * Handles avatar upload
74
74
  * @param event
75
75
  */
76
- function handleUpload(event) {
77
- const fileInput = event.target.files[0];
76
+ const handleUpload = (event) => {
77
+ fileInput = event.target.files[0];
78
78
  if (fileInput) {
79
79
  const reader = new FileReader();
80
80
  reader.onload = (e) => {
@@ -91,26 +91,29 @@ export default function ChangeGroupPicture(inProps) {
91
91
  // @ts-ignore
92
92
  img.src = e.target.result;
93
93
  };
94
+ // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
95
+ // @ts-ignore
94
96
  reader.readAsDataURL(fileInput);
95
97
  }
96
- }
97
- // ui.changeGroupPicture.alert
98
+ };
98
99
  /**
99
100
  * Performs save avatar after upload
100
101
  */
101
102
  function handleSave() {
102
103
  setLoading(true);
103
104
  const formData = new FormData();
105
+ // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
106
+ // @ts-ignore
104
107
  formData.append('image_original', fileInput);
105
108
  GroupService.changeGroupAvatarOrCover(groupId, formData, { headers: { 'Content-Type': 'multipart/form-data' } })
106
109
  .then((data) => {
110
+ onChange && onChange(data.image_big);
107
111
  setLoading(false);
108
- onChange && onChange(data.image_bigger);
109
112
  })
110
113
  .catch((error) => {
111
- setAlert(intl.formatMessage(messages.errorLoadImage));
112
- setLoading(false);
113
114
  Logger.error(SCOPE_SC_UI, error);
115
+ setLoading(false);
116
+ setAlert(intl.formatMessage(messages.errorLoadImage));
114
117
  });
115
118
  }
116
119
  /**
@@ -551,7 +551,7 @@ export default function Composer(inProps) {
551
551
  }),
552
552
  React.createElement(IconButton, { disabled: isSubmitting, onClick: handleAddCategoryLayer },
553
553
  React.createElement(Icon, null, "category")),
554
- React.createElement(IconButton, { disabled: isSubmitting || !features.includes(SCFeatureName.TAGGING), onClick: handleAddAudienceLayer }, addressing === null || addressing.length === 0 ? (React.createElement(Icon, null, "public")) : typeof addressing === 'object' ? (React.createElement(Icon, null, "groups")) : (React.createElement(Icon, null, "label"))),
554
+ React.createElement(IconButton, { disabled: isSubmitting || !features.includes(SCFeatureName.TAGGING) || Boolean(feedObject === null || feedObject === void 0 ? void 0 : feedObject.group), onClick: handleAddAudienceLayer }, (!group && addressing === null) || (addressing === null || addressing === void 0 ? void 0 : addressing.length) === 0 ? React.createElement(Icon, null, "public") : group ? React.createElement(Icon, null, "groups") : React.createElement(Icon, null, "label")),
555
555
  preferences[SCPreferences.ADDONS_POST_GEOLOCATION_ENABLED].value && (React.createElement(IconButton, { disabled: isSubmitting, onClick: handleAddLocationLayer, color: location !== null ? 'primary' : 'default' },
556
556
  React.createElement(Icon, null, "add_location_alt"))))),
557
557
  layer && (React.createElement(LayerTransitionRoot, { className: classes.layerTransitionRoot, in: true, container: dialogRef.current, direction: "left" },
@@ -43,7 +43,7 @@ const AudienceLayer = React.forwardRef((props, ref) => {
43
43
  // @ts-ignore
44
44
  defaultValue === null || defaultValue.length === 0
45
45
  ? AudienceTypes.AUDIENCE_ALL
46
- : typeof defaultValue === 'object'
46
+ : defaultValue && typeof defaultValue === 'object'
47
47
  ? AudienceTypes.AUDIENCE_GROUP
48
48
  : AudienceTypes.AUDIENCE_TAG);
49
49
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -55,7 +55,7 @@ const AudienceLayer = React.forwardRef((props, ref) => {
55
55
  const handleSave = useCallback(
56
56
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
57
57
  // @ts-ignore
58
- () => (typeof defaultValue === 'object' ? onSave(value) : onSave((value === null || value === void 0 ? void 0 : value.length) && (value === null || value === void 0 ? void 0 : value.length) > 0 ? value : null)), [value, onSave]);
58
+ () => (audience === AudienceTypes.AUDIENCE_GROUP ? onSave(value) : onSave((value === null || value === void 0 ? void 0 : value.length) && (value === null || value === void 0 ? void 0 : value.length) > 0 ? value : null)), [value, onSave, audience]);
59
59
  const handleChange = useCallback((event, tags) => setValue(tags), []);
60
60
  const handleGroupChange = useCallback((group) => setValue(group), []);
61
61
  const handleChangeAudience = useCallback((event, data) => setAudience(data), []);
@@ -78,14 +78,14 @@ const AudienceLayer = React.forwardRef((props, ref) => {
78
78
  , {
79
79
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
80
80
  // @ts-ignore
81
- disabled: defaultValue && defaultValue.length !== 0, value: AudienceTypes.AUDIENCE_GROUP, icon: React.createElement(Icon, null, "groups"), label: React.createElement(FormattedMessage, { id: "ui.composer.layer.audience.group", defaultMessage: "ui.composer.layer.audience.group" }) }),
81
+ disabled: defaultValue && typeof defaultValue !== 'object', value: AudienceTypes.AUDIENCE_GROUP, icon: React.createElement(Icon, null, "groups"), label: React.createElement(FormattedMessage, { id: "ui.composer.layer.audience.group", defaultMessage: "ui.composer.layer.audience.group" }) }),
82
82
  React.createElement(Tab
83
83
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
84
84
  // @ts-ignore
85
85
  , {
86
86
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
87
87
  // @ts-ignore
88
- disabled: typeof defaultValue === 'object', value: AudienceTypes.AUDIENCE_TAG, icon: React.createElement(Icon, null, "label"), label: React.createElement(FormattedMessage, { id: "ui.composer.layer.audience.tag", defaultMessage: "ui.composer.layer.audience.tag" }) })),
88
+ disabled: value && typeof defaultValue === 'object', value: AudienceTypes.AUDIENCE_TAG, icon: React.createElement(Icon, null, "label"), label: React.createElement(FormattedMessage, { id: "ui.composer.layer.audience.tag", defaultMessage: "ui.composer.layer.audience.tag" }) })),
89
89
  React.createElement(Typography, { className: classes.message },
90
90
  audience === AudienceTypes.AUDIENCE_ALL && (React.createElement(FormattedMessage, { id: "ui.composer.layer.audience.all.message", defaultMessage: "ui.composer.audience.layer.all.message" })),
91
91
  audience === AudienceTypes.AUDIENCE_GROUP && (React.createElement(FormattedMessage, { id: "ui.composer.layer.audience.group.message", defaultMessage: "ui.composer.audience.layer.group.message" })),
@@ -188,6 +188,7 @@ export interface FeedObjectProps extends CardProps, VirtualScrollerItemProps {
188
188
  |deleted|.SCFeedObject-deleted|Styles applied to the feed obj when is deleted (visible only for admin and moderator).|
189
189
  |header|.SCFeedObject-header|Styles applied to the header of the card.|
190
190
  |category|.SCFeedObject-category|Styles applied to the category element.|
191
+ |group|.SCFeedObject-group|Styles applied to the group element.|
191
192
  |avatar|.SCFeedObject-avatar|Styles applied to the avatar element.|
192
193
  |username|.SCFeedObject-username|Styles applied to the username element.|
193
194
  |activityAt|.SCFeedObject-activity-at|Styles applied to the activity at section.|
@@ -2,7 +2,7 @@ import { __rest } from "tslib";
2
2
  import React, { useCallback, useEffect, useMemo, useState } from 'react';
3
3
  import { styled } from '@mui/material/styles';
4
4
  import CardContent from '@mui/material/CardContent';
5
- import { Avatar, Box, Button, CardActions, CardHeader, Collapse, Stack, Tooltip, Typography } from '@mui/material';
5
+ import { Avatar, Box, Button, CardActions, CardHeader, Chip, Collapse, Stack, Tooltip, Typography } from '@mui/material';
6
6
  import FeedObjectSkeleton from './Skeleton';
7
7
  import DateTimeAgo from '../../shared/DateTimeAgo';
8
8
  import Bullet from '../../shared/Bullet';
@@ -47,6 +47,7 @@ const classes = {
47
47
  deleted: `${PREFIX}-deleted`,
48
48
  header: `${PREFIX}-header`,
49
49
  category: `${PREFIX}-category`,
50
+ group: `${PREFIX}-group`,
50
51
  avatar: `${PREFIX}-avatar`,
51
52
  username: `${PREFIX}-username`,
52
53
  activityAt: `${PREFIX}-activity-at`,
@@ -100,6 +101,7 @@ const Root = styled(Widget, {
100
101
  |deleted|.SCFeedObject-deleted|Styles applied to the feed obj when is deleted (visible only for admin and moderator).|
101
102
  |header|.SCFeedObject-header|Styles applied to the header of the card.|
102
103
  |category|.SCFeedObject-category|Styles applied to the category element.|
104
+ |group|.SCFeedObject-group|Styles applied to the group element.|
103
105
  |avatar|.SCFeedObject-avatar|Styles applied to the avatar element.|
104
106
  |username|.SCFeedObject-username|Styles applied to the username element.|
105
107
  |activityAt|.SCFeedObject-activity-at|Styles applied to the activity at section.|
@@ -167,7 +169,7 @@ export default function FeedObject(inProps) {
167
169
  }, [onStateChange, onHeightChange]);
168
170
  /**
169
171
  * Update state object
170
- * @param obj
172
+ * @param newObj
171
173
  */
172
174
  const updateObject = (newObj) => {
173
175
  setObj(newObj);
@@ -424,8 +426,13 @@ export default function FeedObject(inProps) {
424
426
  template === SCFeedObjectTemplateType.DETAIL ||
425
427
  template === SCFeedObjectTemplateType.SEARCH) {
426
428
  objElement = (React.createElement(React.Fragment, null, obj ? (React.createElement(Box, { className: classNames({ [classes.deleted]: obj && obj.deleted }) },
427
- obj.categories.length > 0 && (React.createElement("div", { className: classes.category }, obj.categories.map((c) => (React.createElement(Link, { to: scRoutingContext.url(SCRoutes.CATEGORY_ROUTE_NAME, c), key: c.id },
428
- React.createElement(Typography, { variant: "overline" }, c.name)))))),
429
+ obj.categories.length > 0 && (React.createElement("div", { className: classes.category },
430
+ React.createElement(React.Fragment, null, obj.group && (React.createElement("div", { className: classes.group },
431
+ React.createElement(Chip, { color: "secondary", size: "small", key: obj.group.id, icon: React.createElement(Icon, null, "groups"), component: Link, to: scRoutingContext.url(SCRoutes.GROUP_ROUTE_NAME, obj.group), clickable: true })))),
432
+ obj.categories.map((c) => (React.createElement(Link, { to: scRoutingContext.url(SCRoutes.CATEGORY_ROUTE_NAME, c), key: c.id },
433
+ React.createElement(Typography, { variant: "overline" }, c.name)))))),
434
+ obj.group && !obj.categories.length && (React.createElement("div", { className: classes.group },
435
+ React.createElement(Chip, { color: "secondary", size: "small", key: obj.group.id, icon: React.createElement(Icon, null, "groups"), label: obj.group.name, component: Link, to: scRoutingContext.url(SCRoutes.GROUP_ROUTE_NAME, obj.group), clickable: true }))),
429
436
  React.createElement(CardHeader, { className: classes.header, avatar: React.createElement(Link, Object.assign({}, (!obj.author.deleted && { to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, obj.author) }), { onClick: obj.author.deleted ? () => setOpenAlert(true) : null }),
430
437
  React.createElement(UserAvatar, { hide: !obj.author.community_badge },
431
438
  React.createElement(Avatar, { "aria-label": "recipe", src: obj.author.avatar, className: classes.avatar }, obj.author.username))), title: React.createElement(Link, Object.assign({}, (!obj.author.deleted && { to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, obj.author) }), { onClick: obj.author.deleted ? () => setOpenAlert(true) : null, className: classes.username }), obj.author.username), subheader: React.createElement(React.Fragment, null,
@@ -466,8 +473,13 @@ export default function FeedObject(inProps) {
466
473
  }
467
474
  else if (template === SCFeedObjectTemplateType.SHARE) {
468
475
  objElement = (React.createElement(React.Fragment, null, obj ? (React.createElement(React.Fragment, null,
469
- obj.categories.length > 0 && (React.createElement("div", { className: classes.category }, obj.categories.map((c) => (React.createElement(Link, { to: scRoutingContext.url(SCRoutes.CATEGORY_ROUTE_NAME, c), key: c.id },
470
- React.createElement(Typography, { variant: "overline" }, c.name)))))),
476
+ obj.categories.length > 0 && (React.createElement("div", { className: classes.category },
477
+ React.createElement(React.Fragment, null, obj.group && (React.createElement("div", { className: classes.group },
478
+ React.createElement(Chip, { color: "secondary", size: "small", key: obj.group.id, icon: React.createElement(Icon, null, "groups"), component: Link, to: scRoutingContext.url(SCRoutes.GROUP_ROUTE_NAME, obj.group), clickable: true })))),
479
+ obj.categories.map((c) => (React.createElement(Link, { to: scRoutingContext.url(SCRoutes.CATEGORY_ROUTE_NAME, c), key: c.id },
480
+ React.createElement(Typography, { variant: "overline" }, c.name)))))),
481
+ obj.group && !obj.categories.length && (React.createElement("div", { className: classes.group },
482
+ React.createElement(Chip, { color: "secondary", size: "small", key: obj.group.id, icon: React.createElement(Icon, null, "groups"), label: obj.group.name, component: Link, to: scRoutingContext.url(SCRoutes.GROUP_ROUTE_NAME, obj.group), clickable: true }))),
471
483
  React.createElement(CardHeader, { classes: { root: classes.header }, avatar: React.createElement(Link, Object.assign({}, (!obj.author.deleted && { to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, obj.author) }), { onClick: obj.author.deleted ? () => setOpenAlert(true) : null, className: classes.username }),
472
484
  React.createElement(UserAvatar, { hide: !obj.author.community_badge },
473
485
  React.createElement(Avatar, { "aria-label": "recipe", src: obj.author.avatar, className: classes.avatar }, obj.author.username))), title: React.createElement(Link, Object.assign({}, (!obj.author.deleted && { to: scRoutingContext.url(SCRoutes.USER_PROFILE_ROUTE_NAME, obj.author) }), { onClick: obj.author.deleted ? () => setOpenAlert(true) : null, className: classes.username }), obj.author.username), subheader: React.createElement(Link, { to: scRoutingContext.url(getContributionRouteName(obj), getRouteData(obj)), className: classes.activityAt },
@@ -2,6 +2,7 @@ import { __rest } from "tslib";
2
2
  import React, { useState } from 'react';
3
3
  import { styled } from '@mui/material/styles';
4
4
  import { Avatar, Icon, Stack } from '@mui/material';
5
+ import { SCGroupPrivacyType } from '@selfcommunity/types';
5
6
  import { Link, SCRoutes, useSCFetchGroup, useSCRouting } from '@selfcommunity/react-core';
6
7
  import { defineMessages, useIntl } from 'react-intl';
7
8
  import classNames from 'classnames';
@@ -61,7 +62,7 @@ export default function Group(inProps) {
61
62
  props: inProps,
62
63
  name: PREFIX
63
64
  });
64
- const { groupId = null, group = null, className = null, elevation, hideActions = false, groupSubscribeButtonProps = {}, visible = true } = props, rest = __rest(props, ["groupId", "group", "className", "elevation", "hideActions", "groupSubscribeButtonProps", "visible"]);
65
+ const { groupId = null, group = null, className = null, elevation, hideActions = false, groupSubscribeButtonProps = {} } = props, rest = __rest(props, ["groupId", "group", "className", "elevation", "hideActions", "groupSubscribeButtonProps"]);
65
66
  // STATE
66
67
  const { scGroup } = useSCFetchGroup({ id: groupId, group });
67
68
  // CONTEXT
@@ -75,7 +76,7 @@ export default function Group(inProps) {
75
76
  */
76
77
  function renderAuthenticatedActions() {
77
78
  return (React.createElement(Stack, { className: classes.actions, direction: "row", alignItems: "center", justifyContent: "center", spacing: 2 },
78
- React.createElement(Icon, null, !visible ? 'private' : 'public'),
79
+ React.createElement(Icon, null, (group === null || group === void 0 ? void 0 : group.privacy) === SCGroupPrivacyType.PRIVATE ? 'private' : 'public'),
79
80
  React.createElement(GroupSubscribeButton, Object.assign({ group: group, groupId: groupId }, groupSubscribeButtonProps))));
80
81
  }
81
82
  /**
@@ -206,7 +206,7 @@ export default function GroupForm(inProps) {
206
206
  React.createElement(TextField, { multiline: true, className: classes.description, placeholder: `${intl.formatMessage(messages.description)}`, margin: "normal", value: field.description, name: "description", onChange: handleChange, InputProps: {
207
207
  endAdornment: React.createElement(Typography, { variant: "body2" }, GROUP_DESCRIPTION_MAX_LENGTH - field.description.length)
208
208
  } }),
209
- React.createElement(Box, { className: classes.privacySection },
209
+ (!group || (group && group.privacy !== SCGroupPrivacyType.PRIVATE)) && (React.createElement(Box, { className: classes.privacySection },
210
210
  React.createElement(Typography, { variant: "h4" },
211
211
  React.createElement(FormattedMessage, { id: "ui.groupForm.privacy.title", defaultMessage: "ui.groupForm.privacy.title", values: { b: (chunks) => React.createElement("strong", null, chunks) } })),
212
212
  React.createElement(Stack, { direction: "row", spacing: 1, alignItems: "center" },
@@ -217,8 +217,8 @@ export default function GroupForm(inProps) {
217
217
  React.createElement(Typography, { className: classNames(classes.switchLabel, { [classes.active]: field.isPublic }) },
218
218
  React.createElement(Icon, null, "public"),
219
219
  React.createElement(FormattedMessage, { id: "ui.groupForm.privacy.public", defaultMessage: "ui.groupForm.privacy.public" }))),
220
- React.createElement(Typography, { variant: "body2", className: classes.privacySectionInfo }, field.isPublic ? (React.createElement(FormattedMessage, { id: "ui.groupForm.privacy.public.info", defaultMessage: "ui.groupForm.privacy.public.info", values: { b: (chunks) => React.createElement("strong", null, chunks) } })) : (React.createElement(FormattedMessage, { id: "ui.groupForm.privacy.private.info", defaultMessage: "ui.groupForm.private.public.info", values: { b: (chunks) => React.createElement("strong", null, chunks) } })))),
221
- React.createElement(Box, { className: classes.visibilitySection }, !field.isPublic && (React.createElement(React.Fragment, null,
220
+ React.createElement(Typography, { variant: "body2", className: classes.privacySectionInfo }, field.isPublic ? (React.createElement(FormattedMessage, { id: "ui.groupForm.privacy.public.info", defaultMessage: "ui.groupForm.privacy.public.info", values: { b: (chunks) => React.createElement("strong", null, chunks) } })) : (React.createElement(FormattedMessage, { id: "ui.groupForm.privacy.private.info", defaultMessage: "ui.groupForm.private.public.info", values: { b: (chunks) => React.createElement("strong", null, chunks) } }))))),
221
+ React.createElement(Box, { className: classes.visibilitySection }, ((!field.isPublic && !group) || (group && !field.isPublic)) && (React.createElement(React.Fragment, null,
222
222
  React.createElement(Typography, { variant: "h4" },
223
223
  React.createElement(FormattedMessage, { id: "ui.groupForm.visibility.title", defaultMessage: "ui.groupForm.visibility.title", values: { b: (chunks) => React.createElement("strong", null, chunks) } })),
224
224
  React.createElement(Stack, { direction: "row", spacing: 1, alignItems: "center" },
@@ -87,7 +87,7 @@ export default function GroupHeader(inProps) {
87
87
  */
88
88
  function handleChangeAvatar(avatar) {
89
89
  if (isGroupAdmin) {
90
- setSCGroup(Object.assign({}, scGroup, { image_bigger: avatar }));
90
+ setSCGroup(Object.assign({}, scGroup, { image_big: avatar }));
91
91
  }
92
92
  }
93
93
  /**
@@ -116,7 +116,7 @@ export default function GroupHeader(inProps) {
116
116
  React.createElement(Paper, { style: _backgroundCover, classes: { root: classes.cover } },
117
117
  React.createElement(Box, { className: classes.avatar },
118
118
  React.createElement(Avatar, null,
119
- React.createElement("img", { alt: "group", src: scGroup.image_bigger ? scGroup.image_bigger : '' }))),
119
+ React.createElement("img", { alt: "group", src: scGroup.image_big ? scGroup.image_big : '' }))),
120
120
  isGroupAdmin && (React.createElement(React.Fragment, null,
121
121
  React.createElement(ChangeGroupPicture, Object.assign({ groupId: scGroup.id, onChange: handleChangeAvatar, className: classes.changePicture }, ChangePictureProps)),
122
122
  React.createElement("div", { className: classes.changeCover },
@@ -8,7 +8,7 @@ export interface PrivateMessageComponentProps {
8
8
  * Handler on message click
9
9
  * @default null
10
10
  */
11
- onItemClick?: (id: any) => void;
11
+ onItemClick?: (id: any, type: any) => void;
12
12
  /**
13
13
  * Handler on single message open
14
14
  * @default null
@@ -5,7 +5,7 @@ import { Grid, useMediaQuery, useTheme } from '@mui/material';
5
5
  import { useSCPreferences, useSCUser } from '@selfcommunity/react-core';
6
6
  import classNames from 'classnames';
7
7
  import { useThemeProps } from '@mui/system';
8
- import { SCFeatureName, SCPrivateMessageStatusType } from '@selfcommunity/types';
8
+ import { SCFeatureName, SCPrivateMessageStatusType, SCPrivateMessageType } from '@selfcommunity/types';
9
9
  import PrivateMessageThread from '../PrivateMessageThread';
10
10
  import PrivateMessageSnippets from '../PrivateMessageSnippets';
11
11
  import { PREFIX } from './constants';
@@ -65,6 +65,7 @@ export default function PrivateMessageComponent(inProps) {
65
65
  const isMobile = useMediaQuery(theme.breakpoints.down('md'));
66
66
  const [layout, setLayout] = useState('default');
67
67
  const [obj, setObj] = useState(id !== null && id !== void 0 ? id : null);
68
+ const [type, setType] = useState(null);
68
69
  const isNew = obj && obj === SCPrivateMessageStatusType.NEW;
69
70
  const [openNewMessage, setOpenNewMessage] = useState(isNew !== null && isNew !== void 0 ? isNew : false);
70
71
  const mobileSnippetsView = (layout === 'default' && !obj) || (layout === 'mobile' && !obj);
@@ -86,10 +87,12 @@ export default function PrivateMessageComponent(inProps) {
86
87
  /**
87
88
  * Handles thread opening on click
88
89
  * @param item
90
+ * @param type
89
91
  */
90
- const handleThreadOpening = (item) => {
91
- onItemClick && onItemClick(messageReceiver(item, authUserId));
92
- setObj(messageReceiver(item, authUserId));
92
+ const handleThreadOpening = (item, type) => {
93
+ onItemClick && onItemClick(item.group ? item.group.id : messageReceiver(item, authUserId), type);
94
+ setType(type);
95
+ setObj(item.group ? item : messageReceiver(item, authUserId));
93
96
  setOpenNewMessage(false);
94
97
  };
95
98
  /**
@@ -105,7 +108,7 @@ export default function PrivateMessageComponent(inProps) {
105
108
  const handleOpenNewMessage = () => {
106
109
  setOpenNewMessage(!openNewMessage);
107
110
  setObj(SCPrivateMessageStatusType.NEW);
108
- onItemClick && onItemClick(SCPrivateMessageStatusType.NEW);
111
+ onItemClick && onItemClick(SCPrivateMessageStatusType.NEW, SCPrivateMessageType.NEW);
109
112
  };
110
113
  /**
111
114
  * Handles new messages open from user profile page or notifications section
@@ -127,7 +130,7 @@ export default function PrivateMessageComponent(inProps) {
127
130
  * Handles state update when a new message is sent
128
131
  */
129
132
  const handleOnNewMessageSent = (msg, isOne) => {
130
- onItemClick && onItemClick(isOne ? messageReceiver(msg, authUserId) : '');
133
+ onItemClick && onItemClick(isOne ? messageReceiver(msg, authUserId) : '', msg.group ? SCPrivateMessageType.GROUP : SCPrivateMessageType.USER);
131
134
  setObj(isOne ? messageReceiver(msg, authUserId) : null);
132
135
  setOpenNewMessage(false);
133
136
  };
@@ -147,14 +150,14 @@ export default function PrivateMessageComponent(inProps) {
147
150
  onSnippetClick: handleThreadOpening,
148
151
  onNewMessageClick: handleOpenNewMessage,
149
152
  onDeleteConfirm: handleDeleteThread
150
- }, userObj: obj, clearSearch: clear, elevation: 0 })));
153
+ }, threadObj: obj, clearSearch: clear, elevation: 0 })));
151
154
  }
152
155
  /**
153
156
  * Renders thread section
154
157
  */
155
158
  function renderThread() {
156
159
  return (React.createElement(Grid, { item: true, xs: 12, md: 7, className: classNames(classes.threadBox, { [classes.hide]: isMobile && mobileSnippetsView }) },
157
- React.createElement(PrivateMessageThread, { userObj: obj, openNewMessage: openNewMessage, onNewMessageClose: handleMessageBack, onNewMessageSent: handleOnNewMessageSent, onSingleMessageOpen: handleSingleMessage, elevation: 0 })));
160
+ React.createElement(PrivateMessageThread, { threadObj: obj, type: type, openNewMessage: openNewMessage, onNewMessageClose: handleMessageBack, onNewMessageSent: handleOnNewMessageSent, onSingleMessageOpen: handleSingleMessage, elevation: 0 })));
158
161
  }
159
162
  /**
160
163
  * Renders the component (if not hidden by autoHide prop)
@@ -72,10 +72,12 @@ export default function PrivateMessageSnippetItem(inProps) {
72
72
  // STATE
73
73
  const hasBadge = () => {
74
74
  var _a;
75
- 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)) {
76
- return message === null || message === void 0 ? void 0 : message.receiver.community_badge;
75
+ if (message.receiver) {
76
+ 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)) {
77
+ return message === null || message === void 0 ? void 0 : message.receiver.community_badge;
78
+ }
79
+ return message === null || message === void 0 ? void 0 : message.sender.community_badge;
77
80
  }
78
- return message === null || message === void 0 ? void 0 : message.sender.community_badge;
79
81
  };
80
82
  if (!message) {
81
83
  return React.createElement(PrivateMessageSnippetItemSkeleton, { elevation: 0 });
@@ -86,10 +88,13 @@ export default function PrivateMessageSnippetItem(inProps) {
86
88
  return (React.createElement(Root, Object.assign({ className: classNames(classes.root, className) }, rest, { secondaryAction: secondaryAction, disablePadding: true }),
87
89
  React.createElement(ListItemButton, { onClick: onItemClick, classes: { root: classNames({ [classes.unread]: message.thread_status === SCPrivateMessageStatusType.NEW }) } },
88
90
  React.createElement(ListItemAvatar, null,
89
- React.createElement(UserAvatar, { hide: !hasBadge() },
90
- 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 }))),
91
+ 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 })))),
91
92
  React.createElement(ListItemText, { primary: React.createElement(React.Fragment, null,
92
- 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),
93
+ React.createElement(Typography, { component: "span", className: classes.username }, message.group
94
+ ? message.group.name
95
+ : ((_c = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _c === void 0 ? void 0 : _c.username) === message.receiver.username
96
+ ? message.sender.username
97
+ : message.receiver.username),
93
98
  hasBadge() && preferences && (React.createElement(Chip, { component: "span", className: classes.badgeLabel, size: "small", label: preferences[SCPreferences.STAFF_STAFF_BADGE_LABEL] })),
94
99
  React.createElement(Typography, { color: "secondary", className: classes.time, component: "span" }, `${intl.formatDate(message.last_message_at, {
95
100
  day: '2-digit',
@@ -20,7 +20,7 @@ export interface PrivateMessageSnippetsProps extends CardProps {
20
20
  *
21
21
  */
22
22
  snippetActions?: {
23
- onSnippetClick?: (msg: any) => void;
23
+ onSnippetClick?: (msg: any, type: any) => void;
24
24
  onNewMessageClick?: () => void;
25
25
  onDeleteConfirm?: (msg: any) => void;
26
26
  };
@@ -29,10 +29,10 @@ export interface PrivateMessageSnippetsProps extends CardProps {
29
29
  */
30
30
  [p: string]: any;
31
31
  /**
32
- * thread user object
32
+ * thread user/ group object
33
33
  * @default null
34
34
  */
35
- userObj?: any;
35
+ threadObj?: any;
36
36
  }
37
37
  /**
38
38
  * > API documentation for the Community-JS PrivateMessageSnippets component. Learn about the available props and the CSS API.
@@ -1,9 +1,9 @@
1
1
  import { __rest } from "tslib";
2
- import React, { useContext, useEffect, useRef, useState } from 'react';
2
+ import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
3
3
  import { styled } from '@mui/material/styles';
4
4
  import { Button, Card, CardContent, Icon, IconButton, List, TextField, useTheme } from '@mui/material';
5
5
  import PubSub from 'pubsub-js';
6
- import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType } from '@selfcommunity/types';
6
+ import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType, SCPrivateMessageType } from '@selfcommunity/types';
7
7
  import PrivateMessageSnippetsSkeleton from './Skeleton';
8
8
  import PrivateMessageSnippetItem from '../PrivateMessageSnippetItem';
9
9
  import classNames from 'classnames';
@@ -69,15 +69,16 @@ export default function PrivateMessageSnippets(inProps) {
69
69
  props: inProps,
70
70
  name: PREFIX
71
71
  });
72
- const { className = null, userObj = null, snippetActions, clearSearch } = props, rest = __rest(props, ["className", "userObj", "snippetActions", "clearSearch"]);
72
+ const { className = null, threadObj = null, snippetActions, clearSearch } = props, rest = __rest(props, ["className", "threadObj", "snippetActions", "clearSearch"]);
73
73
  // STATE
74
74
  const theme = useTheme();
75
75
  const isMobile = useMediaQuery(theme.breakpoints.down('md'));
76
76
  const { data, updateSnippets } = useSCFetchPrivateMessageSnippets({ cacheStrategy: CacheStrategies.CACHE_FIRST });
77
77
  const [search, setSearch] = useState('');
78
- const isObj = typeof userObj === 'object';
78
+ const isObj = typeof threadObj === 'object';
79
79
  const scUserContext = useContext(SCUserContext);
80
80
  const authUserId = scUserContext.user ? scUserContext.user.id : null;
81
+ const [type, setType] = useState(null);
81
82
  // INTL
82
83
  const intl = useIntl();
83
84
  // REFS
@@ -99,6 +100,18 @@ export default function PrivateMessageSnippets(inProps) {
99
100
  }
100
101
  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;
101
102
  };
103
+ const isSelected = useMemo(() => {
104
+ return (message) => {
105
+ var _a, _b;
106
+ if (type === SCPrivateMessageType.GROUP) {
107
+ 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);
108
+ }
109
+ else if (type === SCPrivateMessageType.USER) {
110
+ return messageReceiver(message, authUserId) === (isObj ? messageReceiver(threadObj, authUserId) : threadObj);
111
+ }
112
+ return false;
113
+ };
114
+ }, [threadObj, authUserId, type]);
102
115
  //HANDLERS
103
116
  const handleChange = (event) => {
104
117
  setSearch(event.target.value);
@@ -114,7 +127,9 @@ export default function PrivateMessageSnippets(inProps) {
114
127
  snippetActions && snippetActions.onDeleteConfirm(msg);
115
128
  };
116
129
  function handleOpenThread(msg) {
117
- snippetActions && snippetActions.onSnippetClick(msg);
130
+ const _type = msg.group !== null ? SCPrivateMessageType.GROUP : SCPrivateMessageType.USER;
131
+ setType(_type);
132
+ snippetActions && snippetActions.onSnippetClick(msg, _type);
118
133
  handleClear();
119
134
  updateSnippetsParams(msg.id, 'seen');
120
135
  }
@@ -219,6 +234,5 @@ export default function PrivateMessageSnippets(inProps) {
219
234
  } }),
220
235
  React.createElement(List, null, filteredSnippets.map((message) => (React.createElement(PrivateMessageSnippetItem, { message: message, key: message.id, onItemClick: () => handleOpenThread(message), secondaryAction: React.createElement(React.Fragment, null,
221
236
  message.thread_status === SCPrivateMessageStatusType.NEW && (React.createElement(Icon, { fontSize: "small", color: "secondary" }, "fiber_manual_record")),
222
- !isMobile && (React.createElement(PrivateMessageSettingsIconButton, { threadToDelete: messageReceiver(message, authUserId), onItemDeleteConfirm: () => handleDeleteConversation(messageReceiver(message, authUserId)), user: messageReceiver(message, authUserId, true) }))), selected: userObj !== SCPrivateMessageStatusType.NEW &&
223
- messageReceiver(message, authUserId) === (isObj ? messageReceiver(userObj, authUserId) : userObj) })))))))));
237
+ !isMobile && (React.createElement(PrivateMessageSettingsIconButton, { threadToDelete: messageReceiver(message, authUserId), onItemDeleteConfirm: () => handleDeleteConversation(messageReceiver(message, authUserId)), user: messageReceiver(message, authUserId, true) }))), selected: isSelected(message) })))))))));
224
238
  }
@@ -1,10 +1,11 @@
1
+ import { SCPrivateMessageType } from '@selfcommunity/types';
1
2
  import { CardProps } from '@mui/material';
2
3
  export interface PrivateMessageThreadProps extends CardProps {
3
4
  /**
4
5
  * Thread object or thread id
5
6
  * default null
6
7
  */
7
- userObj?: any;
8
+ threadObj?: any;
8
9
  /**
9
10
  * Overrides or extends the styles applied to the component.
10
11
  * @default null
@@ -30,6 +31,10 @@ export interface PrivateMessageThreadProps extends CardProps {
30
31
  * @default null
31
32
  */
32
33
  onSingleMessageOpen?: (open: boolean) => void;
34
+ /**
35
+ * The Thread type
36
+ */
37
+ type?: SCPrivateMessageType;
33
38
  /**
34
39
  * Any other properties
35
40
  */