diff --git a/docs/releases/v2.5.6.md b/docs/releases/v2.5.6.md new file mode 100644 index 0000000000000000000000000000000000000000..b68bd54771ba235dcb3dabbb091b89b293957f7d --- /dev/null +++ b/docs/releases/v2.5.6.md @@ -0,0 +1,5 @@ +# v2.5.6 + +## Bugfix + +- re-introduced explore in KG button for parcellation citations \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index f518f97c0be45a63b2ca5579a32b335108810fd3..896264a35008a823b6baa91c834161f92bfd49bb 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -40,6 +40,7 @@ pages: - Fetching datasets: 'advanced/datasets.md' - Display non-atlas volumes: 'advanced/otherVolumes.md' - Release notes: + - v2.5.6: 'releases/v2.5.6.md' - v2.5.5: 'releases/v2.5.5.md' - v2.5.4: 'releases/v2.5.4.md' - v2.5.3: 'releases/v2.5.3.md' diff --git a/package.json b/package.json index f84133d130a8f7ee46363b06b3036ebfcf72393b..8f8a82352770350bf7ea348d73667507428e50a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "interactive-viewer", - "version": "2.5.5", + "version": "2.5.6", "description": "HBP interactive atlas viewer. Integrating KG query, dataset previews & more. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular", "scripts": { "build-aot": "VERSION=`node -e 'console.log(require(\"./package.json\").version)'` ng build && node ./third_party/matomo/processMatomo.js", diff --git a/src/util/pureConstant.service.spec.ts b/src/util/pureConstant.service.spec.ts index 28c60d696e3648daafefe1e70a48fd85aa0f853f..7372f12e3a37d661b321fb051eae699c186761f6 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 22ab44b8c6b69b75b4aed5659a685f8d63bf9458..eda57b6178786a0e48ca92060d701446ae84857b 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',