npm - @selfcommunity/react-ui - Versions diffs - 0.7.0-alpha.358 → 0.7.0-alpha.359 - Mend

@selfcommunity/react-ui 0.7.0-alpha.358 → 0.7.0-alpha.359

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 (8) hide show

package/lib/cjs/components/LocationAutocomplete/LocationAutocomplete.js CHANGED Viewed

@@ -88,7 +88,7 @@ function LocationAutocomplete(inProps) {
     }, [value]);
     // Handlers
     const handleChange = (event, value) => {
-        setValue(value ? { location: value.full_address, lat: value.lat, lon: value.lng } : null);
+        setValue(value ? { location: value.full_address, lat: value.lat, lng: value.lng } : null);
         onChange && onChange(value);
     };
     const handleSearch = (event, _search) => {
@@ -96,14 +96,14 @@ function LocationAutocomplete(inProps) {
     };
     // Render
     const options = (0, react_1.useMemo)(() => {
-        if (!value || typeof value === 'string' || locations.find((loc) => value.lat === loc.lat && value.lon === loc.lng)) {
+        if (!value || typeof value === 'string' || locations.find((loc) => value.lat === loc.lat && value.lng === loc.lng)) {
             return locations;
         }
-        return [...locations, { lat: value.lat, lng: value.lon, full_address: value.location }];
+        return [...locations, { lat: value.lat, lng: value.lng, full_address: value.location }];
     }, [value, locations]);
     return (react_1.default.createElement(Root, Object.assign({ className: classes.root, options: options || [],
         // @ts-ignore
-        getOptionLabel: (option) => (option === null || option === void 0 ? void 0 : option.full_address) || (option === null || option === void 0 ? void 0 : option.location) || '', filterOptions: (x) => x, autoComplete: true, includeInputInList: true, value: value || null, selectOnFocus: true, handleHomeEndKeys: true, disabled: disabled, noOptionsText: react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.locationAutocomplete.empty", defaultMessage: "ui.locationAutocomplete.empty" }), onChange: handleChange, onInputChange: handleSearch, isOptionEqualToValue: (option, value) => value.lat === option.lat && value.lon === option.lng, renderInput: (params) => {
+        getOptionLabel: (option) => (option === null || option === void 0 ? void 0 : option.full_address) || (option === null || option === void 0 ? void 0 : option.location) || '', filterOptions: (x) => x, autoComplete: true, includeInputInList: true, value: value || null, selectOnFocus: true, handleHomeEndKeys: true, disabled: disabled, noOptionsText: react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.locationAutocomplete.empty", defaultMessage: "ui.locationAutocomplete.empty" }), onChange: handleChange, onInputChange: handleSearch, isOptionEqualToValue: (option, value) => value.lat === option.lat && value.lng === option.lng, renderInput: (params) => {
             return (react_1.default.createElement(TextField_1.default, Object.assign({}, params, TextFieldProps, { margin: "dense", InputProps: Object.assign(Object.assign({}, params.InputProps), { autoComplete: 'location', endAdornment: (react_1.default.createElement(react_1.default.Fragment, null,
                         isLoading ? react_1.default.createElement(CircularProgress_1.default, { color: "inherit", size: 20 }) : null,
                         params.InputProps.endAdornment)) }) })));

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

@@ -98,21 +98,6 @@ function PrivateMessageThread(inProps) {
     const { userObj, openNewMessage = false, onNewMessageClose = null, onNewMessageSent = null, onSingleMessageOpen = null, className } = props, rest = tslib_1.__rest(props, ["userObj", "openNewMessage", "onNewMessageClose", "onNewMessageSent", "onSingleMessageOpen", "className"]);
     // CONTEXT
     const scUserContext = (0, react_1.useContext)(react_core_1.SCUserContext);
-    const role = react_core_1.UserUtils.getUserRole(scUserContext['user']);
-    const scPreferencesContext = (0, react_core_1.useSCPreferences)();
-    const followEnabled = (0, react_1.useMemo)(() => react_core_1.SCPreferences.CONFIGURATIONS_FOLLOW_ENABLED in scPreferencesContext.preferences &&
-        scPreferencesContext.preferences[react_core_1.SCPreferences.CONFIGURATIONS_FOLLOW_ENABLED].value, [scPreferencesContext.preferences]);
-    const manager = followEnabled
-        ? scUserContext.managers.followers
-        : scUserContext.managers.connections;
-    function checkFollowerOrConnection(user) {
-        if ('isFollower' in manager) {
-            return manager.isFollower(user);
-        }
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-        // @ts-ignore
-        return manager.status(user);
-    }
     // STATE
     const [value, setValue] = (0, react_1.useState)('');
     const [previous, setPrevious] = (0, react_1.useState)(null);
@@ -121,7 +106,6 @@ function PrivateMessageThread(inProps) {
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [isHovered, setIsHovered] = (0, react_1.useState)({});
     const [followers, setFollowers] = (0, react_1.useState)([]);
-    const [isFollower, setIsFollower] = (0, react_1.useState)(false);
     const isNew = userObj && userObj === types_1.SCPrivateMessageStatusType.NEW;
     const authUserId = scUserContext.user ? scUserContext.user.id : null;
     const [singleMessageUser, setSingleMessageUser] = (0, react_1.useState)(null);
@@ -274,7 +258,6 @@ function PrivateMessageThread(inProps) {
     function fetchThread() {
         if (userObj && typeof userObj !== 'string') {
             setLoadingMessageObjs(true);
-            const _isFollower = (scUser && checkFollowerOrConnection(scUser)) || (scUser && scUser.community_badge);
             const _userObjId = isNumber ? userObj : messageReceiver(userObj, authUserId);
             api_services_1.PrivateMessageService.getAThread({ user: _userObjId, limit: 10 })
                 .then((res) => {
@@ -290,7 +273,7 @@ function PrivateMessageThread(inProps) {
                     setSingleMessageThread(false);
                 }
                 else {
-                    if (role || _isFollower || react_core_1.UserUtils.getUserRole(scUser)) {
+                    if (scUser === null || scUser === void 0 ? void 0 : scUser.can_send_pm_to) {
                         setSingleMessageThread(true);
                         setRecipients(_userObjId);
                         onSingleMessageOpen(true);
@@ -308,6 +291,9 @@ function PrivateMessageThread(inProps) {
                 utils_1.Logger.error(Errors_1.SCOPE_SC_UI, { error });
             });
         }
+        else {
+            setSingleMessageUser(scUser);
+        }
     }
     const isNewerThan60Seconds = (creationTime) => {
         const date = new Date(creationTime);
@@ -415,14 +401,6 @@ function PrivateMessageThread(inProps) {
             fetchResults();
         }
     }, [value]);
-    /**
-     * Checks is thread receiver is a user follower
-     */
-    (0, react_1.useEffect)(() => {
-        if (receiver) {
-            !receiver.community_badge && scUser ? setIsFollower(checkFollowerOrConnection(scUser)) : setIsFollower(true);
-        }
-    });
     /**
      * On mount, if obj, fetches thread
      */
@@ -482,7 +460,7 @@ function PrivateMessageThread(inProps) {
                                 onMouseEnter: () => handleMouseEnter(msg.id),
                                 onMouseLeave: () => handleMouseLeave(msg.id)
                             }, isHovering: isHovered[msg.id], showMenuIcon: authUserId === msg.sender.id, onMenuIconClick: () => handleOpenDeleteMessageDialog(msg) }))))))))),
-            react_1.default.createElement(PrivateMessageEditor_1.default, { className: classes.editor, send: handleSend, autoHide: !isFollower && (!role || !react_core_1.UserUtils.getUserRole(scUser)), 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) }),
+            react_1.default.createElement(PrivateMessageEditor_1.default, { className: classes.editor, send: handleSend, autoHide: !(scUser === null || scUser === void 0 ? void 0 : scUser.can_send_pm_to), autoHideDeletion: (receiver === null || receiver === void 0 ? void 0 : receiver.deleted) || (scUser === null || scUser === void 0 ? void 0 : scUser.deleted), onThreadChangeId: isNumber ? userObj : userObj.receiver.id, error: error, onErrorRemove: () => setError(false) }),
             openDeleteMessageDialog && (react_1.default.createElement(ConfirmDialog_1.default, { open: openDeleteMessageDialog, title: react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.privateMessage.component.delete.message.dialog.msg", defaultMessage: "ui.privateMessage.component.delete.message.dialog.msg" }), btnConfirm: react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.privateMessage.component.delete.message.dialog.confirm", defaultMessage: "ui.privateMessage.component.delete.message.dialog.confirm" }), onConfirm: handleDeleteMessage, onClose: handleCloseDeleteMessageDialog }))));
     }
     /**

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

@@ -121,6 +121,11 @@ function PrivateMessageThreadItem(inProps) {
             return null;
         }
         let section = null;
+        const defaultSection = (react_1.default.createElement(material_1.Box, { className: classes.other },
+            react_1.default.createElement(material_1.Button, { onClick: () => handleDownload(m.file) },
+                react_1.default.createElement(Icon_1.default, null, "download"),
+                react_1.default.createElement(material_1.Typography, null, m.file.filename),
+                react_1.default.createElement(material_1.Typography, null, (0, sizeCoverter_1.bytesToSize)(m.file.filesize)))));
         if (m.file) {
             let type = m.file.mimetype;
             switch (true) {
@@ -129,11 +134,15 @@ function PrivateMessageThreadItem(inProps) {
                         react_1.default.createElement("img", { src: m.file.thumbnail, loading: "lazy", alt: 'img', onClick: () => setOpenDialog(true) })));
                     break;
                 case type.startsWith(types_1.SCMessageFileType.VIDEO):
-                    section = (react_1.default.createElement(material_1.Box, { className: (0, classnames_1.default)(classes.img, classes.video) },
-                        react_1.default.createElement("img", { src: m.file.thumbnail, loading: "lazy", alt: 'img' }),
-                        !(0, thumbnailCoverter_1.isSupportedVideoFormat)(m.file.filename) ? (react_1.default.createElement(material_1.Button, { onClick: () => handleDownload(m.file), className: classes.iconButton },
-                            react_1.default.createElement(Icon_1.default, null, "download"))) : (react_1.default.createElement(material_1.IconButton, { onClick: () => setOpenDialog(true) },
-                            react_1.default.createElement(Icon_1.default, null, "play_circle_outline")))));
+                    if (!(0, thumbnailCoverter_1.isSupportedVideoFormat)(m.file.filename)) {
+                        section = defaultSection;
+                    }
+                    else {
+                        section = (react_1.default.createElement(material_1.Box, { className: (0, classnames_1.default)(classes.img, classes.video) },
+                            react_1.default.createElement("img", { src: m.file.thumbnail, loading: "lazy", alt: 'img' }),
+                            react_1.default.createElement(material_1.IconButton, { onClick: () => setOpenDialog(true) },
+                                react_1.default.createElement(Icon_1.default, null, "play_circle_outline"))));
+                    }
                     break;
                 case type.startsWith(types_1.SCMessageFileType.DOCUMENT):
                     section = (react_1.default.createElement(material_1.Box, { className: m.file.filename.endsWith('.pdf') ? classes.document : classes.other },
@@ -145,11 +154,7 @@ function PrivateMessageThreadItem(inProps) {
                     break;
                 default:
                     // section = <Icon>hide_image</Icon>;
-                    section = (react_1.default.createElement(material_1.Box, { className: classes.other },
-                        react_1.default.createElement(material_1.Button, { onClick: () => handleDownload(m.file) },
-                            react_1.default.createElement(Icon_1.default, null, "download"),
-                            react_1.default.createElement(material_1.Typography, null, m.file.filename),
-                            react_1.default.createElement(material_1.Typography, null, (0, sizeCoverter_1.bytesToSize)(m.file.filesize)))));
+                    section = defaultSection;
                     break;
             }
         }

package/lib/esm/components/LocationAutocomplete/LocationAutocomplete.js CHANGED Viewed

@@ -86,7 +86,7 @@ export default function LocationAutocomplete(inProps) {
     }, [value]);
     // Handlers
     const handleChange = (event, value) => {
-        setValue(value ? { location: value.full_address, lat: value.lat, lon: value.lng } : null);
+        setValue(value ? { location: value.full_address, lat: value.lat, lng: value.lng } : null);
         onChange && onChange(value);
     };
     const handleSearch = (event, _search) => {
@@ -94,14 +94,14 @@ export default function LocationAutocomplete(inProps) {
     };
     // Render
     const options = useMemo(() => {
-        if (!value || typeof value === 'string' || locations.find((loc) => value.lat === loc.lat && value.lon === loc.lng)) {
+        if (!value || typeof value === 'string' || locations.find((loc) => value.lat === loc.lat && value.lng === loc.lng)) {
             return locations;
         }
-        return [...locations, { lat: value.lat, lng: value.lon, full_address: value.location }];
+        return [...locations, { lat: value.lat, lng: value.lng, full_address: value.location }];
     }, [value, locations]);
     return (React.createElement(Root, Object.assign({ className: classes.root, options: options || [],
         // @ts-ignore
-        getOptionLabel: (option) => (option === null || option === void 0 ? void 0 : option.full_address) || (option === null || option === void 0 ? void 0 : option.location) || '', filterOptions: (x) => x, autoComplete: true, includeInputInList: true, value: value || null, selectOnFocus: true, handleHomeEndKeys: true, disabled: disabled, noOptionsText: React.createElement(FormattedMessage, { id: "ui.locationAutocomplete.empty", defaultMessage: "ui.locationAutocomplete.empty" }), onChange: handleChange, onInputChange: handleSearch, isOptionEqualToValue: (option, value) => value.lat === option.lat && value.lon === option.lng, renderInput: (params) => {
+        getOptionLabel: (option) => (option === null || option === void 0 ? void 0 : option.full_address) || (option === null || option === void 0 ? void 0 : option.location) || '', filterOptions: (x) => x, autoComplete: true, includeInputInList: true, value: value || null, selectOnFocus: true, handleHomeEndKeys: true, disabled: disabled, noOptionsText: React.createElement(FormattedMessage, { id: "ui.locationAutocomplete.empty", defaultMessage: "ui.locationAutocomplete.empty" }), onChange: handleChange, onInputChange: handleSearch, isOptionEqualToValue: (option, value) => value.lat === option.lat && value.lng === option.lng, renderInput: (params) => {
             return (React.createElement(TextField, Object.assign({}, params, TextFieldProps, { margin: "dense", InputProps: Object.assign(Object.assign({}, params.InputProps), { autoComplete: 'location', endAdornment: (React.createElement(React.Fragment, null,
                         isLoading ? React.createElement(CircularProgress, { color: "inherit", size: 20 }) : null,
                         params.InputProps.endAdornment)) }) })));

package/lib/esm/components/PrivateMessageThread/PrivateMessageThread.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { __rest } from "tslib";
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { Endpoints, http, PrivateMessageService } from '@selfcommunity/api-services';
-import { SCPreferences, SCUserContext, UserUtils, useSCFetchUser, useSCPreferences } from '@selfcommunity/react-core';
+import { SCUserContext, UserUtils, useSCFetchUser } from '@selfcommunity/react-core';
 import { SCNotificationTopicType, SCNotificationTypologyType, SCPrivateMessageStatusType } from '@selfcommunity/types';
 import PrivateMessageThreadItem, { PrivateMessageThreadItemSkeleton } from '../PrivateMessageThreadItem';
 import PubSub from 'pubsub-js';
@@ -96,21 +96,6 @@ export default function PrivateMessageThread(inProps) {
     const { userObj, openNewMessage = false, onNewMessageClose = null, onNewMessageSent = null, onSingleMessageOpen = null, className } = props, rest = __rest(props, ["userObj", "openNewMessage", "onNewMessageClose", "onNewMessageSent", "onSingleMessageOpen", "className"]);
     // CONTEXT
     const scUserContext = useContext(SCUserContext);
-    const role = UserUtils.getUserRole(scUserContext['user']);
-    const scPreferencesContext = useSCPreferences();
-    const followEnabled = useMemo(() => SCPreferences.CONFIGURATIONS_FOLLOW_ENABLED in scPreferencesContext.preferences &&
-        scPreferencesContext.preferences[SCPreferences.CONFIGURATIONS_FOLLOW_ENABLED].value, [scPreferencesContext.preferences]);
-    const manager = followEnabled
-        ? scUserContext.managers.followers
-        : scUserContext.managers.connections;
-    function checkFollowerOrConnection(user) {
-        if ('isFollower' in manager) {
-            return manager.isFollower(user);
-        }
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-        // @ts-ignore
-        return manager.status(user);
-    }
     // STATE
     const [value, setValue] = useState('');
     const [previous, setPrevious] = useState(null);
@@ -119,7 +104,6 @@ export default function PrivateMessageThread(inProps) {
     const [loading, setLoading] = useState(false);
     const [isHovered, setIsHovered] = useState({});
     const [followers, setFollowers] = useState([]);
-    const [isFollower, setIsFollower] = useState(false);
     const isNew = userObj && userObj === SCPrivateMessageStatusType.NEW;
     const authUserId = scUserContext.user ? scUserContext.user.id : null;
     const [singleMessageUser, setSingleMessageUser] = useState(null);
@@ -272,7 +256,6 @@ export default function PrivateMessageThread(inProps) {
     function fetchThread() {
         if (userObj && typeof userObj !== 'string') {
             setLoadingMessageObjs(true);
-            const _isFollower = (scUser && checkFollowerOrConnection(scUser)) || (scUser && scUser.community_badge);
             const _userObjId = isNumber ? userObj : messageReceiver(userObj, authUserId);
             PrivateMessageService.getAThread({ user: _userObjId, limit: 10 })
                 .then((res) => {
@@ -288,7 +271,7 @@ export default function PrivateMessageThread(inProps) {
                     setSingleMessageThread(false);
                 }
                 else {
-                    if (role || _isFollower || UserUtils.getUserRole(scUser)) {
+                    if (scUser === null || scUser === void 0 ? void 0 : scUser.can_send_pm_to) {
                         setSingleMessageThread(true);
                         setRecipients(_userObjId);
                         onSingleMessageOpen(true);
@@ -306,6 +289,9 @@ export default function PrivateMessageThread(inProps) {
                 Logger.error(SCOPE_SC_UI, { error });
             });
         }
+        else {
+            setSingleMessageUser(scUser);
+        }
     }
     const isNewerThan60Seconds = (creationTime) => {
         const date = new Date(creationTime);
@@ -413,14 +399,6 @@ export default function PrivateMessageThread(inProps) {
             fetchResults();
         }
     }, [value]);
-    /**
-     * Checks is thread receiver is a user follower
-     */
-    useEffect(() => {
-        if (receiver) {
-            !receiver.community_badge && scUser ? setIsFollower(checkFollowerOrConnection(scUser)) : setIsFollower(true);
-        }
-    });
     /**
      * On mount, if obj, fetches thread
      */
@@ -480,7 +458,7 @@ export default function PrivateMessageThread(inProps) {
                                 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: !isFollower && (!role || !UserUtils.getUserRole(scUser)), 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) }),
+            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) }),
             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 }))));
     }
     /**

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

@@ -119,6 +119,11 @@ export default function PrivateMessageThreadItem(inProps) {
             return null;
         }
         let section = null;
+        const defaultSection = (React.createElement(Box, { className: classes.other },
+            React.createElement(Button, { onClick: () => handleDownload(m.file) },
+                React.createElement(Icon, null, "download"),
+                React.createElement(Typography, null, m.file.filename),
+                React.createElement(Typography, null, bytesToSize(m.file.filesize)))));
         if (m.file) {
             let type = m.file.mimetype;
             switch (true) {
@@ -127,11 +132,15 @@ export default function PrivateMessageThreadItem(inProps) {
                         React.createElement("img", { src: m.file.thumbnail, loading: "lazy", alt: 'img', onClick: () => setOpenDialog(true) })));
                     break;
                 case type.startsWith(SCMessageFileType.VIDEO):
-                    section = (React.createElement(Box, { className: classNames(classes.img, classes.video) },
-                        React.createElement("img", { src: m.file.thumbnail, loading: "lazy", alt: 'img' }),
-                        !isSupportedVideoFormat(m.file.filename) ? (React.createElement(Button, { onClick: () => handleDownload(m.file), className: classes.iconButton },
-                            React.createElement(Icon, null, "download"))) : (React.createElement(IconButton, { onClick: () => setOpenDialog(true) },
-                            React.createElement(Icon, null, "play_circle_outline")))));
+                    if (!isSupportedVideoFormat(m.file.filename)) {
+                        section = defaultSection;
+                    }
+                    else {
+                        section = (React.createElement(Box, { className: classNames(classes.img, classes.video) },
+                            React.createElement("img", { src: m.file.thumbnail, loading: "lazy", alt: 'img' }),
+                            React.createElement(IconButton, { onClick: () => setOpenDialog(true) },
+                                React.createElement(Icon, null, "play_circle_outline"))));
+                    }
                     break;
                 case type.startsWith(SCMessageFileType.DOCUMENT):
                     section = (React.createElement(Box, { className: m.file.filename.endsWith('.pdf') ? classes.document : classes.other },
@@ -143,11 +152,7 @@ export default function PrivateMessageThreadItem(inProps) {
                     break;
                 default:
                     // section = <Icon>hide_image</Icon>;
-                    section = (React.createElement(Box, { className: classes.other },
-                        React.createElement(Button, { onClick: () => handleDownload(m.file) },
-                            React.createElement(Icon, null, "download"),
-                            React.createElement(Typography, null, m.file.filename),
-                            React.createElement(Typography, null, bytesToSize(m.file.filesize)))));
+                    section = defaultSection;
                     break;
             }
         }