fix: correct router logic #2342
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
affine-toeverythingBundle maindiff ------------------- Bundle Size Diff -------------------------
@@ EntryPoint: main @@
## master …5/0511-router +/- ##
===================================================================
< Bundle 3.11 MB 3.18 MB +65.7 kB(+2.11%)
< Initial JS 1.86 MB 1.88 MB +19.2 kB(+1.03%)
< Initial CSS 16.8 kB 33.9 kB +17.2 kB(+102.45%)
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
< Assets 41 48 +7
< Chunks 39 42 +3
< Packages 132 138 +6
= Duplicates 3 3
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Warnings ~~~~~~~~~~~~~~~~~~~~~~~~~~~#
! Separate mixed content assets files
! Avoid cache wasting
@@ EntryPoint: pages/_app @@
## master …5/0511-router +/- ##
===================================================================
< Bundle 3 MB 3.05 MB +56.3 kB(+1.88%)
< Initial JS 1.75 MB 1.76 MB +9.8 kB(+0.56%)
< Initial CSS 16.8 kB 33.9 kB +17.2 kB(+102.45%)
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
< Assets 39 46 +7
< Chunks 37 40 +3
< Packages 132 138 +6
= Duplicates 3 3
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Warnings ~~~~~~~~~~~~~~~~~~~~~~~~~~~#
! Separate mixed content assets files
! Avoid cache wasting
@@ EntryPoint: pages/_error @@
## master …5/0511-router +/- ##
===================================================================
= Bundle 16.6 kB 16.6 kB
= Initial JS 16.6 kB 16.6 kB
= Initial CSS 0 B 0 B
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
= Assets 2 2
= Chunks 2 2
= Packages 5 5
= Duplicates 0 0
...and more |
Deploying with
|
| Latest commit: |
2dda82a
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://959921f6.affine.pages.dev |
| Branch Preview URL: | https://himself65-0511-router.affine.pages.dev |
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #2342 +/- ##
==========================================
+ Coverage 72.60% 72.61% +0.01%
==========================================
Files 333 328 -5
Lines 7252 7182 -70
Branches 1145 1126 -19
==========================================
- Hits 5265 5215 -50
+ Misses 1778 1766 -12
+ Partials 209 201 -8
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
himself65
commented
May 12, 2023
| @@ -0,0 +1,139 @@ | |||
| /** | |||
There was a problem hiding this comment.
I moved this test into a new file because I found that next-router-mock has some corner case which might not isolate with other test case
himself65
commented
May 12, 2023
| rootCurrentPageIdAtom.onMount = set => { | ||
| if (typeof window !== 'undefined') { | ||
| const callback = (url: string) => { | ||
| const value = url.split('/')[3]; |
There was a problem hiding this comment.
hard code here, but it's ok because we don't have other use cases
himself65
commented
May 12, 2023
| useEffect(() => { | ||
| const id = setTimeout(() => { | ||
| if (!exist) { | ||
| void push('/'); |
There was a problem hiding this comment.
This avoids entering a nonexisting workspace. we will fallback to the index page
pengx17
reviewed
May 12, 2023
| @@ -152,7 +152,7 @@ export function Modals() { | |||
| setOpenCreateWorkspaceModal(false); | |||
| setOpenWorkspacesModal(false); | |||
| setCurrentWorkspace(id); | |||
| return jumpToSubPath(id, WorkspaceSubPath.SETTING); | |||
| return jumpToSubPath(id, WorkspaceSubPath.ALL); | |||
There was a problem hiding this comment.
I think this is a requirement for creating new workspace that we will redirect to the settings pages after creation.
himself65
added a commit
that referenced
this pull request
May 12, 2023
Brooooooklyn
pushed a commit
that referenced
this pull request
May 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now, we only listen to the
routeChangeStartand don't case other things.