diff --git a/src/ui/parcellationRegion/regionSimple/regionSimple.template.html b/src/ui/parcellationRegion/regionSimple/regionSimple.template.html index b724ab6f27d2ece74413959934d913d7b48888f5..7a8ce3161f2f78846774ca4f0da7f870bc458562 100644 --- a/src/ui/parcellationRegion/regionSimple/regionSimple.template.html +++ b/src/ui/parcellationRegion/regionSimple/regionSimple.template.html @@ -1,7 +1,7 @@ <div class="d-flex flex-row"> <small class="text-truncate flex-shrink-1 flex-grow-1"> - {{ region.name }} + {{ region.name }}<span *ngIf="region.status" class="text-muted">{{' (' + region.status + ')'}}</span> </small> <div class="flex-grow-0 flex-shrink-0 d-flex flex-row"> diff --git a/src/ui/viewerStateController/regionSearch/regionSearch.component.ts b/src/ui/viewerStateController/regionSearch/regionSearch.component.ts index b397abcf5f4fe9541c385bbb2ce757ac0a0c19b0..c5989bbb4f29ac46ba5ce1d05fc87974f95c95da 100644 --- a/src/ui/viewerStateController/regionSearch/regionSearch.component.ts +++ b/src/ui/viewerStateController/regionSearch/regionSearch.component.ts @@ -13,10 +13,10 @@ import { PureContantService } from "src/util"; import { viewerStateToggleRegionSelect, viewerStateNavigateToRegion, viewerStateSetSelectedRegions, viewerStateSetSelectedRegionsWithIds } from "src/services/state/viewerState.store.helper"; import { ARIA_LABELS, CONST } from 'common/constants' -const filterRegionBasedOnText = searchTerm => region => region.name.toLowerCase().includes(searchTerm.toLowerCase()) +const filterRegionBasedOnText = searchTerm => region => `${region.name.toLowerCase()}${region.status? ' (' + region.status + ')' : null}`.includes(searchTerm.toLowerCase()) || (region.relatedAreas && region.relatedAreas.some(relatedArea => relatedArea.name && relatedArea.name.toLowerCase().includes(searchTerm.toLowerCase()))) -const compareFn = (it, item) => it.name === item.name +const compareFn = (it, item) => it.name === item.name && it.status === item.status @Component({ selector: 'region-text-search-autocomplete',