Skip to content

[NEW] Direct link to a threaded conversation #3406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 17 commits into from
Oct 26, 2021
Merged

[NEW] Direct link to a threaded conversation #3406

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1b2706e
[FIX] deeplinking to thread
reinaldonetof Sep 28, 2021
2ff8b3a
fix how to find threadId
reinaldonetof Sep 28, 2021
b902058
Merge branch 'develop' into fix.deep-link-thread
reinaldonetof Sep 28, 2021
d070821
tmid as route params jumpToThreaId
reinaldonetof Sep 28, 2021
6206f75
Merge branch 'fix.deep-link-thread' of https://github.com/RocketChat/…
reinaldonetof Sep 28, 2021
d5a6ac3
minor tweak
reinaldonetof Sep 29, 2021
9c348c1
Merge branch 'develop' into fix.deep-link-thread
reinaldonetof Oct 5, 2021
c8b7f04
minor tweak on logic
reinaldonetof Oct 8, 2021
0d40b7d
E2E Test
reinaldonetof Oct 8, 2021
a13eccc
minor tweak
reinaldonetof Oct 8, 2021
2a3e778
wait for the return of the thread
reinaldonetof Oct 8, 2021
aa0d7ec
Minor refactor
diegolmello Oct 14, 2021
2b56a7f
Fix e2e tests for docker
diegolmello Oct 14, 2021
6ef430b
Merge branch 'develop' into fix.deep-link-thread
diegolmello Oct 14, 2021
1c1f273
popToRoot when focused and there is a jumpToThread
reinaldonetof Oct 21, 2021
f4fc8cc
Merge branch 'develop' into fix.deep-link-thread
reinaldonetof Oct 22, 2021
48ac6b3
Merge branch 'develop' into fix.deep-link-thread
diegolmello Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/sagas/deepLinking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ const navigate = function* navigate({ params }) {
if (params.path || params.rid) {
let type;
let name;
let jumpToThreadId;
if (params.path) {
[type, name] = params.path.split('/');
const pathSplitted = params.path.split('/');
type = pathSplitted[0];
name = pathSplitted[1];
// Check if has thread at path from params: channel/general/thread/threadId and expect that threadId is the next param
const threadIdIndexOf = pathSplitted.lastIndexOf('thread') + 1;
Comment thread
reinaldonetof marked this conversation as resolved.
Outdated
jumpToThreadId = threadIdIndexOf > 0 && threadIdIndexOf < pathSplitted.length ? pathSplitted[threadIdIndexOf] : null;
}
if (type !== 'invite' || params.rid) {
const room = yield RocketChat.canOpenRoom(params);
Expand All @@ -65,14 +71,14 @@ const navigate = function* navigate({ params }) {
if (focusedRooms.includes(room.rid)) {
// if there's one room on the list or last room is the one
if (focusedRooms.length === 1 || focusedRooms[0] === room.rid) {
yield goRoom({ item, isMasterDetail, jumpToMessageId });
yield goRoom({ item, isMasterDetail, jumpToMessageId, jumpToThreadId });
} else {
popToRoot({ isMasterDetail });
yield goRoom({ item, isMasterDetail, jumpToMessageId });
yield goRoom({ item, isMasterDetail, jumpToMessageId, jumpToThreadId });
}
} else {
popToRoot({ isMasterDetail });
yield goRoom({ item, isMasterDetail, jumpToMessageId });
yield goRoom({ item, isMasterDetail, jumpToMessageId, jumpToThreadId });
}

if (params.isCall) {
Expand Down
8 changes: 8 additions & 0 deletions app/views/RoomView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ class RoomView extends React.Component {
prid
};
this.jumpToMessageId = props.route.params?.jumpToMessageId;
this.jumpToThreadId = props.route.params?.jumpToThreadId;
const roomUserId = props.route.params?.roomUserId ?? RocketChat.getUidDirectMessage(room);
this.state = {
joined: true,
Expand Down Expand Up @@ -208,6 +209,9 @@ class RoomView extends React.Component {
if (this.jumpToMessageId) {
this.jumpToMessage(this.jumpToMessageId);
}
if (this.jumpToThreadId && !this.jumpToMessageId) {
this.navToThread({ tmid: this.jumpToThreadId });
}
if (isIOS && this.rid) {
this.updateUnreadCount();
}
Expand Down Expand Up @@ -253,6 +257,10 @@ class RoomView extends React.Component {
this.jumpToMessage(route?.params?.jumpToMessageId);
}

if (route?.params?.jumpToThreadId !== prevProps.route?.params?.jumpToThreadId) {
this.navToThread({ tmid: route?.params?.jumpToThreadId });
}

if (appState === 'foreground' && appState !== prevProps.appState && this.rid) {
// Fire List.query() just to keep observables working
if (this.list && this.list.current) {
Expand Down