Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

[Spaces] Context switching #5795

Merged
t3chguy merged 18 commits into from
Apr 20, 2021
Merged

[Spaces] Context switching #5795

t3chguy merged 18 commits into from
Apr 20, 2021

Conversation

@SimonBrandner
Copy link
Contributor

@SimonBrandner SimonBrandner commented Mar 25, 2021 •
edited
Loading

Fixes #16730

Peek 2021-03-26 13-55

SimonBrandner
SimonBrandner commented Mar 25, 2021
View reviewed changes
SimonBrandner
SimonBrandner commented Mar 25, 2021
View reviewed changes
@SimonBrandner
First implementation of context switching
ef3d87f 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner force-pushed the spaces/context-switching branch from 6aa4782 to ef3d87f Compare March 25, 2021 19:44
@SimonBrandner
If no roomId was saved go to space home
67dcb3a 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Move persisting of last viewed into SpaceStore
2dcb60b 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner force-pushed the spaces/context-switching branch from 481c7f3 to 2dcb60b Compare March 26, 2021 06:54
@SimonBrandner
Don't export as we don't need to
e39f7ca 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use this.activeSpace
c26da1b 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Don't save if isSpaceRoom()
efb8c89 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Empty object if nothing saved
7e425ce 
This isn't nice but I'll rework this soon anyway

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Go to /#/home if there is no saved room
65ef2b8 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner force-pushed the spaces/context-switching branch from 7b40ba3 to 65ef2b8 Compare March 26, 2021 07:18
@SimonBrandner
Check if room is defined
f64008e 
Sometimes it isn't and that leads to errors. We can't use ? here because we also use !

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use compound keys
f62e2c0 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Delete comment
a707524 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use else if
d68afcc 
Maybe it looks a little nicer, I don't know

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
SimonBrandner
SimonBrandner commented Mar 26, 2021
View reviewed changes
@SimonBrandner SimonBrandner marked this pull request as ready for review March 26, 2021 13:01
@SimonBrandner SimonBrandner requested a review from t3chguy March 26, 2021 17:58
t3chguy
t3chguy reviewed Apr 20, 2021
View reviewed changes
t3chguy
t3chguy reviewed Apr 20, 2021
View reviewed changes
t3chguy
t3chguy reviewed Apr 20, 2021
View reviewed changes
@SimonBrandner SimonBrandner force-pushed the spaces/context-switching branch from ca3ca02 to 08c0f0a Compare April 20, 2021 10:22
@SimonBrandner
Check if we are joined
f9292c3 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add getLastViewedRoomsStorageKey()
1934c4a 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner requested a review from t3chguy April 20, 2021 10:39
t3chguy
t3chguy reviewed Apr 20, 2021
View reviewed changes
@SimonBrandner
Make getLastViewedRoomsStorageKey() make sense
d4ca087 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
t3chguy
t3chguy reviewed Apr 20, 2021
View reviewed changes
@SimonBrandner @t3chguy
Update src/stores/SpaceStore.tsx
4344ff9 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
t3chguy
t3chguy approved these changes Apr 20, 2021
View reviewed changes
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks for this !

@t3chguy t3chguy merged commit b2e9f67 into matrix-org:develop Apr 20, 2021
@SimonBrandner SimonBrandner deleted the spaces/context-switching branch April 20, 2021 11:43
@tanriol
Copy link

tanriol commented Apr 20, 2021

After the latest update I'm seeing develop.element.io automatically switching from the space I'm trying to enter. Can this room switch cause a space switch to happen after it?

UPD: now my develop.element.io page is stuck switching back and forth between two spaces and rooms without any user input :-)
@SimonBrandner @t3chguy

@tanriol tanriol mentioned this pull request Apr 20, 2021
Closed
@turt2live turt2live mentioned this pull request Apr 21, 2021
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@t3chguy t3chguy t3chguy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Switch to last viewed room from a space upon switching to that space

3 participants

@SimonBrandner @tanriol @t3chguy