@messenger-box/platform-mobile 0.0.1-alpha.481 → 0.0.1-alpha.482

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.1-alpha.482](https://github.com/CDEBase/messenger-box/compare/v0.0.1-alpha.481...v0.0.1-alpha.482) (2024-03-04)
+
+**Note:** Version bump only for package @messenger-box/platform-mobile
+
 ## [0.0.1-alpha.481](https://github.com/CDEBase/messenger-box/compare/v0.0.1-alpha.480...v0.0.1-alpha.481) (2024-03-02)
 
 **Note:** Version bump only for package @messenger-box/platform-mobile

package/lib/index.js

@@ -99,10 +99,10 @@ const inboxConfig = {
         exact: true,
         name: 'Message',
         props: {
-            initialParams: { channelId: null, role: null },
+            initialParams: { channelId: null, role: null, isShowThreadMessage: true },
             component: (props) => {
-                var _a, _b, _c, _d;
-                return (React.createElement(DialogMessages_1.DialogMessages, Object.assign({}, props, { channelId: (_b = (_a = props === null || props === void 0 ? void 0 : props.route) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.channelId, role: (_d = (_c = props === null || props === void 0 ? void 0 : props.route) === null || _c === void 0 ? void 0 : _c.params) === null || _d === void 0 ? void 0 : _d.role })));
+                var _a, _b, _c, _d, _e, _f;
+                return (React.createElement(DialogMessages_1.DialogMessages, Object.assign({}, props, { channelId: (_b = (_a = props === null || props === void 0 ? void 0 : props.route) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.channelId, role: (_d = (_c = props === null || props === void 0 ? void 0 : props.route) === null || _c === void 0 ? void 0 : _c.params) === null || _d === void 0 ? void 0 : _d.role, isShowThreadMessage: (_f = (_e = props === null || props === void 0 ? void 0 : props.route) === null || _e === void 0 ? void 0 : _e.params) === null || _f === void 0 ? void 0 : _f.isShowThreadMessage })));
             },
             options: ({ navigation }) => {
                 return {
@@ -240,11 +240,11 @@ const React = __importStar(__webpack_require__(/*! react */ "react"));
 const native_base_1 = __webpack_require__(/*! native-base */ "native-base");
 const ConversationView_1 = __webpack_require__(/*! ./containers/ConversationView */ "./src/screens/inbox/containers/ConversationView.tsx");
 function DialogMessages(_a) {
-    var { channelId, role } = _a, rest = __rest(_a, ["channelId", "role"]);
+    var { channelId, role, isShowThreadMessage = true } = _a, rest = __rest(_a, ["channelId", "role", "isShowThreadMessage"]);
     return (
     // <Box bg={'white'} flex={1} pt={5}>
     React.createElement(native_base_1.Box, { bg: 'white', flex: 1 },
-        React.createElement(ConversationView_1.ConversationView, Object.assign({}, rest, { channelId: channelId, role: role }))));
+        React.createElement(ConversationView_1.ConversationView, Object.assign({}, rest, { channelId: channelId, role: role, isShowThreadMessage: isShowThreadMessage }))));
 }
 exports.DialogMessages = DialogMessages;
 
@@ -1801,7 +1801,7 @@ const createdAtText = (value) => {
 };
 const ConversationViewComponent = (_a) => {
     var _b, _c;
-    var { channelId: ChannelId, role } = _a, rest = __rest(_a, ["channelId", "role"]);
+    var { channelId: ChannelId, role, isShowThreadMessage } = _a, rest = __rest(_a, ["channelId", "role", "isShowThreadMessage"]);
     const [channelToTop, setChannelToTop] = (0, react_1.useState)(0);
     const [channelMessages, setChannelMessages] = (0, react_1.useState)([]);
     const auth = (0, react_redux_1.useSelector)(user_auth0_client_1.userSelector);
@@ -2106,6 +2106,7 @@ const ConversationViewComponent = (_a) => {
                 message.type = msg === null || msg === void 0 ? void 0 : msg.type;
                 message.propsConfiguration = msg === null || msg === void 0 ? void 0 : msg.propsConfiguration;
                 message.replies = (_d = msg === null || msg === void 0 ? void 0 : msg.replies) !== null && _d !== void 0 ? _d : [];
+                message.isShowThreadMessage = isShowThreadMessage;
                 res.push(message);
             });
         }
@@ -2156,12 +2157,15 @@ const ConversationViewComponent = (_a) => {
                     react_1.default.createElement(native_base_1.Text, { color: CALL_TO_ACTION_TEXT_COLOR }, attachment.callToAction.title)),
                 react_1.default.createElement(react_native_gifted_chat_1.MessageText, Object.assign({}, props, { textStyle: {
                         left: { marginLeft: 5, color: CALL_TO_ACTION_TEXT_COLOR, paddingHorizontal: 2 },
-                    } })))) : (react_1.default.createElement(react_native_1.TouchableHighlight, { underlayColor: '#c0c0c0', style: { width: '100%' }, onPress: () => navigation.navigate(config_1.config.THREAD_MESSEGE_PATH, {
-                    channelId: channelId,
-                    title: 'Message',
-                    postParentId: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage._id,
-                    isPostParentIdThread: true,
-                }) },
+                    } })))) : (react_1.default.createElement(react_native_1.TouchableHighlight, { underlayColor: '#c0c0c0', style: { width: '100%' }, onPress: () => {
+                    if (currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.isShowThreadMessage)
+                        navigation.navigate(config_1.config.THREAD_MESSEGE_PATH, {
+                            channelId: channelId,
+                            title: 'Message',
+                            postParentId: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage._id,
+                            isPostParentIdThread: true,
+                        });
+                } },
                 react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(react_native_gifted_chat_1.MessageText, Object.assign({}, props, { textStyle: { left: { marginLeft: 5 } } })),
                     ((_6 = (_5 = currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.replies) === null || _5 === void 0 ? void 0 : _5.data) === null || _6 === void 0 ? void 0 : _6.length) > 0 && (react_1.default.createElement(native_base_1.HStack, { space: 1, px: 1, alignItems: 'center' },
@@ -2186,12 +2190,15 @@ const ConversationViewComponent = (_a) => {
                         react_1.default.createElement(native_base_1.Text, { fontSize: 12, fontWeight: 'bold', color: 'gray.500' }, lastReply ? createdAtText(lastReply === null || lastReply === void 0 ? void 0 : lastReply.createdAt) : ''))))))));
         }
         else {
-            return (react_1.default.createElement(react_native_1.TouchableHighlight, { underlayColor: '#c0c0c0', style: { width: '100%' }, onPress: () => navigation.navigate(config_1.config.THREAD_MESSEGE_PATH, {
-                    channelId: channelId,
-                    title: 'Message',
-                    postParentId: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage._id,
-                    isPostParentIdThread: true,
-                }) },
+            return (react_1.default.createElement(react_native_1.TouchableHighlight, { underlayColor: '#c0c0c0', style: { width: '100%' }, onPress: () => {
+                    if (currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.isShowThreadMessage)
+                        navigation.navigate(config_1.config.THREAD_MESSEGE_PATH, {
+                            channelId: channelId,
+                            title: 'Message',
+                            postParentId: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage._id,
+                            isPostParentIdThread: true,
+                        });
+                } },
                 react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(react_native_gifted_chat_1.MessageText, Object.assign({}, props, { textStyle: { left: { marginLeft: 5 } } })),
                     ((_15 = (_14 = currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.replies) === null || _14 === void 0 ? void 0 : _14.data) === null || _15 === void 0 ? void 0 : _15.length) > 0 && (react_1.default.createElement(native_base_1.HStack, { space: 1, px: 1, alignItems: 'center' },
@@ -2501,11 +2508,13 @@ const DialogsComponent = (props) => {
         }
     }, []);
     const handleRefresh = (0, react_1.useCallback)(() => {
+        var _a;
         //if(userChannels?.channelsByUser?.length != channels?.length)setRefresh(true);
-        getChannelsRefetch({ role: channelRole, criteria: channelFilters });
+        setRefresh(true);
+        (_a = getChannelsRefetch({ role: channelRole, criteria: channelFilters })) === null || _a === void 0 ? void 0 : _a.finally(() => setRefresh(false));
     }, []);
     return (react_1.default.createElement(native_base_1.Box, { p: 2, pt: (props === null || props === void 0 ? void 0 : props.supportServices) ? 0 : 2 },
-        react_1.default.createElement(native_base_1.FlatList, { data: channels && (channels === null || channels === void 0 ? void 0 : channels.length) > 0 ? channels : [], onRefresh: handleRefresh, refreshing: userChannelsLoading, contentContainerStyle: { minHeight: '100%' }, ItemSeparatorComponent: () => react_1.default.createElement(native_base_1.Box, { height: "0.5", backgroundColor: "gray.200" }), renderItem: ({ item: channel }) => (react_1.default.createElement(DialogsListItem_1.DialogsListItem, { onOpen: handleSelectChannel, currentUser: auth, channel: channel, selectedChannelId: params === null || params === void 0 ? void 0 : params.channelId })), ListEmptyComponent: () => (react_1.default.createElement(react_1.default.Fragment, null, userChannelsLoading ? (react_1.default.createElement(native_base_1.Spinner, null)) : (react_1.default.createElement(native_base_1.Box, { p: 5 },
+        react_1.default.createElement(native_base_1.FlatList, { data: channels && (channels === null || channels === void 0 ? void 0 : channels.length) > 0 ? channels : [], onRefresh: handleRefresh, refreshing: refreshing, contentContainerStyle: { minHeight: '100%' }, ItemSeparatorComponent: () => react_1.default.createElement(native_base_1.Box, { height: "0.5", backgroundColor: "gray.200" }), renderItem: ({ item: channel }) => (react_1.default.createElement(DialogsListItem_1.DialogsListItem, { onOpen: handleSelectChannel, currentUser: auth, channel: channel, selectedChannelId: params === null || params === void 0 ? void 0 : params.channelId })), ListEmptyComponent: () => (react_1.default.createElement(react_1.default.Fragment, null, userChannelsLoading ? (react_1.default.createElement(native_base_1.Spinner, null)) : (react_1.default.createElement(native_base_1.Box, { p: 5 },
                 react_1.default.createElement(native_base_1.Heading, null, "Chat"),
                 react_1.default.createElement(native_base_1.Input, { height: 50, mt: 3, placeholder: "Search", borderRadius: 50, borderColor: 'gray.200', borderWidth: 2 }),
                 react_1.default.createElement(native_base_1.Center, { mt: 6 },
@@ -2620,7 +2629,7 @@ const SupportServiceDialogsComponent = (props) => {
         (_a = getServiceChannelsRefetch({ criteria: { type: 'SERVICE' } })) === null || _a === void 0 ? void 0 : _a.then((res) => setRefresh(false));
     }, []);
     return (react_1.default.createElement(native_base_1.Box, { p: 2, pb: 0 },
-        react_1.default.createElement(native_base_1.FlatList, { data: channels && (channels === null || channels === void 0 ? void 0 : channels.length) > 0 ? channels : [], onRefresh: handleRefresh, refreshing: serviceChannelsLoading, contentContainerStyle: {}, ItemSeparatorComponent: () => react_1.default.createElement(native_base_1.Box, { height: "0.5", backgroundColor: "gray.200" }), renderItem: ({ item: channel }) => (react_1.default.createElement(SupportServiceDialogsListItem_1.SupportServiceDialogsListItem, { onOpen: handleSelectChannel, currentUser: auth, channel: channel, refreshing: refreshing, selectedChannelId: params === null || params === void 0 ? void 0 : params.channelId, role: channelRole })), keyExtractor: (item, index) => 'support-service-key' + index })));
+        react_1.default.createElement(native_base_1.FlatList, { data: channels && (channels === null || channels === void 0 ? void 0 : channels.length) > 0 ? channels : [], onRefresh: handleRefresh, refreshing: refreshing, contentContainerStyle: {}, ItemSeparatorComponent: () => react_1.default.createElement(native_base_1.Box, { height: "0.5", backgroundColor: "gray.200" }), renderItem: ({ item: channel }) => (react_1.default.createElement(SupportServiceDialogsListItem_1.SupportServiceDialogsListItem, { onOpen: handleSelectChannel, currentUser: auth, channel: channel, refreshing: refreshing, selectedChannelId: params === null || params === void 0 ? void 0 : params.channelId, role: channelRole })), keyExtractor: (item, index) => 'support-service-key' + index })));
 };
 exports.SupportServiceDialogs = react_1.default.memo(SupportServiceDialogsComponent);