Skip to content
Snippets Groups Projects
Unverified Commit 058c8b54 authored by Xiao Gui's avatar Xiao Gui
Browse files

chore: remove unused actions

minor refactor: connectivity filter logic
parent f968b704
No related branches found
No related tags found
No related merge requests found
import { Pipe, PipeTransform } from "@angular/core"
import { Input } from "postcss"
import { PathReturn } from "src/atlasComponents/sapi/typeV3"
import { KeyValue } from "@angular/common"
type DS = KeyValue<string, PathReturn<"/feature/_types">["items"]>
@Pipe({
name: 'isConnectivity',
......@@ -7,9 +10,7 @@ import { Input } from "postcss"
})
export class ExcludeConnectivityPipe implements PipeTransform {
public transform(datasets: any[], isConnectivity: boolean): any[] {
return datasets? isConnectivity? [datasets.find(d => d.key === 'connectivity')]
: datasets.filter(d => d.key !== 'connectivity')
: null
public transform(datasets: DS[], filterForConnectivityFlag: boolean): DS[] {
return (datasets || []).filter(d => (d.key === 'connectivity') === filterForConnectivityFlag)
}
}
......@@ -61,24 +61,30 @@
</div>
</mat-expansion-panel>
<mat-expansion-panel sxplr-sapiviews-features-connectivity-check
#connectivityAccordion
*ngIf="(cateogryCollections$ | async | keyvalue | isConnectivity : true) as connectivity">
<mat-expansion-panel-header>
<mat-panel-title>
{{ connectivity[0].key }}
</mat-panel-title>
</mat-expansion-panel-header>
<sxplr-features-connectivity-browser class="pe-all flex-shrink-1"
[region]="region"
[sxplr-features-connectivity-browser-atlas]="atlas | async"
[sxplr-features-connectivity-browser-template]="template"
[sxplr-features-connectivity-browser-parcellation]="parcellation"
[accordionExpanded]="connectivityAccordion.expanded"
[types]="connectivity[0].value">
</sxplr-features-connectivity-browser>
<ng-template [ngIf]="cateogryCollections$ | async | keyvalue | isConnectivity : true" let-connectivity>
<ng-template ngFor [ngForOf]="connectivity" let-conn>
<mat-expansion-panel sxplr-sapiviews-features-connectivity-check
#connectivityAccordion
*ngIf="conn">
<mat-expansion-panel-header>
<mat-panel-title>
{{ conn.key }}
</mat-panel-title>
</mat-expansion-panel-header>
<sxplr-features-connectivity-browser class="pe-all flex-shrink-1"
[region]="region"
[sxplr-features-connectivity-browser-atlas]="atlas | async"
[sxplr-features-connectivity-browser-template]="template"
[sxplr-features-connectivity-browser-parcellation]="parcellation"
[accordionExpanded]="connectivityAccordion.expanded"
[types]="conn.value">
</sxplr-features-connectivity-browser>
</mat-expansion-panel>
</ng-template>
</ng-template>
</mat-expansion-panel>
</mat-accordion>
......@@ -154,13 +154,6 @@ export const clearViewerMode = createAction(
`${nameSpace} clearViewerMode`,
)
export const toggleRegionSelect = createAction(
`${nameSpace} toggleRegionSelect`,
props<{
region: SxplrRegion
}>()
)
export const toggleRegionSelectById = createAction(
`${nameSpace} toggleRegionSelectById`,
props<{
......
......@@ -363,24 +363,6 @@ export class Effect {
)
))
onRegionToggleSelect = createEffect(() => this.action.pipe(
ofType(actions.toggleRegionSelect),
withLatestFrom(
this.store.pipe(
select(selectors.selectedRegions)
)
),
map(([ { region }, regions ]) => {
const selectedRegionsIndicies = regions.map(r => r["@id"])
const roiIndex = selectedRegionsIndicies.indexOf(region["@id"])
return actions.setSelectedRegions({
regions: roiIndex >= 0
? [...regions.slice(0, roiIndex), ...regions.slice(roiIndex + 1)]
: [...regions, region]
})
})
))
constructor(
private action: Actions,
private sapiSvc: SAPI,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment