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

chore: remove logging

bugfix: fix simple origin info
parent 05fd65f9
No related branches found
No related tags found
No related merge requests found
...@@ -21,14 +21,8 @@ const validVolumeType = new Set([ ...@@ -21,14 +21,8 @@ const validVolumeType = new Set([
]) ])
function getNgId(atlasId: string, tmplId: string, parcId: string, regionKey: string){ function getNgId(atlasId: string, tmplId: string, parcId: string, regionKey: string){
// console.log(
// 'getNgId',
// ...arguments
// )
const proxyId = MultiDimMap.GetProxyKeyMatch(atlasId, tmplId, parcId, regionKey) const proxyId = MultiDimMap.GetProxyKeyMatch(atlasId, tmplId, parcId, regionKey)
if (proxyId) { if (proxyId) return proxyId
console.log('proxyid', proxyId)
return proxyId}
return '_' + MultiDimMap.GetKey(atlasId, tmplId, parcId, regionKey) return '_' + MultiDimMap.GetKey(atlasId, tmplId, parcId, regionKey)
} }
...@@ -517,7 +511,6 @@ Raise/track issues at github repo: <a target = "_blank" href = "${this.repoUrl}" ...@@ -517,7 +511,6 @@ Raise/track issues at github repo: <a target = "_blank" href = "${this.repoUrl}"
return return
} }
const hemispheredNgId = getNgId(atlas['@id'], tmpl.id, parc.id, hemisphereKey) const hemispheredNgId = getNgId(atlas['@id'], tmpl.id, parc.id, hemisphereKey)
console.log('ngId', hemispheredNgId)
region['ngId'] = hemispheredNgId region['ngId'] = hemispheredNgId
} }
} }
......
...@@ -44,19 +44,24 @@ export type TVolumeSrc<VolumeType extends keyof IVolumeTypeDetail> = { ...@@ -44,19 +44,24 @@ export type TVolumeSrc<VolumeType extends keyof IVolumeTypeDetail> = {
map_type: string map_type: string
} }
type TSimpleInfo = { export type TSimpleInfo = {
"@type": 'fzj/tmp/simpleOriginInfo/v0.0.1' "@type": 'fzj/tmp/simpleOriginInfo/v0.0.1'
name: string name: string
description: string description: string
} }
type TDatasetSpec = TVolumeSrc<keyof IVolumeTypeDetail> | TSimpleInfo
type TKgIdentifier = { type TKgIdentifier = {
kgSchema: string kgSchema: string
kgId: string kgId: string
} }
export type TKgInfo = {
'@type': 'minds/core/dataset/v1.0.0'
} & TKgIdentifier
type TDatasetSpec = TVolumeSrc<keyof IVolumeTypeDetail> | TSimpleInfo | TKgInfo
type TVersion = { type TVersion = {
name: string name: string
prev: string | null prev: string | null
......
...@@ -7,7 +7,7 @@ import { distinctUntilChanged, map } from "rxjs/operators"; ...@@ -7,7 +7,7 @@ import { distinctUntilChanged, map } from "rxjs/operators";
import { viewerStateHelperSelectParcellationWithId, viewerStateRemoveAdditionalLayer, viewerStateSetSelectedRegions } from "src/services/state/viewerState.store.helper"; import { viewerStateHelperSelectParcellationWithId, viewerStateRemoveAdditionalLayer, viewerStateSetSelectedRegions } from "src/services/state/viewerState.store.helper";
import { ngViewerActionClearView, ngViewerSelectorClearViewEntries } from "src/services/state/ngViewerState.store.helper"; import { ngViewerActionClearView, ngViewerSelectorClearViewEntries } from "src/services/state/ngViewerState.store.helper";
import { OVERWRITE_SHOW_DATASET_DIALOG_TOKEN } from "src/util/interfaces"; 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({ @Component({
selector: 'viewer-state-breadcrumb', selector: 'viewer-state-breadcrumb',
...@@ -120,10 +120,17 @@ export class ViewerStateBreadCrumb { ...@@ -120,10 +120,17 @@ export class ViewerStateBreadCrumb {
}) })
export class OriginalDatainfoPipe implements PipeTransform{ export class OriginalDatainfoPipe implements PipeTransform{
public transform(originalDatainfo: TDatainfos[]): TDatainfos[]{ public transform(arr: TDatainfos[]): TDatainfos[]{
if (originalDatainfo.some(info => info.urls.length > 0)) { if (arr.length > 0) {
return originalDatainfo.filter(info => info.urls.length > 0) return arr.map(d => {
return {
name: d.name,
description: d.name,
urls: [],
useClassicUi: false
}
})
} }
return originalDatainfo.slice(0,1) return []
} }
} }
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</span> </span>
<!-- info icon --> <!-- info icon -->
<ng-container *ngFor="let originDatainfo of ((parcel?.originDatainfos || []) | originalDatainfoPriorityPipe)"> <ng-container *ngFor="let originDatainfo of (parcel.originDatainfos | originalDatainfoPriorityPipe)">
<mat-icon <mat-icon
fontSet="fas" fontSet="fas"
......
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