Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
a90acdab
Unverified
Commit
a90acdab
authored
Nov 13, 2022
by
Stephen Zhou
Committed by
GitHub
Nov 13, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: route confusion entering from non-home page (#460)
Co-authored-by:
boojack
<
stevenlgtm@gmail.com
>
parent
407d1cdc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
locationService.ts
web/src/services/locationService.ts
+4
-1
location.ts
web/src/store/modules/location.ts
+8
-1
No files found.
web/src/services/locationService.ts
View file @
a90acdab
import
{
stringify
}
from
"qs"
;
import
store
from
"../store"
;
import
{
setQuery
,
setPathname
,
Query
,
updateStateWithLocation
}
from
"../store/modules/location"
;
import
{
setQuery
,
setPathname
,
Query
,
updateStateWithLocation
,
updatePathnameStateWithLocation
}
from
"../store/modules/location"
;
const
updateLocationUrl
=
(
method
:
"replace"
|
"push"
=
"replace"
)
=>
{
// avoid pathname confusion when entering from non-home page
store
.
dispatch
(
updatePathnameStateWithLocation
());
const
{
query
,
pathname
,
hash
}
=
store
.
getState
().
location
;
let
queryString
=
stringify
(
query
);
if
(
queryString
)
{
...
...
web/src/store/modules/location.ts
View file @
a90acdab
...
...
@@ -64,6 +64,13 @@ const locationSlice = createSlice({
updateStateWithLocation
:
()
=>
{
return
getStateFromLocation
();
},
updatePathnameStateWithLocation
:
(
state
)
=>
{
const
{
pathname
}
=
window
.
location
;
return
{
...
state
,
pathname
:
getValidPathname
(
pathname
),
};
},
setPathname
:
(
state
,
action
:
PayloadAction
<
string
>
)
=>
{
if
(
state
.
pathname
===
action
.
payload
)
{
return
state
;
...
...
@@ -90,6 +97,6 @@ const locationSlice = createSlice({
},
});
export
const
{
setPathname
,
setQuery
,
updateStateWithLocation
}
=
locationSlice
.
actions
;
export
const
{
setPathname
,
setQuery
,
updateStateWithLocation
,
updatePathnameStateWithLocation
}
=
locationSlice
.
actions
;
export
default
locationSlice
.
reducer
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment