Skip to content
Snippets Groups Projects
Unverified Commit 05511857 authored by xgui3783's avatar xgui3783 Committed by GitHub
Browse files

bugfix: pipe when dataentry undefined (#600)

bugfix: spatial data undefined
ui: region placeholder
fix regression: conn browser
parent bd659ef3
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@ export class DatasetIsFavedPipe implements PipeTransform {
if (!dataentry) { return false }
const re2 = getKgSchemaIdFromFullId(dataentry.fullId)
if (!re2) return false
return favedDataEntry.findIndex(ds => {
return favedDataEntry?.findIndex(ds => {
const re1 = getKgSchemaIdFromFullId(ds.fullId)
if (!re1) return false
return re1[1] === re2[1]
......
......@@ -306,6 +306,8 @@ export class NehubaContainer implements OnInit, OnChanges, OnDestroy {
select('dataStore'),
select('fetchedSpatialData'),
distinctUntilChanged(compareLandmarksChanged),
filter(v => !!v),
startWith([]),
debounceTime(300),
)
......
......@@ -157,7 +157,7 @@ div#scratch-pad
.placeholder-region-detail
{
margin-top: 6rem;
padding: 6rem 1rem 1rem 1rem;
}
.explore-btn
......
......@@ -45,7 +45,7 @@
[hasBackdrop]="false">
<!-- sidenav-content -->
<mat-drawer class="box-shadow-none pe-none bg-none col-10 col-sm-10 col-md-5 col-lg-4 col-xl-3 col-xxl-2"
<mat-drawer class="box-shadow-none border-0 pe-none bg-none col-10 col-sm-10 col-md-5 col-lg-4 col-xl-3 col-xxl-2"
mode="side"
[opened]="sideNavMasterSwitch.switchState"
[autoFocus]="false"
......@@ -317,7 +317,7 @@
<!-- single region template -->
<ng-template #singleRegionTmpl let-region="region">
<ng-template #regionDetailTmpl>
<div class="placeholder-region-detail mat-elevation-z4">
<div class="placeholder-region-detail side-nav-cover mat-elevation-z4">
<span class="text-muted">
Select a region by clicking on the viewer or search from above
</span>
......@@ -378,28 +378,17 @@
</mat-card>
<mat-card class="mt-3 overflow-hidden mat-elevation-z4 side-nav-cover feature-card d-flex flex-column">
<mat-card-subtitle class="flex-grow-0 flex-shrink-0 font-weight-bold">
<mat-card *ngIf="selectedParcellation && selectedParcellation.hasAdditionalViewMode
&& selectedParcellation.hasAdditionalViewMode.includes('connectivity') && selectedRegions?.length" class="mt-2 side-nav-cover d-flex flex-column">
<mat-card-subtitle class="flex-grow-0 flex-shrink-0">
Connectivity
</mat-card-subtitle>
<mat-card-content class="flex-grow-1 flex-shrink-1 w-100 feature-card">
<mat-card-content class="flex-grow-1 flex-shrink-1 w-100">
<!-- add connectivity component -->
<ng-container *ngIf="region; else cnctvtyPlaceholderTmpl">
<hbp-connectivity-matrix-row
[region]="region.name"
theme="dark"
show-export="true"
show-source="true"
show-title="false"
show-toolbar="false"
show-description="false"
show-dataset-name="false"
custom-dataset-selector="true"
loadurl="https://connectivityquery-connectivity.apps-dev.hbp.eu/connectivity"
dataset-url="https://connectivityquery-connectivity.apps-dev.hbp.eu/studies">
</hbp-connectivity-matrix-row>
<connectivity-browser class="pe-all flex-grow-5 flex-shrink-1">
</connectivity-browser>
</ng-container>
<ng-template #cnctvtyPlaceholderTmpl>
......@@ -407,6 +396,7 @@
</ng-template>
</mat-card-content>
</mat-card>
</ng-template>
<div id="scratch-pad">
......
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