diff --git a/docs/releases/v2.5.6.md b/docs/releases/v2.5.6.md index bcf4e62bba7707112fd3fcd5e42b63670de75771..0f7305a892ef72c4d1fd6d17d968661e91f82a78 100644 --- a/docs/releases/v2.5.6.md +++ b/docs/releases/v2.5.6.md @@ -2,4 +2,9 @@ ## Feature -- Add menu to change perspective orientation by coronal/sagittal/axial views. \ No newline at end of file +- Add menu to change perspective orientation by coronal/sagittal/axial views. + +## Bugfix + +- re-introduced explore in KG button for parcellation citations + diff --git a/src/util/pureConstant.service.spec.ts b/src/util/pureConstant.service.spec.ts index 46872f83880acd7d0522d26d9b272de5606c7b90..b83f3be9e5d9b64df309b83326c0de687b300445 100644 --- a/src/util/pureConstant.service.spec.ts +++ b/src/util/pureConstant.service.spec.ts @@ -68,7 +68,7 @@ describe('> pureConstant.service.ts', () => { const exp = httpController.expectOne(`${MOCK_BS_ENDPOINT}/atlases`) exp.flush([mockAtlas], { headers: { - [SIIBRA_API_VERSION_HEADER_KEY]: '0.1.5' + [SIIBRA_API_VERSION_HEADER_KEY]: '0.1.7' } }) service.allFetchingReady$.subscribe() diff --git a/src/util/pureConstant.service.ts b/src/util/pureConstant.service.ts index dd4b014cb4d5f7f92803865e621805c35c2700a5..89f449b4d50199f298ce6a617229bde53546d83d 100644 --- a/src/util/pureConstant.service.ts +++ b/src/util/pureConstant.service.ts @@ -17,7 +17,7 @@ import { MatSnackBar } from "@angular/material/snack-bar"; import { TTemplateImage } from "./interfaces"; export const SIIBRA_API_VERSION_HEADER_KEY='x-siibra-api-version' -export const SIIBRA_API_VERSION = '0.1.6' +export const SIIBRA_API_VERSION = '0.1.7' const validVolumeType = new Set([ 'neuroglancer/precomputed', @@ -496,7 +496,7 @@ Raise/track issues at github repo: <a target = "_blank" href = "${this.repoUrl}" // }] } }), - originDatainfos: (parc._dataset_specs || []).filter(spec => spec["@type"] === 'fzj/tmp/simpleOriginInfo/v0.0.1') + originDatainfos: [...(parc.infos || []), ...(parc._dataset_specs || []).filter(spec => spec["@type"] === 'fzj/tmp/simpleOriginInfo/v0.0.1')] } }) } @@ -806,7 +806,7 @@ Raise/track issues at github repo: <a target = "_blank" href = "${this.repoUrl}" '@id': parc.id, name: parc.name, regions, - originDatainfos: (fullParcInfo?._dataset_specs || []).filter(spec => spec["@type"] === 'fzj/tmp/simpleOriginInfo/v0.0.1') + originDatainfos: [...fullParcInfo.infos, ...(fullParcInfo?._dataset_specs || []).filter(spec => spec["@type"] === 'fzj/tmp/simpleOriginInfo/v0.0.1')] } }), ...threeSurferConfig diff --git a/src/util/siibraApiConstants/types.ts b/src/util/siibraApiConstants/types.ts index 40feae057c4f86091709af44a3346ce8fdb3b2bb..0fdd05528b261722876b883b7fd00d30e74fdaf7 100644 --- a/src/util/siibraApiConstants/types.ts +++ b/src/util/siibraApiConstants/types.ts @@ -147,9 +147,10 @@ export type TParc = { }[] links: { self: THref + regions: THref + features: THref } - regions: THref - features: THref + infos: TDatainfosDetail[] modality: TParcModality version: TVersion _dataset_specs: TDatasetSpec[] diff --git a/src/viewerModule/viewerCmp/viewerCmp.component.ts b/src/viewerModule/viewerCmp/viewerCmp.component.ts index 27c6eac25d510299e06a38c8e5be1814acb3d8c7..fc946ca3f2a946852d1a19093fb35a359d5dd2b7 100644 --- a/src/viewerModule/viewerCmp/viewerCmp.component.ts +++ b/src/viewerModule/viewerCmp/viewerCmp.component.ts @@ -308,7 +308,7 @@ export class ViewerCmp implements OnDestroy { markdown: message.join('\n\n'), confirmOnly: true }) - // eslint-disable-next-line @typescript-eslint/no-empty + // eslint-disable-next-line no-empty } catch (e) { } diff --git a/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.component.ts b/src/viewerModule/viewerStateBreadCrumb/breadcrumb/breadcrumb.component.ts index 8bf705e68d933cdc60faa91903cb9506025c2895..5a4bea443845687db10084cd253a18ec1c44bb17 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 { TDatainfosDetail } from "src/util/siibraApiConstants/types"; +import { TDatainfosDetail, TSimpleInfo } from "src/util/siibraApiConstants/types"; @Component({ selector: 'viewer-state-breadcrumb', @@ -120,8 +120,12 @@ export class ViewerStateBreadCrumb { }) export class OriginalDatainfoPipe implements PipeTransform{ - public transform(arr: TDatainfosDetail[]): TDatainfosDetail[]{ - if (arr.length > 0) { + public transform(arr: (TSimpleInfo | TDatainfosDetail)[]): TDatainfosDetail[]{ + const detailedInfos = arr.filter(item => item['@type'] === 'minds/core/dataset/v1.0.0') as TDatainfosDetail[] + const simpleInfos = arr.filter(item => item['@type'] === 'fzj/tmp/simpleOriginInfo/v0.0.1') as TSimpleInfo[] + + if (detailedInfos.length > 0) return detailedInfos + if (simpleInfos.length > 0) { return arr.map(d => { return { '@type': 'minds/core/dataset/v1.0.0',