Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
siibra-explorer
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiao Gui
siibra-explorer
Commits
cab21489
Commit
cab21489
authored
4 years ago
by
Xiao Gui
Browse files
Options
Downloads
Patches
Plain Diff
bugfix: history bk error
parent
14c6f93d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/atlasViewer/atlasViewer.history.service.ts
+5
-1
5 additions, 1 deletion
src/atlasViewer/atlasViewer.history.service.ts
src/services/state/viewerState/selectors.ts
+15
-9
15 additions, 9 deletions
src/services/state/viewerState/selectors.ts
with
20 additions
and
10 deletions
src/atlasViewer/atlasViewer.history.service.ts
+
5
−
1
View file @
cab21489
...
...
@@ -40,7 +40,7 @@ export class AtlasViewerHistoryUseEffect implements OnDestroy {
)),
).
pipe
(
withLatestFrom
(
this
.
store$
),
map
(([
searchUrl
,
storeState
]:
[
string
,
IavRootStoreInterface
]
)
=>
{
map
(([
searchUrl
,
storeState
]:
[
string
,
any
]
)
=>
{
const
search
=
new
URLSearchParams
(
searchUrl
)
try
{
if
(
Array
.
from
(
search
.
keys
()).
length
===
0
)
{
...
...
@@ -75,6 +75,10 @@ export class AtlasViewerHistoryUseEffect implements OnDestroy {
...
defaultRootState
.
viewerState
,
fetchedTemplates
:
storeState
.
viewerState
.
fetchedTemplates
,
},
viewerStateHelper
:
{
...
defaultRootState
.
viewerStateHelper
,
fetchedAtlases
:
storeState
.
viewerStateHelper
.
fetchedAtlases
}
},
}
}
...
...
This diff is collapsed.
Click to expand it.
src/services/state/viewerState/selectors.ts
+
15
−
9
View file @
cab21489
...
...
@@ -40,6 +40,7 @@ export const viewerStateSelectedTemplatePureSelector = createSelector(
viewerStateFetchedTemplatesSelector
,
viewerStateSelectedTemplateSelector
,
(
fetchedTemplates
,
selectedTemplate
)
=>
{
if
(
!
selectedTemplate
)
return
null
return
fetchedTemplates
.
find
(
t
=>
t
[
'
@id
'
]
===
selectedTemplate
[
'
@id
'
])
}
)
...
...
@@ -104,6 +105,7 @@ export const viewerStateGetSelectedAtlas = createSelector(
helperState
=>
{
if
(
!
helperState
)
return
null
const
{
selectedAtlasId
,
fetchedAtlases
}
=
helperState
if
(
!
selectedAtlasId
)
return
null
return
selectedAtlasId
&&
fetchedAtlases
.
find
(
a
=>
a
[
'
@id
'
]
===
selectedAtlasId
)
}
)
...
...
@@ -132,7 +134,7 @@ export const viewerStateAtlasParcellationSelector = createSelector(
export
const
viewerStateAtlasLatestParcellationSelector
=
createSelector
(
viewerStateAtlasParcellationSelector
,
parcs
=>
parcs
.
filter
(
p
=>
!
p
[
'
@version
'
]
||
!
p
[
'
@version
'
][
'
@next
'
])
parcs
=>
(
parcs
&&
parcs
.
filter
(
p
=>
!
p
[
'
@version
'
]
||
!
p
[
'
@version
'
][
'
@next
'
])
||
[])
)
export
const
viewerStateParcVersionSelector
=
createSelector
(
...
...
@@ -178,12 +180,16 @@ export const viewerStateParcVersionSelector = createSelector(
export
const
viewerStateSelectedTemplateFullInfoSelector
=
createSelector
(
viewerStateGetSelectedAtlas
,
viewerStateFetchedTemplatesSelector
,
({
templateSpaces
},
fetchedTemplates
)
=>
templateSpaces
.
map
(
templateSpace
=>
{
const
fullTemplateInfo
=
fetchedTemplates
.
find
(
t
=>
t
[
'
@id
'
]
===
templateSpace
[
'
@id
'
])
return
{
...
templateSpace
,
...(
fullTemplateInfo
||
{}),
darktheme
:
(
fullTemplateInfo
||
{}).
useTheme
===
'
dark
'
}
})
(
selectedAtlas
,
fetchedTemplates
)
=>
{
if
(
!
selectedAtlas
)
return
null
const
{
templateSpaces
}
=
selectedAtlas
return
templateSpaces
.
map
(
templateSpace
=>
{
const
fullTemplateInfo
=
fetchedTemplates
.
find
(
t
=>
t
[
'
@id
'
]
===
templateSpace
[
'
@id
'
])
return
{
...
templateSpace
,
...(
fullTemplateInfo
||
{}),
darktheme
:
(
fullTemplateInfo
||
{}).
useTheme
===
'
dark
'
}
})
}
)
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment