From b68b6db09e2b902df87c0b045cf00b3b2bd1edcd Mon Sep 17 00:00:00 2001 From: Xiao Gui <xgui3783@gmail.com> Date: Tue, 26 May 2020 17:18:52 +0200 Subject: [PATCH] bugfix: hide conn menu where there are none --- docs/releases/v2.2.1.md | 7 +++++++ e2e/src/layout/scrollDatasetContainer.prod.e2e-spec.js | 2 ++ mkdocs.yml | 1 + .../parcellationRegion/regionMenu/regionMenu.template.html | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 docs/releases/v2.2.1.md diff --git a/docs/releases/v2.2.1.md b/docs/releases/v2.2.1.md new file mode 100644 index 000000000..1934dc90e --- /dev/null +++ b/docs/releases/v2.2.1.md @@ -0,0 +1,7 @@ +# v2.2.1 + +26 May 2020 + +## Bugfixes + +- fixed connectivity menu showing non existent connectivity data diff --git a/e2e/src/layout/scrollDatasetContainer.prod.e2e-spec.js b/e2e/src/layout/scrollDatasetContainer.prod.e2e-spec.js index 7d80e04fc..198be8f23 100644 --- a/e2e/src/layout/scrollDatasetContainer.prod.e2e-spec.js +++ b/e2e/src/layout/scrollDatasetContainer.prod.e2e-spec.js @@ -37,6 +37,8 @@ describe('> scroll dataset container', () => { countdown -- }while(countdown > 0) + await iavPage.wait(500) + const val = await iavPage.getScrollStatus(scrollContainerCssSelector) expect(val).toBeGreaterThanOrEqual(10000) }) diff --git a/mkdocs.yml b/mkdocs.yml index e24364130..25324af62 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.2.1: 'releases/v2.2.1.md' - v2.2.0: 'releases/v2.2.0.md' - v2.1.3: 'releases/v2.1.3.md' - v2.1.2: 'releases/v2.1.2.md' diff --git a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html index 4d538936d..d4f008803 100644 --- a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html +++ b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html @@ -138,7 +138,7 @@ </mat-list-item> <!-- connectivity --> - <div iav-switch #connectivitySwitch="iavSwitch"> + <div *ngIf="hasConnectivity" iav-switch #connectivitySwitch="iavSwitch"> <mat-list-item mat-ripple (click)="connectivitySwitch.toggle()" -- GitLab