@selfcommunity/react-ui 0.7.9-alpha.75 → 0.7.9-alpha.77
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.
- package/lib/cjs/components/Footer/Footer.js +1 -1
- package/lib/cjs/components/PrivateMessageSnippets/PrivateMessageSnippets.js +3 -3
- package/lib/cjs/components/PrivateMessageThread/PrivateMessageThread.js +1 -0
- package/lib/esm/components/Footer/Footer.js +2 -2
- package/lib/esm/components/PrivateMessageSnippets/PrivateMessageSnippets.js +3 -3
- package/lib/esm/components/PrivateMessageThread/PrivateMessageThread.js +1 -0
- package/lib/umd/react-ui.js +1 -1
- package/package.json +2 -2
|
@@ -96,7 +96,7 @@ function Footer(inProps) {
|
|
|
96
96
|
}
|
|
97
97
|
return (react_1.default.createElement(Root, Object.assign({}, rest, { className: (0, classnames_1.default)(classes.root, className) }),
|
|
98
98
|
startActions,
|
|
99
|
-
react_1.default.createElement(material_1.Box, { className: classes.itemList }, _menu.items.map((item, index) => (react_1.default.createElement(material_1.Button, { component: react_core_1.Link, key: item.id, className: classes.item, to: item.url, variant: "text" }, item.label)))),
|
|
99
|
+
react_1.default.createElement(material_1.Box, { className: classes.itemList }, (0, utils_1.sortByAttr)(_menu.items, 'order').map((item, index) => (react_1.default.createElement(material_1.Button, { component: react_core_1.Link, key: item.id, className: classes.item, to: item.url, variant: "text" }, item.label)))),
|
|
100
100
|
endActions,
|
|
101
101
|
react_1.default.createElement(material_1.Typography, { textAlign: "center", className: classes.copyright, variant: "body2", dangerouslySetInnerHTML: { __html: copyright } })));
|
|
102
102
|
}
|
|
@@ -133,9 +133,9 @@ function PrivateMessageSnippets(inProps) {
|
|
|
133
133
|
snippetActions && snippetActions.onDeleteConfirm(msg);
|
|
134
134
|
};
|
|
135
135
|
function handleOpenThread(msg) {
|
|
136
|
-
const
|
|
137
|
-
_setType(
|
|
138
|
-
snippetActions && snippetActions.onSnippetClick(msg,
|
|
136
|
+
const threadType = msg.group !== null ? types_1.SCPrivateMessageType.GROUP : types_1.SCPrivateMessageType.USER;
|
|
137
|
+
_setType(threadType);
|
|
138
|
+
snippetActions && snippetActions.onSnippetClick(msg, threadType);
|
|
139
139
|
handleClear();
|
|
140
140
|
updateSnippetsParams(msg.id, 'seen');
|
|
141
141
|
}
|
|
@@ -299,6 +299,7 @@ function PrivateMessageThread(inProps) {
|
|
|
299
299
|
setMessageObjs(res.results);
|
|
300
300
|
setPrevious(res.next && updateAndDeleteURLParameters(res.next, 'before_message', res.results[0].id, 'offset'));
|
|
301
301
|
setLoadingMessageObjs(false);
|
|
302
|
+
setSingleMessageThread(false);
|
|
302
303
|
})
|
|
303
304
|
.catch((error) => {
|
|
304
305
|
setLoadingMessageObjs(false);
|
|
@@ -5,7 +5,7 @@ import { styled } from '@mui/material/styles';
|
|
|
5
5
|
import { Box, Button, Typography } from '@mui/material';
|
|
6
6
|
import classNames from 'classnames';
|
|
7
7
|
import { CustomMenuService } from '@selfcommunity/api-services';
|
|
8
|
-
import { Logger } from '@selfcommunity/utils';
|
|
8
|
+
import { Logger, sortByAttr } from '@selfcommunity/utils';
|
|
9
9
|
import { Link, SCPreferences, useSCPreferences } from '@selfcommunity/react-core';
|
|
10
10
|
import { SCOPE_SC_UI } from '../../constants/Errors';
|
|
11
11
|
import FooterSkeleton from './Skeleton';
|
|
@@ -94,7 +94,7 @@ export default function Footer(inProps) {
|
|
|
94
94
|
}
|
|
95
95
|
return (React.createElement(Root, Object.assign({}, rest, { className: classNames(classes.root, className) }),
|
|
96
96
|
startActions,
|
|
97
|
-
React.createElement(Box, { className: classes.itemList }, _menu.items.map((item, index) => (React.createElement(Button, { component: Link, key: item.id, className: classes.item, to: item.url, variant: "text" }, item.label)))),
|
|
97
|
+
React.createElement(Box, { className: classes.itemList }, sortByAttr(_menu.items, 'order').map((item, index) => (React.createElement(Button, { component: Link, key: item.id, className: classes.item, to: item.url, variant: "text" }, item.label)))),
|
|
98
98
|
endActions,
|
|
99
99
|
React.createElement(Typography, { textAlign: "center", className: classes.copyright, variant: "body2", dangerouslySetInnerHTML: { __html: copyright } })));
|
|
100
100
|
}
|
|
@@ -131,9 +131,9 @@ export default function PrivateMessageSnippets(inProps) {
|
|
|
131
131
|
snippetActions && snippetActions.onDeleteConfirm(msg);
|
|
132
132
|
};
|
|
133
133
|
function handleOpenThread(msg) {
|
|
134
|
-
const
|
|
135
|
-
_setType(
|
|
136
|
-
snippetActions && snippetActions.onSnippetClick(msg,
|
|
134
|
+
const threadType = msg.group !== null ? SCPrivateMessageType.GROUP : SCPrivateMessageType.USER;
|
|
135
|
+
_setType(threadType);
|
|
136
|
+
snippetActions && snippetActions.onSnippetClick(msg, threadType);
|
|
137
137
|
handleClear();
|
|
138
138
|
updateSnippetsParams(msg.id, 'seen');
|
|
139
139
|
}
|
|
@@ -297,6 +297,7 @@ export default function PrivateMessageThread(inProps) {
|
|
|
297
297
|
setMessageObjs(res.results);
|
|
298
298
|
setPrevious(res.next && updateAndDeleteURLParameters(res.next, 'before_message', res.results[0].id, 'offset'));
|
|
299
299
|
setLoadingMessageObjs(false);
|
|
300
|
+
setSingleMessageThread(false);
|
|
300
301
|
})
|
|
301
302
|
.catch((error) => {
|
|
302
303
|
setLoadingMessageObjs(false);
|