@opexa/portal-components 0.0.1008 → 0.0.1009
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.
|
@@ -28,6 +28,16 @@ import { MessageIcon } from './MessageIcon.js';
|
|
|
28
28
|
import { MessageProvider, useMessageContext, useMessagesPropsContext, } from './MessagesContext.js';
|
|
29
29
|
import { normalizeActionUrl } from './utils.js';
|
|
30
30
|
const TABS = ['ALL', 'UNREAD'];
|
|
31
|
+
function filterDuplicateRejectionMessages(messages) {
|
|
32
|
+
return messages.filter((item) => {
|
|
33
|
+
if (item.type !== 'TEXT')
|
|
34
|
+
return true;
|
|
35
|
+
const hasMasterDuplicate = messages.some((other) => other.type === 'MEMBER_VERIFICATION_REJECTION' &&
|
|
36
|
+
other.title === item.title &&
|
|
37
|
+
other.content === item.content);
|
|
38
|
+
return !hasMasterDuplicate;
|
|
39
|
+
});
|
|
40
|
+
}
|
|
31
41
|
export function Messages(props) {
|
|
32
42
|
const globalStore = useGlobalStore(useShallow((ctx) => ({ messages: ctx.messages })));
|
|
33
43
|
const unreadMessagesCountQuery = useUnreadMessagesCountQuery({}, {
|
|
@@ -48,7 +58,7 @@ export function Messages(props) {
|
|
|
48
58
|
refetchInterval: 10000,
|
|
49
59
|
});
|
|
50
60
|
const markAllMessagesAsReadMutation = useMarkAllMessagesAsReadMutation();
|
|
51
|
-
const messages = messagesQuery.data?.pages.flatMap((page) => page.edges.map((e) => e.node)) ?? [];
|
|
61
|
+
const messages = filterDuplicateRejectionMessages(messagesQuery.data?.pages.flatMap((page) => page.edges.map((e) => e.node)) ?? []);
|
|
52
62
|
const [mobileOffsetTop, desktopOffsetTop] = Array.isArray(props.offsetTop)
|
|
53
63
|
? props.offsetTop
|
|
54
64
|
: [props.offsetTop ?? '0px', props.offsetTop ?? '0px'];
|