From c734656f8ed234ce9a88625d06158c2a8c0c9b65 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Tue, 5 Oct 2021 18:52:10 +0200
Subject: [PATCH] chore: remove logging bugfix: fix simple origin info
---
src/util/pureConstant.service.ts | 9 +--------
src/util/siibraApiConstants/types.ts | 9 +++++++--
.../breadcrumb/breadcrumb.component.ts | 17 ++++++++++++-----
.../breadcrumb/breadcrumb.template.html | 2 +-
4 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/util/pureConstant.service.ts b/src/util/pureConstant.service.ts
index 11eb07b2c..16258cba4 100644
--- a/src/util/pureConstant.service.ts
+++ b/src/util/pureConstant.service.ts
@@ -21,14 +21,8 @@ const validVolumeType = new Set([
])
function getNgId(atlasId: string, tmplId: string, parcId: string, regionKey: string){
- // console.log(
- // 'getNgId',
- // ...arguments
- // )
const proxyId = MultiDimMap.GetProxyKeyMatch(atlasId, tmplId, parcId, regionKey)
- if (proxyId) {
- console.log('proxyid', proxyId)
- return proxyId}
+ if (proxyId) return proxyId
return '_' + MultiDimMap.GetKey(atlasId, tmplId, parcId, regionKey)
}
@@ -517,7 +511,6 @@ Raise/track issues at github repo: <a target = "_blank" href = "${this.repoUrl}"
return
}
const hemispheredNgId = getNgId(atlas['@id'], tmpl.id, parc.id, hemisphereKey)
- console.log('ngId', hemispheredNgId)
region['ngId'] = hemispheredNgId
}
}
diff --git a/src/util/siibraApiConstants/types.ts b/src/util/siibraApiConstants/types.ts
index 87c27fac3..677827288 100644
--- a/src/util/siibraApiConstants/types.ts
+++ b/src/util/siibraApiConstants/types.ts
@@ -44,19 +44,24 @@ export type TVolumeSrc<VolumeType extends keyof IVolumeTypeDetail> = {
map_type: string
}
-type TSimpleInfo = {
+export type TSimpleInfo = {
"@type": 'fzj/tmp/simpleOriginInfo/v0.0.1'
name: string
description: string
}
-type TDatasetSpec = TVolumeSrc<keyof IVolumeTypeDetail> | TSimpleInfo
type TKgIdentifier = {
kgSchema: string
kgId: string
}
+export type TKgInfo = {
+ '@type': 'minds/core/dataset/v1.0.0'
+} & TKgIdentifier
+
+type TDatasetSpec = TVolumeSrc<keyof IVolumeTypeDetail> | TSimpleInfo | TKgInfo
+
type TVersion = {
name: string
prev: string | null
diff --git a/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.component.ts b/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.component.ts
index 66ca3b4e1..a57a22a76 100644
--- a/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.component.ts
+++ b/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.component.ts
@@ -7,7 +7,7 @@ import { distinctUntilChanged, map } from "rxjs/operators";
import { viewerStateHelperSelectParcellationWithId, viewerStateRemoveAdditionalLayer, viewerStateSetSelectedRegions } from "src/services/state/viewerState.store.helper";
import { ngViewerActionClearView, ngViewerSelectorClearViewEntries } from "src/services/state/ngViewerState.store.helper";
import { OVERWRITE_SHOW_DATASET_DIALOG_TOKEN } from "src/util/interfaces";
-import { TDatainfos } from "src/util/siibraApiConstants/types";
+import { TDatainfos, TParc, TSimpleInfo } from "src/util/siibraApiConstants/types";
@Component({
selector: 'viewer-state-breadcrumb',
@@ -120,10 +120,17 @@ export class ViewerStateBreadCrumb {
})
export class OriginalDatainfoPipe implements PipeTransform{
- public transform(originalDatainfo: TDatainfos[]): TDatainfos[]{
- if (originalDatainfo.some(info => info.urls.length > 0)) {
- return originalDatainfo.filter(info => info.urls.length > 0)
+ public transform(arr: TDatainfos[]): TDatainfos[]{
+ if (arr.length > 0) {
+ return arr.map(d => {
+ return {
+ name: d.name,
+ description: d.name,
+ urls: [],
+ useClassicUi: false
+ }
+ })
}
- return originalDatainfo.slice(0,1)
+ return []
}
}
diff --git a/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.template.html b/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.template.html
index 65f26e75a..a80037b10 100644
--- a/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.template.html
+++ b/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.template.html
@@ -181,7 +181,7 @@
</span>
<!-- info icon -->
- <ng-container *ngFor="let originDatainfo of ((parcel?.originDatainfos || []) | originalDatainfoPriorityPipe)">
+ <ng-container *ngFor="let originDatainfo of (parcel.originDatainfos | originalDatainfoPriorityPipe)">
<mat-icon
fontSet="fas"
--
GitLab