chore(release): publish [skip ci]

- @ohif/extension-vtk@1.3.1 - @ohif/ui@1.4.1 - @ohif/viewer@3.8.3
fix: rendering delete button when text is too wide for parent div (#1526 )
2020-03-17 22:49:26 +00:00 · 2020-03-17 18:48:06 -04:00 · 2020-03-17 18:19:35 +00:00 · 2020-03-17 14:14:04 -04:00 · 2020-03-17 13:08:24 +00:00 · 2020-03-17 14:05:56 +01:00
28 changed files with 271 additions and 194 deletions
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.3.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.3.0...@ohif/extension-vtk@1.3.1) (2020-03-17)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 # [1.3.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.2.24...@ohif/extension-vtk@1.3.0) (2020-03-13)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.3.0",
+  "version": "1.3.1",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -54,7 +54,7 @@
  },
  "devDependencies": {
    "@ohif/core": "^2.6.0",
-    "@ohif/ui": "^1.4.0",
+    "@ohif/ui": "^1.4.1",
    "cornerstone-tools": "4.12.5",
    "cornerstone-wado-image-loader": "^3.0.0",
    "dicom-parser": "^1.8.3",
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.4.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.4.0...@ohif/ui@1.4.1) (2020-03-17)
+
+
+### Bug Fixes
+
+* rendering delete button when text is too wide for parent div ([#1526](https://github.com/OHIF/Viewers/issues/1526)) ([b269415](https://github.com/OHIF/Viewers/commit/b269415048dfec50e2abb3dd4f4355a23d6ad75a))
+
+
+
+
+
 # [1.4.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.3.3...@ohif/ui@1.4.0) (2020-03-13)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "1.4.0",
+  "version": "1.4.1",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -25,7 +25,7 @@

  &.selected
    .rowActions
-      height: 35px
+      height: auto;
      visibility: visible

  .measurementLocation
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.8.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.8.2...@ohif/viewer@3.8.3) (2020-03-17)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [3.8.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.8.1...@ohif/viewer@3.8.2) (2020-03-17)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [3.8.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.8.0...@ohif/viewer@3.8.1) (2020-03-17)
+
+
+### Bug Fixes
+
+* resolves [#1483](https://github.com/OHIF/Viewers/issues/1483) ([#1527](https://github.com/OHIF/Viewers/issues/1527)) ([2747eff](https://github.com/OHIF/Viewers/commit/2747effd9e893bd78b80ee7d0444f44676e9d632))
+
+
+
+
+
 # [3.8.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.8...@ohif/viewer@3.8.0) (2020-03-13)


@@ -1,8 +1,9 @@
 describe('OHIF Cornerstone Hotkeys', () => {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
-    cy.expectMinimumThumbnails(3);
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
+    cy.expectMinimumThumbnails(5);
  });

  beforeEach(() => {
@@ -42,13 +43,6 @@ describe('OHIF Cornerstone Hotkeys', () => {
    cy.get('@viewportInfoMidTop').should('contains.text', 'P');
  });

-  it('checks if hotkey "I" can invert the image', () => {
-    // Hotkey I
-    cy.get('body').type('I');
-    // Visual comparison
-    cy.screenshot('Hotkey I - Should Invert Image');
-  });
-
  it('checks if hotkeys "+", "-" and "=" can zoom in, out and fit to viewport', () => {
    // Hotkey +
    cy.get('body').type('+++'); // Press hotkey 3 times
@@ -73,9 +67,6 @@ describe('OHIF Cornerstone Hotkeys', () => {
    cy.get('@viewportInfoMidLeft').should('contains.text', 'R');
    cy.get('@viewportInfoMidTop').should('contains.text', 'A');
    cy.get('@viewportInfoBottomRight').should('contains.text', 'Zoom: 211%');
-
-    // Visual comparison to make sure the 'inverted' image was reset
-    cy.screenshot('Hotkey SPACEBAR - Should Reset Image');
  });

  it('uses hotkeys "RightArrow" and "LeftArrow" to navigate between multiple viewports', () => {
@@ -126,6 +117,9 @@ describe('OHIF Cornerstone Hotkeys', () => {
    cy.get('@viewport2InfoMidLeft').should('contains.text', 'A');
    cy.get('@viewport2InfoMidTop').should('contains.text', 'H');
    cy.get('@viewport2InfoBottomRight').should('contains.text', 'Zoom: 45%');
+
+    //Select viewport layout (1,1)
+    cy.setLayout(1, 1);
  });

  //TO-DO: This test is blocked by issue #1095 (https://github.com/OHIF/Viewers/issues/1095)
@@ -1,7 +1,8 @@
 describe('OHIF Cornerstone Toolbar', () => {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
    cy.expectMinimumThumbnails(5);
  });

@@ -116,9 +117,6 @@ describe('OHIF Cornerstone Toolbar', () => {
      .trigger('mousedown', 'center', { which: 1 })
      .trigger('mousemove', 'bottom', { which: 1 })
      .trigger('mouseup', 'bottom');
-
-    // Visual comparison
-    cy.screenshot('Pan tool moved the image inside the viewport');
  });

  it('checks if Length annotation can be added on viewport and on measurements panel', () => {
@@ -425,19 +423,6 @@ describe('OHIF Cornerstone Toolbar', () => {
    });
  });

-  it('check if Invert tool will change the colors of the image in the viewport', () => {
-    // Click on More button
-    cy.get('@moreBtn').click();
-    // Verify if overlay is displayed
-    cy.get('.tooltip-toolbar-overlay').should('be.visible');
-
-    // Click on Invert button
-    cy.get('[data-cy="invert"]').click();
-
-    // Visual comparison
-    cy.screenshot('Invert tool - Should Invert Canvas');
-  });
-
  it('check if Rotate tool will change the image orientation in the viewport', () => {
    //Click on More button
    cy.get('@moreBtn').click();
@@ -447,10 +432,9 @@ describe('OHIF Cornerstone Toolbar', () => {
      .then(() => {
        //Click on Rotate button
        cy.get('[data-cy="rotate right"]').click({ force: true });
+        cy.get('@viewportInfoMidLeft').should('contains.text', 'F');
+        cy.get('@viewportInfoMidTop').should('contains.text', 'R');
      });
-
-    // Visual comparison
-    cy.screenshot('Rotate tool - Should Rotate Image to Right');
  });

  it('check if Flip H tool will flip the image horizontally in the viewport', () => {
@@ -461,9 +445,8 @@ describe('OHIF Cornerstone Toolbar', () => {

    //Click on Flip H button
    cy.get('[data-cy="flip h"]').click();
-
-    // Visual comparison
-    cy.screenshot('Flip H tool - Should Flip Image on Y axis');
+    cy.get('@viewportInfoMidLeft').should('contains.text', 'L');
+    cy.get('@viewportInfoMidTop').should('contains.text', 'H');
  });

  it('check if Flip V tool will flip the image vertically in the viewport', () => {
@@ -474,8 +457,7 @@ describe('OHIF Cornerstone Toolbar', () => {

    //Click on Flip V button
    cy.get('[data-cy="flip v"]').click();
-
-    // Visual comparison
-    cy.screenshot('Flip V tool - Should Flip Image on X axis');
+    cy.get('@viewportInfoMidLeft').should('contains.text', 'R');
+    cy.get('@viewportInfoMidTop').should('contains.text', 'F');
  });
 });
@@ -1,7 +1,8 @@
 describe('OHIF Download Snapshot File', () => {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
    cy.expectMinimumThumbnails(5);
  });

@@ -105,8 +106,6 @@ describe('OHIF Download Snapshot File', () => {
    cy.get('[data-cy="show-annotations"]').check();
    // Check image preview
    cy.get('[data-cy="image-preview"]').scrollIntoView();
-    // Visual comparison
-    cy.screenshot('Download Image Modal - Show Annotations checked');
    //Compare classes that exists on Image Preview with Annotations and Without Annotation
    cy.get('[data-cy="modal-content"]')
      .find('canvas')
@@ -2,10 +2,19 @@
 //this is intended to be running in a controled docker environment with test data.
 describe('OHIF Study List', function() {
  context('Desktop resolution', function() {
+    before(function() {
+      cy.openStudyList();
+    });
+
    beforeEach(function() {
      cy.viewport(1750, 720);
-      cy.openStudyList();
      cy.initStudyListAliasesOnDesktop();
+      //Clear all text fields
+      cy.get('@PatientName').clear();
+      cy.get('@MRN').clear();
+      cy.get('@AccessionNumber').clear();
+      cy.get('@StudyDescription').clear();
+      cy.get('@modalities').clear();
    });

    it('searches Patient Name with exact string', function() {
@@ -101,10 +110,16 @@ describe('OHIF Study List', function() {
  });

  context('Tablet resolution', function() {
+    before(function() {
+      cy.openStudyList();
+    });
+
    beforeEach(function() {
      cy.viewport(1000, 660);
-      cy.openStudyList();
      cy.initStudyListAliasesOnTablet();
+      //Clear all text fields
+      cy.get('@patientNameOrMRN').clear();
+      cy.get('@accessionModalityDescription').clear();
    });

    it('searches Patient Name with exact string', function() {
@@ -1,8 +1,9 @@
 describe('OHIF Study Viewer Page', function() {
-  before(function() {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
-    cy.expectMinimumThumbnails(6);
+  before(() => {
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
+    cy.expectMinimumThumbnails(5);
  });

  beforeEach(function() {
@@ -11,8 +12,6 @@ describe('OHIF Study Viewer Page', function() {
  });

  it('checks if series thumbnails are being displayed', function() {
-    cy.screenshot('Series Thumbnails - Should Display Thumbnails');
-
    cy.get('[data-cy="thumbnail-list"]')
      .its('length')
      .should('be.gt', 1);
@@ -291,9 +290,6 @@ describe('OHIF Study Viewer Page', function() {
      });
    });

-    // Visual comparison
-    cy.screenshot('About modal - Should display modal');
-
    //close modal
    cy.get('[data-cy="close-button"]').click();
    cy.get('@aboutOverlay').should('not.be.enabled');
@@ -22,10 +22,6 @@ describe('OHIF User Preferences', () => {
      cy.get('@cancelBtn').should('have.text', 'Cancel');
      cy.get('@saveBtn').should('have.text', 'Save');

-      // Visual comparison
-      cy.screenshot(
-        'User Preferences Modal - Hotkeys tab initial state in Study List page'
-      );
      cy.get('[data-cy="close-button"]').click();
    });

@@ -36,10 +32,6 @@ describe('OHIF User Preferences', () => {
      // Language dropdown should be displayed
      cy.get('#language-select').should('be.visible');

-      // Visual comparison
-      cy.screenshot(
-        'User Preferences Modal - General tab initial state in Study List page'
-      );
      // Set language to Spanish and save
      cy.setLanguage('Spanish');

@@ -211,10 +203,6 @@ describe('OHIF User Preferences', () => {
      cy.get('@cancelBtn').should('have.text', 'Cancel');
      cy.get('@saveBtn').should('have.text', 'Save');

-      // Visual comparison
-      cy.screenshot(
-        'User Preferences Modal - Hotkeys tab initial state in Study Viewer page'
-      );
      cy.get('[data-cy="close-button"]').click(); //close User Preferences modal
    });

@@ -225,10 +213,6 @@ describe('OHIF User Preferences', () => {
      // Language dropdown should be displayed
      cy.get('#language-select').should('be.visible');

-      // Visual comparison
-      cy.screenshot(
-        'User Preferences Modal - General tab initial state in Study Viewer page'
-      );
      // Set language to Spanish
      cy.setLanguage('Spanish');

@@ -401,9 +385,6 @@ describe('OHIF User Preferences', () => {
      cy.get('body').type(' ');
      cy.get('@viewportInfoMidTop').should('contains.text', 'A');

-      // Visual comparison
-      cy.screenshot('Viewport Navigation - 2nd viewport inverted and rotated');
-
      // Set 1 viewport layout
      cy.setLayout(1, 1);
    });
@@ -1,6 +1,8 @@
 describe('OHIF HTML Extension', () => {
  before(() => {
-    cy.openStudy('Dummy');
+    cy.openStudyInViewer(
+      '1.2.826.0.13854362241694438965858641723883466450351448'
+    );
    cy.expectMinimumThumbnails(5);
  });

@@ -40,5 +42,37 @@ describe('OHIF HTML Extension', () => {
        .scrollTo('bottom');
      cy.wrap($viewport).should('have.class', 'active');
    });
+
+    cy.setLayout('1', '1');
+  });
+});
+
+describe('OHIF PDF Extension', () => {
+  before(() => {
+    cy.checkStudyRouteInViewer(
+      '1.2.826.0.13854362241694438965858641723883466450351448'
+    );
+    cy.expectMinimumThumbnails(5);
+  });
+
+  it('checks if series thumbnails are being displayed', () => {
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('DOC')
+      .its('length')
+      .should('to.be.at.least', 1);
+  });
+
+  it('drags and drop a PDF thumbnail into viewport', () => {
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('DOC')
+      .scrollIntoView()
+      .drag('.viewport-drop-target');
+
+    cy.get('.DicomPDFViewport')
+      .its('length')
+      .should('be.eq', 1);
+
+    //Take Screenshot
+    cy.screenshot('PDF Extension - Should load PDF file');
  });
 });
@@ -1,27 +0,0 @@
-describe('OHIF PDF Extension', () => {
-  before(() => {
-    cy.openStudy('Dummy');
-    cy.expectMinimumThumbnails(6);
-  });
-
-  it('checks if series thumbnails are being displayed', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('DOC')
-      .its('length')
-      .should('to.be.at.least', 1);
-  });
-
-  it('drags and drop a PDF thumbnail into viewport', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('DOC')
-      .drag('.viewport-drop-target');
-
-    cy.get('.DicomPDFViewport')
-      .its('length')
-      .should('be.eq', 1);
-
-    // This won't work unless we switch to an extension that renders using `canvas`
-    // Currently, we rely on the browser's built-in implementation
-    cy.screenshot('PDF Extension - Should load PDF file');
-  });
-});
@@ -1,16 +1,9 @@
 describe('OHIF VTK Extension', () => {
  before(() => {
-    cy.openStudy('Juno');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1'
+    );
    cy.expectMinimumThumbnails(7);
-  });
-
-  beforeEach(() => {
-    //TODO: Due to percy snapshot, the images inside the viewports are being resized
-    //and once the browser continues the test execution, the images are not centered in the viewport.
-    //To fix that, we need to reload the page before each test.
-    //https://github.com/OHIF/Viewers/issues/1168
-    cy.reload();

    //Waiting for the desired thumbnail content to be displayed
    cy.get('[data-cy="thumbnail-list"]').should($list => {
@@ -23,14 +16,16 @@ describe('OHIF VTK Extension', () => {
    // Drag and drop third thumbnail into first viewport
    cy.get('[data-cy="thumbnail-list"]')
      .contains('CT WB 5.0  B35f')
-      .drag('.viewport-drop-target')
+      .drag('.viewport-drop-target');

    //Select 2D MPR button
    cy.get('[data-cy="2d mpr"]').click();

    //Wait Reformatting Images
    cy.waitVTKReformatting();
+  });

+  beforeEach(() => {
    cy.initVTKToolsAliases();
  });

@@ -54,9 +49,6 @@ describe('OHIF VTK Extension', () => {
    cy.get('@layoutBtn')
      .should('be.visible')
      .contains('Layout');
-
-    // Visual comparison
-    cy.screenshot('VTK initial state - Should display toolbar and 3 viewports');
  });

  it('checks Crosshairs tool', () => {
@@ -64,20 +56,26 @@ describe('OHIF VTK Extension', () => {

    // Click and Move the mouse inside the viewport
    cy.get('[data-cy="viewport-container-0"]')
-      .trigger('mousedown', 'center', { which: 1 })
-      .trigger('mousemove', 'top', { which: 1 })
+      .trigger('mousedown', 'center', {
+        which: 1,
+      })
+      .trigger('mousemove', 'top', {
+        which: 1,
+      })
      .trigger('mouseup');

-    // Visual comparison
+    //Take Screenshot
    cy.screenshot(
      "VTK Crosshairs tool - Should display crosshairs' green lines"
    );
  });

-  /* TODO: Non-deterministic behavior (const expectedText = 'W: 350 L: -1044';)
  it('checks WWWC tool', () => {
    cy.get('@wwwcBtn').click();

+    //Initial label in the viewport
+    const initialLabelText = 'W: 350 L: 40';
+
    // Click and Move the mouse inside the viewport
    cy.get('[data-cy="viewport-container-0"]')
      .trigger('mousedown', 'center', { which: 1 })
@@ -86,29 +84,29 @@ describe('OHIF VTK Extension', () => {
      .trigger('mousemove', 'top', { which: 1 })
      .trigger('mouseup', { which: 1 })
      .then(() => {
-        const expectedText = 'W: 350 L: 40';
        cy.get('.ViewportOverlay > div.bottom-right.overlay-element').should(
-          'contains.text',
-          expectedText
+          'not.have.text',
+          initialLabelText
        );
      });
-
-    // Visual comparison
-    cy.screenshot('VTK WWWC tool - Canvas should be bright');
-  }); */
+  });

  it('checks Rotate tool', () => {
    cy.get('@rotateBtn').click();

    // Click and Move the mouse inside the viewport
    cy.get('[data-cy="viewport-container-0"]')
-      .trigger('mousedown', 'center', { which: 1 })
+      .trigger('mousedown', 'center', {
+        which: 1,
+      })
      .trigger('mousemove', 'top', { which: 1 })
-      .trigger('mousedown', 'center', { which: 1 })
+      .trigger('mousedown', 'center', {
+        which: 1,
+      })
      .trigger('mousemove', 'top', { which: 1 })
      .trigger('mouseup', { which: 1 });

-    // Visual comparison
+    //Take Screenshot
    cy.screenshot('VTK Rotate tool - Should rotate image');
  });
 });
@@ -1,7 +1,8 @@
 describe('OHIF Save Measurements', function() {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
    cy.expectMinimumThumbnails(5);
  });

@@ -1,8 +1,9 @@
 describe('Visual Regression - OHIF Cornerstone Hotkeys', () => {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
-    cy.expectMinimumThumbnails(3);
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
+    cy.expectMinimumThumbnails(5);
  });

  beforeEach(() => {
@@ -1,7 +1,8 @@
 describe('Visual Regression - OHIF Cornerstone Toolbar', () => {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
    cy.expectMinimumThumbnails(5);
  });

@@ -1,7 +1,8 @@
 describe('Visual Regression - OHIF Download Snapshot File', () => {
  before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
    cy.expectMinimumThumbnails(5);
  });

@@ -1,8 +1,10 @@
 describe('Visual Regression - OHIF PDF Extension', () => {
  before(() => {
-    cy.openStudy('Dummy');
-    cy.expectMinimumThumbnails(6);
-  });
+    cy.checkStudyRouteInViewer(
+      '1.2.826.0.13854362241694438965858641723883466450351448'
+    );
+    cy.expectMinimumThumbnails(5);
+  });v

  it('drags and drop a PDF thumbnail into viewport', () => {
    cy.get('[data-cy="thumbnail-list"]')
@@ -1,8 +1,9 @@
 describe('Visual Regression - OHIF VTK Extension', () => {
  before(() => {
-    cy.openStudy('Bellona');
-    cy.waitDicomImage();
-    cy.expectMinimumThumbnails(5);
+    cy.checkStudyRouteInViewer(
+      '1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1'
+    );
+    cy.expectMinimumThumbnails(7);

    //Waiting for the desired thumbnail content to be displayed
    cy.get('[data-cy="thumbnail-list"]').should($list => {
@@ -1,8 +1,9 @@
 describe('Visual Regression - OHIF Study Viewer Page', function() {
-  before(function() {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
-    cy.expectMinimumThumbnails(6);
+  before(() => {
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
+    cy.expectMinimumThumbnails(5);
  });

  beforeEach(function() {
@@ -53,6 +53,16 @@ Cypress.Commands.add('openStudy', PatientName => {
    .click({ force: true });
 });

+Cypress.Commands.add('checkStudyRouteInViewer', StudyInstanceUID => {
+  cy.location('pathname').then($url => {
+    cy.log($url);
+    if ($url == 'blank' || !$url.includes(`/viewer/${StudyInstanceUID}`)) {
+      cy.openStudyInViewer(StudyInstanceUID);
+      cy.waitDicomImage();
+    }
+  });
+});
+
 Cypress.Commands.add('openStudyInViewer', StudyInstanceUID => {
  cy.visit(`/viewer/${StudyInstanceUID}`);
 });
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "3.8.0",
+  "version": "3.8.3",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -30,6 +30,7 @@
    "start": "yarn run dev",
    "test:e2e": "cypress open",
    "test:e2e:ci": "percy exec -- cypress run --config video=false --record --browser chrome --spec 'cypress/integration/visual-regression/**/*'",
+    "test:e2e:local": "cypress run --config video=false --browser chrome --spec 'cypress/integration/common/**/*,cypress/integration/pwa/**/*'",
    "test:e2e:dist": "start-server-and-test test:e2e:serve http://localhost:3000 test:e2e:ci",
    "test:e2e:serve": "serve -n -l 3000 -s dist",
    "test:unit": "jest --watchAll",
@@ -54,9 +55,9 @@
    "@ohif/extension-dicom-pdf": "^1.0.2",
    "@ohif/extension-dicom-segmentation": "^0.1.0",
    "@ohif/extension-lesion-tracker": "^0.2.0",
-    "@ohif/extension-vtk": "^1.3.0",
+    "@ohif/extension-vtk": "^1.3.1",
    "@ohif/i18n": "^0.52.7",
-    "@ohif/ui": "^1.4.0",
+    "@ohif/ui": "^1.4.1",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
@@ -2,6 +2,7 @@ import OHIF from '@ohif/core';
 import { connect } from 'react-redux';
 import { StudyBrowser } from '@ohif/ui';
 import cloneDeep from 'lodash.clonedeep';
+import findDisplaySetByUID from './findDisplaySetByUID';

 const { setActiveViewportSpecificData } = OHIF.redux.actions;

@@ -38,8 +39,9 @@ const mapStateToProps = (state, ownProps) => {
 const mapDispatchToProps = (dispatch, ownProps) => {
  return {
    onThumbnailClick: displaySetInstanceUID => {
-      const displaySet = ownProps.studyMetadata[0].displaySets.find(
-        ds => ds.displaySetInstanceUID === displaySetInstanceUID
+      const displaySet = findDisplaySetByUID(
+        ownProps.studyMetadata,
+        displaySetInstanceUID
      );

      dispatch(setActiveViewportSpecificData(displaySet));
@@ -0,0 +1,25 @@
+/**
+ * Finds displaySet by UID across all displaySets inside studyMetadata
+ * @param {Array} studyMetadata
+ * @param {string} displaySetInstanceUID
+ */
+export default function findDisplaySetByUID(
+  studyMetadata,
+  displaySetInstanceUID
+) {
+  if (!Array.isArray(studyMetadata)) return null;
+
+  const allDisplaySets = studyMetadata.reduce((all, current) => {
+    let currentDisplaySet = [];
+    if (current && Array.isArray(current.displaySets)) {
+      currentDisplaySet = current.displaySets;
+    }
+    return all.concat(currentDisplaySet);
+  }, []);
+
+  const bySetInstanceUID = ds =>
+    ds.displaySetInstanceUID === displaySetInstanceUID;
+
+  const displaySet = allDisplaySets.find(bySetInstanceUID);
+  return displaySet || null;
+}
@@ -0,0 +1,43 @@
+import findDisplaySetByUID from './findDisplaySetByUID';
+
+describe('findDisplaySetByUID', () => {
+  test('returns null when studyMetadata isnt an array', () => {
+    const result = findDisplaySetByUID(undefined, 'hello');
+    expect(result).toBeNull();
+  });
+
+  test('returns null when no match found', () => {
+    const result = findDisplaySetByUID([], 'no-match');
+    expect(result).toBeNull();
+  });
+
+  test('it handles missing displaySet arrays', () => {
+    const expected = '9388-2291-a8fe';
+    const studyMetadata = [
+      { displaySets: null },
+      {
+        displaySets: [{ displaySetInstanceUID: expected }],
+      },
+      null,
+      7,
+    ];
+    const result = findDisplaySetByUID(studyMetadata, expected);
+    expect(result.displaySetInstanceUID).toBe(expected);
+  });
+
+  test('returns correct displaySet by UID', () => {
+    const expected = '1234-5678';
+    const studyMetadata = [
+      { displaySets: [{ displaySetInstanceUID: '0011-2239' }] },
+      {
+        displaySets: [
+          { displaySetInstanceUID: '0392-2211' },
+          { displaySetInstanceUID: expected },
+        ],
+      },
+      { displaySets: [{ displaySetInstanceUID: '3384-9933' }] },
+    ];
+    const result = findDisplaySetByUID(studyMetadata, expected);
+    expect(result.displaySetInstanceUID).toBe(expected);
+  });
+});
@@ -6419,7 +6419,7 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
  dependencies:
    ms "2.0.0"

-debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
  version "3.2.6"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -6648,11 +6648,6 @@ detect-indent@^5.0.0:
  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=

-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -9840,7 +9835,7 @@ i18next@^17.0.3:
  dependencies:
    "@babel/runtime" "^7.3.1"

-iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
  version "0.4.24"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -13014,15 +13009,6 @@ ndarray@^1.0.18:
    iota-array "^1.0.0"
    is-buffer "^1.0.2"

-needle@^2.2.1:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
-  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
  version "0.6.2"
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -13186,22 +13172,6 @@ node-notifier@^5.4.2:
    shellwords "^0.1.1"
    which "^1.3.0"

-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.29, node-releases@^1.1.50:
  version "1.1.52"
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"
@@ -13340,7 +13310,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
    semver "^5.6.0"
    validate-npm-package-name "^3.0.0"

-npm-packlist@^1.1.6, npm-packlist@^1.4.4:
+npm-packlist@^1.4.4:
  version "1.4.8"
  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
@@ -13379,7 +13349,7 @@ npm-run-path@^4.0.0:
  dependencies:
    path-key "^3.0.0"

-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -15473,7 +15443,7 @@ rbush@2.0.2:
  dependencies:
    quickselect "^1.0.1"

-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.0.1, rc@^1.1.6:
  version "1.2.8"
  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -18484,7 +18454,7 @@ tar@^2.0.0:
    fstream "^1.0.12"
    inherits "2"

-tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8:
+tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
  version "4.4.13"
  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
Author	SHA1	Message	Date
ohif-bot	3b5f71b0be	chore(release): publish [skip ci] - @ohif/extension-vtk@1.3.1 - @ohif/ui@1.4.1 - @ohif/viewer@3.8.3	2020-03-17 22:49:26 +00:00
Darren	b269415048	fix: rendering delete button when text is too wide for parent div (#1526 )	2020-03-17 18:48:06 -04:00
ohif-bot	c9e421cff3	chore(release): publish [skip ci] - @ohif/viewer@3.8.2	2020-03-17 18:19:35 +00:00
Mirna SilvaandDanny Brown	d9999c1ae4	ci: Added verification on Before hook to avoid navigating again to viewer page (#1505 ) * Added verification on Before hook to avoid navigating again to viewer page * Removed unecessary screenshots and duplicated test cases * Navigation Fix for HTML extension and improved Flip button verification Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>	2020-03-17 14:14:04 -04:00
ohif-bot	31ba042121	chore(release): publish [skip ci] - @ohif/viewer@3.8.1	2020-03-17 13:08:24 +00:00
Anth Lubic	2747effd9e	fix: resolves #1483 (#1527 )	2020-03-17 14:05:56 +01:00