chore(release): publish [skip ci]

- @ohif/viewer@3.4.2
Merge pull request #1382 from OHIF/mirna/test/visual-tests
2020-01-17 22:45:01 +00:00 · 2020-01-17 19:43:19 -03:00 · 2020-01-17 19:14:16 -03:00 · 2020-01-17 16:36:08 -03:00 · 2020-01-17 16:35:26 -03:00 · 2020-01-17 14:46:43 -03:00
30 changed files with 666 additions and 103 deletions
@@ -328,6 +328,7 @@ workflows:
          working_directory: platform/viewer
          build: npx cross-env QUICK_BUILD=true yarn run build
          start: yarn run test:e2e:serve
+          spec: 'cypress/integration/common/**/*,cypress/integration/pwa/**/*'
          wait-on: 'http://localhost:3000'
          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
@@ -352,7 +353,7 @@ workflows:
          working_directory: platform/viewer
          build: npx cross-env QUICK_BUILD=true yarn run build:package
          start: yarn run test:e2e:serve
-          spec: 'cypress/integration/common/**/*'
+          spec: 'cypress/integration/common/**/*,cypress/integration/script-tag/**/*'
          wait-on: 'http://localhost:3000'
          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
@@ -458,7 +459,8 @@ workflows:
          working_directory: platform/viewer
          build: npx cross-env QUICK_BUILD=true yarn run build
          # start server --> verify running --> percy + chrome + cypress
-          command: yarn run test:e2e:dist
+          start: yarn run test:e2e:dist
+          spec: 'cypress/integration/visual-regression/**/*'
          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
          post-steps:
@@ -1,17 +1,31 @@
 #!/bin/bash

-# If CLIENT_ID is specified, use the google.js configuration with the modified ID
-if [ ! -z "$CLIENT_ID" ]
+if [ -n "$CLIENT_ID" ] || [ -n "$HEALTHCARE_API_ENDPOINT" ]
  then
-  	echo "Google Cloud Healthcare $CLIENT_ID has been provided: "
-  	echo $CLIENT_ID
-  	echo "Updating config..."
+    # If CLIENT_ID is specified, use the google.js configuration with the modified ID
+    if [ -n "$CLIENT_ID" ]
+      then
+  	    echo "Google Cloud Healthcare \$CLIENT_ID has been provided: "
+  	    echo "$CLIENT_ID"
+  	    echo "Updating config..."

-  	# - Use SED to replace the CLIENT_ID that is currently in google.js
-	sed -i -e "s/YOURCLIENTID.apps.googleusercontent.com/$CLIENT_ID/g" /usr/share/nginx/html/google.js
+  	    # - Use SED to replace the CLIENT_ID that is currently in google.js
+	      sed -i -e "s/YOURCLIENTID.apps.googleusercontent.com/$CLIENT_ID/g" /usr/share/nginx/html/google.js
+	  fi

-	# - Copy google.js to overwrite app-config.js
-	cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js
+    # If HEALTHCARE_API_ENDPOINT is specified, use the google.js configuration with the modified endpoint
+    if [ -n "$HEALTHCARE_API_ENDPOINT" ]
+      then
+        echo "Google Cloud Healthcare \$HEALTHCARE_API_ENDPOINT has been provided: "
+        echo "$HEALTHCARE_API_ENDPOINT"
+        echo "Updating config..."
+
+        # - Use SED to replace the HEALTHCARE_API_ENDPOINT that is currently in google.js
+        sed -i -e "s+https://healthcare.googleapis.com/v1beta1+$HEALTHCARE_API_ENDPOINT+g" /usr/share/nginx/html/google.js
+    fi
+
+	  # - Copy google.js to overwrite app-config.js
+	  cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js
 fi

 echo "Starting Nginx to serve the OHIF Viewer..."
@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.4.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.4.1...@ohif/viewer@3.4.2) (2020-01-17)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [3.4.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.4.0...@ohif/viewer@3.4.1) (2020-01-15)
+
+
+### Bug Fixes
+
+* 🐛 Metadata is being mistakenly purged ([#1360](https://github.com/OHIF/Viewers/issues/1360)) ([b9a66d4](https://github.com/OHIF/Viewers/commit/b9a66d44241f2896ef184511287fb4984671e16d)), closes [#1326](https://github.com/OHIF/Viewers/issues/1326)
+
+
+
+
+
+# [3.4.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.3.8...@ohif/viewer@3.4.0) (2020-01-14)
+
+
+### Features
+
+* Custom Healthcare API endpoint ([#1367](https://github.com/OHIF/Viewers/issues/1367)) ([a5d6bc6](https://github.com/OHIF/Viewers/commit/a5d6bc6a51784ed3a8a40d4ae773de9099f116b9))
+
+
+
+
+
+## [3.3.8](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.3.7...@ohif/viewer@3.3.8) (2020-01-10)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [3.3.7](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.3.6...@ohif/viewer@3.3.7) (2020-01-08)

 **Note:** Version bump only for package @ohif/viewer
@@ -5,5 +5,6 @@
  "defaultCommandTimeout": 10000,
  "requestTimeout": 10000,
  "responseTimeout": 10000,
-  "projectId": "4oe38f"
+  "projectId": "4oe38f",
+  "video": false
 }
@@ -47,7 +47,6 @@ describe('OHIF Cornerstone Hotkeys', () => {
    cy.get('body').type('I');
    // Visual comparison
    cy.screenshot('Hotkey I - Should Invert Image');
-    cy.percyCanvasSnapshot('Hotkey I - Should Invert Image');
  });

  it('checks if hotkeys "+", "-" and "=" can zoom in, out and fit to viewport', () => {
@@ -77,7 +76,6 @@ describe('OHIF Cornerstone Hotkeys', () => {

    // Visual comparison to make sure the 'inverted' image was reset
    cy.screenshot('Hotkey SPACEBAR - Should Reset Image');
-    cy.percyCanvasSnapshot('Hotkey SPACEBAR - Should Reset Image');
  });

  it('uses hotkeys "RightArrow" and "LeftArrow" to navigate between multiple viewports', () => {
@@ -119,7 +119,6 @@ describe('OHIF Cornerstone Toolbar', () => {

    // Visual comparison
    cy.screenshot('Pan tool moved the image inside the viewport');
-    cy.percyCanvasSnapshot('Pan tool moved the image inside the viewport');
  });

  it('checks if Length annotation can be added on viewport and on measurements panel', () => {
@@ -471,7 +470,6 @@ describe('OHIF Cornerstone Toolbar', () => {

    // Visual comparison
    cy.screenshot('Invert tool - Should Invert Canvas');
-    cy.percyCanvasSnapshot('Invert tool - Should Invert Canvas');
  });

  it('check if Rotate tool will change the image orientation in the viewport', () => {
@@ -487,7 +485,6 @@ describe('OHIF Cornerstone Toolbar', () => {

    // Visual comparison
    cy.screenshot('Rotate tool - Should Rotate Image to Right');
-    cy.percyCanvasSnapshot('Rotate tool - Should Rotate Image to Right');
  });

  it('check if Flip H tool will flip the image horizontally in the viewport', () => {
@@ -501,7 +498,6 @@ describe('OHIF Cornerstone Toolbar', () => {

    // Visual comparison
    cy.screenshot('Flip H tool - Should Flip Image on Y axis');
-    cy.percyCanvasSnapshot('Flip H tool - Should Flip Image on Y axis');
  });

  it('check if Flip V tool will flip the image vertically in the viewport', () => {
@@ -515,6 +511,5 @@ describe('OHIF Cornerstone Toolbar', () => {

    // Visual comparison
    cy.screenshot('Flip V tool - Should Flip Image on X axis');
-    cy.percyCanvasSnapshot('Flip V tool - Should Flip Image on X axis');
  });
 });
@@ -21,7 +21,6 @@ describe('OHIF Download Snapshot File', () => {
    cy.viewport(1000, 660);
    // Visual comparison
    cy.screenshot('Download Image Modal - Tablet experience');
-    cy.percyCanvasSnapshot('Download Image Modal - Tablet experience');
  });

  it('checks displayed information for Desktop experience', function() {
@@ -29,7 +28,6 @@ describe('OHIF Download Snapshot File', () => {
    cy.viewport(1750, 720);
    // Visual comparison
    cy.screenshot('Download Image Modal - Desktop experience');
-    cy.percyCanvasSnapshot('Download Image Modal - Desktop experience');
    //Check if all elements are displayed
    cy.get('[data-cy=modal-header]')
      .as('downloadImageModal')
@@ -109,7 +107,6 @@ describe('OHIF Download Snapshot File', () => {
    cy.get('[data-cy="image-preview"]').scrollIntoView();
    // Visual comparison
    cy.screenshot('Download Image Modal - Show Annotations checked');
-    cy.percyCanvasSnapshot('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')
@@ -6,7 +6,9 @@ describe('OHIF Routes', function() {
  });

  it('checks PT/CT json url study route', function() {
-    cy.visit('/viewer?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/JSON/PTCTStudy.json');
+    cy.visit(
+      '/viewer?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/JSON/PTCTStudy.json'
+    );

    cy.server();
    cy.route('GET', '**/PTCTStudy/**').as('getPTCTStudy');
@@ -15,8 +17,5 @@ describe('OHIF Routes', function() {
    cy.get('@getPTCTStudy').should($route => {
      expect($route.status).to.be.eq(200);
    });
-
-    cy.screenshot();
-    cy.percyCanvasSnapshot('PT/CT json study route');
  });
 });
@@ -4,9 +4,6 @@ describe('OHIFStandaloneViewer', () => {
  });

  it('loads route with at least 2 rows', () => {
-    cy.screenshot('Study List');
-    cy.percyCanvasSnapshot('Study List');
-
    cy.get('[data-cy="study-list-results"] tr')
      .its('length')
      .should('be.gt', 2);
@@ -12,7 +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.percyCanvasSnapshot('Series Thumbnails - Should Display Thumbnails');

    cy.get('[data-cy="thumbnail-list"]')
      .its('length')
@@ -293,7 +292,6 @@ describe('OHIF Study Viewer Page', function() {

    // Visual comparison
    cy.screenshot('About modal - Should display modal');
-    cy.percyCanvasSnapshot('About modal - Should display modal');

    //close modal
    cy.get('[data-cy="close-button"]').click();
@@ -24,10 +24,7 @@ describe('OHIF User Preferences', () => {

      // Visual comparison
      cy.screenshot(
-        'User Preferences Modal - Hotkeys tab initial state in Study Viewer page'
-      );
-      cy.percyCanvasSnapshot(
-        'User Preferences Modal - Hotkeys tab initial state in Study Viewer page'
+        'User Preferences Modal - Hotkeys tab initial state in Study List page'
      );
      cy.get('[data-cy="close-button"]').click();
    });
@@ -42,16 +39,10 @@ describe('OHIF User Preferences', () => {

      // Visual comparison
      cy.screenshot(
-        'User Preferences Modal - General tab initial state in Study Viewer page'
+        'User Preferences Modal - General tab initial state in Study List page'
      );
-      cy.percyCanvasSnapshot(
-        'User Preferences Modal - General tab initial state in Study Viewer page'
-      );
-      // Select Spanish and Save
-      cy.get('#language-select').select('Spanish');
-      cy.get('@saveBtn')
-        .scrollIntoView()
-        .click();
+      // Set language to Spanish and save
+      cy.setLanguage('Spanish');

      // Header should be translated to Spanish
      cy.get('.research-use')
@@ -161,11 +152,8 @@ describe('OHIF User Preferences', () => {
      // Go to General tab
      cy.get('@userPreferencesGeneralTab').click();

-      // Select Spanish and Save
-      cy.get('#language-select').select('Spanish');
-      cy.get('@saveBtn')
-        .scrollIntoView()
-        .click();
+      // Set language to Spanish
+      cy.setLanguage('Spanish');

      // Go to Study Viewer page
      cy.openStudy('MISTER^MR');
@@ -191,7 +179,9 @@ describe('OHIF User Preferences', () => {
        .should('contain.text', 'Preferencias');

      // Check if new hotkey is working on viewport
-      cy.get('body').type('{shift}Q', { release: false });
+      cy.get('body').type('{shift}Q', {
+        release: false,
+      });
      cy.get('@viewportInfoMidTop').should('contains.text', 'R');
    });
  });
@@ -225,10 +215,7 @@ describe('OHIF User Preferences', () => {

      // Visual comparison
      cy.screenshot(
-        'User Preferences Modal - Hotkeys tab initial state in Study List page'
-      );
-      cy.percyCanvasSnapshot(
-        'User Preferences Modal - Hotkeys tab initial state in Study List page'
+        'User Preferences Modal - Hotkeys tab initial state in Study Viewer page'
      );
      cy.get('[data-cy="close-button"]').click(); //close User Preferences modal
    });
@@ -243,16 +230,10 @@ describe('OHIF User Preferences', () => {

      // Visual comparison
      cy.screenshot(
-        'User Preferences Modal - General tab initial state in Study List page'
+        'User Preferences Modal - General tab initial state in Study Viewer page'
      );
-      cy.percyCanvasSnapshot(
-        'User Preferences Modal - General tab initial state in Study List page'
-      );
-      // Select Spanish and Save
-      cy.get('#language-select').select('Spanish');
-      cy.get('@saveBtn')
-        .scrollIntoView()
-        .click();
+      // Set language to Spanish
+      cy.setLanguage('Spanish');

      // Header should be translated to Spanish
      cy.get('.research-use')
@@ -310,19 +291,11 @@ describe('OHIF User Preferences', () => {
      // Language dropdown should be displayed
      cy.get('#language-select').should('be.visible');

-      // Select Spanish and Save
-      cy.get('#language-select').select('Spanish');
-      cy.get('@saveBtn')
-        .scrollIntoView()
-        .click();
+      // Set language to Spanish
+      cy.setLanguage('Spanish');

-      //Open Preferences again
-      cy.get('[data-cy="options-menu"]')
-        .scrollIntoView()
-        .click();
-      cy.get('[data-cy="dd-item-menu"]')
-        .last()
-        .click();
+      // Open User Preferences modal
+      cy.openPreferences();

      // Go to general tab
      cy.get('@userPreferencesGeneralTab').click();
@@ -437,9 +410,7 @@ describe('OHIF User Preferences', () => {

      // Visual comparison
      cy.screenshot('Viewport Navigation - 2nd viewport inverted and rotated');
-      cy.percyCanvasSnapshot(
-        'Viewport Navigation - 2nd viewport inverted and rotated'
-      );
+
      // Set 1 viewport layout
      cy.setLayout(1, 1);
    });
@@ -23,8 +23,5 @@ describe('OHIF Microscopy Extension', () => {
    cy.wait(3000); //Waiting for image to render before taking the snapshot
    // Visual comparison
    cy.screenshot('Microscopy Extension - Should display loaded canvas');
-    cy.percyCanvasSnapshot(
-      'Microscopy Extension - Should display loaded canvas'
-    );
  });
 });
@@ -23,6 +23,5 @@ describe('OHIF PDF Extension', () => {
    // 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');
-    cy.percyCanvasSnapshot('PDF Extension - Should load PDF file');
  });
 });
@@ -57,9 +57,6 @@ describe('OHIF VTK Extension', () => {

    // Visual comparison
    cy.screenshot('VTK initial state - Should display toolbar and 3 viewports');
-    cy.percyCanvasSnapshot(
-      'VTK initial state - Should display toolbar and 3 viewports'
-    );
  });

  it('checks Crosshairs tool', () => {
@@ -75,9 +72,6 @@ describe('OHIF VTK Extension', () => {
    cy.screenshot(
      "VTK Crosshairs tool - Should display crosshairs' green lines"
    );
-    cy.percyCanvasSnapshot(
-      "VTK Crosshairs tool - Should display crosshairs' green lines"
-    );
  });

  /* TODO: Non-deterministic behavior (const expectedText = 'W: 350 L: -1044';)
@@ -101,7 +95,6 @@ describe('OHIF VTK Extension', () => {

    // Visual comparison
    cy.screenshot('VTK WWWC tool - Canvas should be bright');
-    cy.percyCanvasSnapshot('VTK WWWC tool - Canvas should be bright');
  }); */

  it('checks Rotate tool', () => {
@@ -117,6 +110,5 @@ describe('OHIF VTK Extension', () => {

    // Visual comparison
    cy.screenshot('VTK Rotate tool - Should rotate image');
-    cy.percyCanvasSnapshot('VTK Rotate tool - Should rotate image');
  });
 });
@@ -6,7 +6,8 @@ describe('OHIF Save Measurements', function() {

  beforeEach(() => {
    // Drags Study thumbnail into viewport
-    cy.get('[data-cy="thumbnail-list"]:nth-child(1)')
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('Rheuma')
      .scrollIntoView()
      .drag('.viewport-drop-target');

@@ -56,7 +57,9 @@ describe('OHIF Save Measurements', function() {
        cy.get('.sb-success').should('be.visible');

        // Reload the page
-        cy.reload();
+        cy.reload()
+          .wait(1000) //Wait page to load
+          .expectMinimumThumbnails(2); //wait all thumbnails to load

        //Verify that recently added measurement was retrieved
        cy.get('@measurementsBtn').click();
@@ -105,8 +108,7 @@ describe('OHIF Save Measurements', function() {
    cy.get('.sb-error')
      .should('be.visible')
      .and('contains.text', 'Error while saving the measurements');
-    // Close message overlay
-    cy.get('.sb-closeIcon').click();
+
    // Close Measurements panel
    cy.get('@measurementsBtn').click();
  });
@@ -135,7 +137,9 @@ describe('OHIF Save Measurements', function() {
      .and('contains.text', 'Measurements were saved with success');

    // Reload the page
-    cy.reload();
+    cy.reload()
+      .wait(1000) //Wait page to load
+      .expectMinimumThumbnails(2); //wait all thumbnails to load

    //Verify that measurement for unsupported tool was not saved
    cy.get('@measurementsBtn').click();
@@ -0,0 +1,33 @@
+describe('Visual Regression - OHIF Cornerstone Hotkeys', () => {
+  before(() => {
+    cy.openStudy('MISTER^MR');
+    cy.waitDicomImage();
+    cy.expectMinimumThumbnails(3);
+  });
+
+  beforeEach(() => {
+    cy.initCornerstoneToolsAliases();
+    cy.initCommonElementsAliases();
+    cy.resetViewport();
+  });
+
+  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');
+    cy.percyCanvasSnapshot('Hotkey I - Should Invert Image');
+  });
+
+  it('checks if hotkey "SPACEBAR" can reset the image', () => {
+    // Press multiples hotkeys
+    cy.get('body').type('V+++I');
+
+    // Hotkey SPACEBAR
+    cy.get('body').type(' ');
+
+    // Visual comparison to make sure the 'inverted' image was reset
+    cy.screenshot('Hotkey SPACEBAR - Should Reset Image');
+    cy.percyCanvasSnapshot('Hotkey SPACEBAR - Should Reset Image');
+  });
+});
@@ -0,0 +1,84 @@
+describe('Visual Regression - OHIF Cornerstone Toolbar', () => {
+  before(() => {
+    cy.openStudy('MISTER^MR');
+    cy.waitDicomImage();
+    cy.expectMinimumThumbnails(5);
+  });
+
+  beforeEach(() => {
+    cy.initCornerstoneToolsAliases();
+    cy.initCommonElementsAliases();
+    cy.resetViewport();
+  });
+
+  it('checks if Pan tool will move the image inside the viewport', () => {
+    //Click on button and vefiry if icon is active on toolbar
+    cy.get('@panBtn')
+      .click()
+      .then($panBtn => {
+        cy.wrap($panBtn).should('have.class', 'active');
+      });
+
+    cy.get('@viewport')
+      .trigger('mousedown', 'center', { which: 1 })
+      .trigger('mousemove', 'bottom', { which: 1 })
+      .trigger('mouseup', 'bottom');
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('Pan tool moved the image inside the viewport');
+  });
+
+  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.percyCanvasSnapshot('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();
+    //Verify if overlay is displayed
+    cy.get('.tooltip-toolbar-overlay')
+      .should('be.visible')
+      .then(() => {
+        //Click on Rotate button
+        cy.get('[data-cy="rotate right"]').click({ force: true });
+      });
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('Rotate tool - Should Rotate Image to Right');
+  });
+
+  it('check if Flip H tool will flip the image horizontally 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 Flip H button
+    cy.get('[data-cy="flip h"]').click();
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('Flip H tool - Should Flip Image on Y axis');
+  });
+
+  it('check if Flip V tool will flip the image vertically 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 Flip V button
+    cy.get('[data-cy="flip v"]').click();
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('Flip V tool - Should Flip Image on X axis');
+  });
+});
@@ -0,0 +1,50 @@
+describe('Visual Regression - OHIF Download Snapshot File', () => {
+  before(() => {
+    cy.openStudy('MISTER^MR');
+    cy.waitDicomImage();
+    cy.expectMinimumThumbnails(5);
+  });
+
+  beforeEach(() => {
+    cy.openDownloadImageModal();
+  });
+
+  afterEach(() => {
+    // Close modal
+    cy.get('[data-cy="close-button"]')
+      .scrollIntoView()
+      .click();
+  });
+
+  it('checks displayed information for Tablet experience', function() {
+    // Set Tablet resolution
+    cy.viewport(1000, 660);
+    // Visual comparison
+    cy.percyCanvasSnapshot('Download Image Modal - Tablet experience');
+  });
+
+  it('checks displayed information for Desktop experience', function() {
+    // Set Desktop resolution
+    cy.viewport(1750, 720);
+    // Visual comparison
+    cy.percyCanvasSnapshot('Download Image Modal - Desktop experience');
+  });
+
+  it('checks if "Show Annotations" checkbox will display annotations', function() {
+    // Close modal that is initially opened
+    cy.get('[data-cy="close-button"]').click();
+
+    // Add measurements in the viewport
+    cy.addLengthMeasurement();
+    cy.addAngleMeasurement();
+
+    // Open Modal
+    cy.openDownloadImageModal();
+    // Select "Show Annotations" option
+    cy.get('[data-cy="show-annotations"]').check();
+    // Check image preview
+    cy.get('[data-cy="image-preview"]').scrollIntoView();
+    // Visual comparison
+    cy.percyCanvasSnapshot('Download Image Modal - Show Annotations checked');
+  });
+});
@@ -0,0 +1,22 @@
+describe('Visual Regression - OHIF Microscopy Extension', () => {
+  before(() => {
+    cy.openStudyModality('SM');
+    cy.expectMinimumThumbnails(6);
+  });
+
+  it('drags and drop a SM thumbnail into viewport', () => {
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('SM')
+      .drag('.viewport-drop-target');
+
+    cy.get('.DicomMicroscopyViewer')
+      .its('length')
+      .should('be.eq', 1);
+
+    cy.wait(3000); //Waiting for image to render before taking the snapshot
+    // Visual comparison
+    cy.percyCanvasSnapshot(
+      'Microscopy Extension - Should display loaded canvas'
+    );
+  });
+});
@@ -0,0 +1,20 @@
+describe('Visual Regression - OHIF PDF Extension', () => {
+  before(() => {
+    cy.openStudy('Dummy');
+    cy.expectMinimumThumbnails(6);
+  });
+
+  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.percyCanvasSnapshot('PDF Extension - Should load PDF file');
+  });
+});
@@ -0,0 +1,92 @@
+describe('Visual Regression - OHIF VTK Extension', () => {
+  before(() => {
+    cy.openStudy('Bellona');
+    cy.waitDicomImage();
+    cy.expectMinimumThumbnails(5);
+
+    //Waiting for the desired thumbnail content to be displayed
+    cy.get('[data-cy="thumbnail-list"]').should($list => {
+      expect($list).to.contain('Chest 1x10 Soft');
+    });
+
+    // Drag and drop thumbnail into viewport
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('Chest 1x10 Soft')
+      .drag('.viewport-drop-target');
+
+    //Select 2D MPR button
+    cy.get('[data-cy="2d mpr"]').click();
+
+    //Wait Reformatting Images
+    cy.waitVTKReformatting();
+  });
+
+  beforeEach(() => {
+    cy.initVTKToolsAliases();
+    cy.wait(1000); //Wait toolbar to finish loading
+  });
+
+  afterEach(() => {
+    cy.wait(5000); //wait screen loads back after screenshot
+
+    //Select Exit 2D MPR button
+    cy.get('[data-cy="exit 2d mpr"]').should($btn => {
+      expect($btn).to.be.visible;
+      $btn.click();
+    });
+    //Select 2D MPR button
+    cy.get('[data-cy="2d mpr"]').click();
+  });
+
+  it('checks if VTK buttons are displayed on the toolbar', () => {
+    // Visual comparison
+    cy.percyCanvasSnapshot(
+      'VTK initial state - Should display toolbar and 3 viewports'
+    );
+  });
+
+  it('checks Crosshairs tool', () => {
+    cy.get('@crosshairsBtn').click();
+
+    // 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('mouseup');
+
+    // Visual comparison
+    cy.percyCanvasSnapshot(
+      "VTK Crosshairs tool - Should display crosshairs' green lines"
+    );
+  });
+
+  it('checks WWWC tool', () => {
+    cy.get('@wwwcBtn').click();
+
+    // 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', { which: 1 });
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('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('mousemove', 'top', { which: 1 })
+      .trigger('mousedown', 'center', { which: 1 })
+      .trigger('mousemove', 'top', { which: 1 })
+      .trigger('mouseup', { which: 1 });
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('VTK Rotate tool - Should rotate image');
+  });
+});
@@ -0,0 +1,23 @@
+//We excluded the tests for '**/studies/**' because the bulk/all of our other study/viewer tests use this route
+
+describe('Visual Regression - OHIF Routes', function() {
+  beforeEach(function() {
+    cy.openStudyList();
+  });
+
+  it('checks PT/CT json url study route', function() {
+    cy.visit(
+      '/viewer?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/JSON/PTCTStudy.json'
+    );
+
+    cy.server();
+    cy.route('GET', '**/PTCTStudy/**').as('getPTCTStudy');
+
+    cy.wait('@getPTCTStudy.all');
+    cy.get('@getPTCTStudy').should($route => {
+      expect($route.status).to.be.eq(200);
+    });
+
+    cy.percyCanvasSnapshot('PT/CT json study route');
+  });
+});
@@ -0,0 +1,35 @@
+describe('Visual Regression - OHIF Study Viewer Page', function() {
+  before(function() {
+    cy.openStudy('MISTER^MR');
+    cy.waitDicomImage();
+    cy.expectMinimumThumbnails(6);
+  });
+
+  beforeEach(function() {
+    cy.initCommonElementsAliases();
+    cy.resetViewport();
+  });
+
+  it('checks if series thumbnails are being displayed', function() {
+    cy.percyCanvasSnapshot('Series Thumbnails - Should Display Thumbnails');
+  });
+
+  it('opens About modal and verify the displayed information', function() {
+    cy.get('[data-cy="options-menu"]')
+      .first()
+      .click();
+    cy.get('[data-cy="dd-item-menu"]')
+      .first()
+      .click();
+    cy.get('[data-cy="about-modal"]')
+      .as('aboutOverlay')
+      .should('be.visible');
+
+    // Visual comparison
+    cy.percyCanvasSnapshot('About modal - Should display modal');
+
+    //close modal
+    cy.get('[data-cy="close-button"]').click();
+    cy.get('@aboutOverlay').should('not.be.enabled');
+  });
+});
@@ -0,0 +1,188 @@
+describe('Visual Regression - OHIF User Preferences', () => {
+  context('Study List Page', function() {
+    before(() => {
+      cy.visit('/');
+    });
+
+    beforeEach(() => {
+      // Open User Preferences modal
+      cy.openPreferences();
+      cy.initPreferencesModalAliases();
+    });
+
+    it('checks displayed information on User Preferences modal', function() {
+      cy.get('@restoreBtn').scrollIntoView();
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - Hotkeys tab initial state in StudyList page'
+      );
+      cy.get('[data-cy="close-button"]').click();
+    });
+
+    it('checks translation by selecting Spanish language', function() {
+      cy.get('@userPreferencesGeneralTab')
+        .click()
+        .should('have.class', 'active');
+
+      // Language dropdown should be displayed
+      cy.get('#language-select').should('be.visible');
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - General tab initial state in StudyList page'
+      );
+      // Set language to Spanish and save
+      cy.setLanguage('Spanish');
+
+      // Options menu should be translated
+      cy.get('[data-cy="options-menu"]')
+        .should('have.text', 'Opciones')
+        .click();
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - Spanish selected in StudyList page'
+      );
+
+      // Close Options menu
+      cy.get('[data-cy="options-menu"]').click();
+    });
+  });
+
+  context('Study Viewer Page', function() {
+    before(() => {
+      cy.openStudy('MISTER^MR');
+      cy.expectMinimumThumbnails(5);
+    });
+
+    beforeEach(() => {
+      cy.initCommonElementsAliases();
+      cy.resetViewport();
+
+      cy.resetUserHoktkeyPreferences();
+      // Open User Preferences modal
+      cy.openPreferences();
+    });
+
+    it('checks displayed information on User Preferences modal', function() {
+      cy.get('@restoreBtn').scrollIntoView();
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - Hotkeys tab initial state in StudyViewer page'
+      );
+      cy.get('[data-cy="close-button"]').click(); //close User Preferences modal
+    });
+
+    it('checks translation by selecting Spanish language', function() {
+      cy.get('@userPreferencesGeneralTab')
+        .click()
+        .should('have.class', 'active');
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - General tab initial state in StudyViewer page'
+      );
+      // Set language to Spanish
+      cy.setLanguage('Spanish');
+
+      // Options menu should be translated
+      cy.get('[data-cy="options-menu"]')
+        .should('have.text', 'Opciones')
+        .click();
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - Spanish selected in StudyViewer page'
+      );
+
+      // Close Options menu
+      cy.get('[data-cy="options-menu"]').click();
+    });
+
+    it('checks if user can restore to default the language selection and application will be in English', function() {
+      cy.get('@userPreferencesGeneralTab')
+        .click()
+        .should('have.class', 'active');
+
+      // Set language to Spanish
+      cy.setLanguage('Spanish');
+
+      // Open User Preferences modal
+      cy.openPreferences();
+
+      // Go to general tab
+      cy.get('@userPreferencesGeneralTab').click();
+
+      cy.get('@restoreBtn')
+        .scrollIntoView()
+        .click();
+
+      cy.get('@saveBtn')
+        .scrollIntoView()
+        .click();
+
+      // Options menu should be in English
+      cy.get('[data-cy="options-menu"]')
+        .should('have.text', 'Options')
+        .click();
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'User Preferences Modal - English selected in StudyViewer page'
+      );
+
+      // Close Options menu
+      cy.get('[data-cy="options-menu"]').click();
+    });
+
+    it('checks new hotkeys for "Next" and "Previous" Image on Viewport', function() {
+      // Go go hotkeys tab
+      cy.get('@userPreferencesHotkeysTab')
+        .click()
+        .should('have.class', 'active');
+
+      // Set new hotkey for 'Next Image Viewport' function
+      cy.setNewHotkeyShortcutOnUserPreferencesModal(
+        'Next Image Viewport',
+        '{shift}{rightarrow}'
+      );
+
+      // Set new hotkey for 'Previous Image Viewport' function
+      cy.setNewHotkeyShortcutOnUserPreferencesModal(
+        'Previous Image Viewport',
+        '{shift}{leftarrow}'
+      );
+
+      // Save new hotkeys
+      cy.get('@saveBtn')
+        .scrollIntoView()
+        .click();
+
+      // Set 3 viewports layout
+      cy.setLayout(3, 1);
+      cy.waitViewportImageLoading();
+
+      // Rotate Right and Invert colors on Viewport #1
+      cy.get('body').type('RI');
+
+      //Move to Next Viewport
+      cy.get('body').type('{shift}{rightarrow}');
+      // Rotate Left and Invert colors on Viewport #2
+      cy.get('body').type('LI');
+
+      //Move to Previous Viewport
+      cy.get('body').type('{shift}{leftarrow}');
+      // Reset viewport #1 with spacebar hotkey
+      cy.get('body').type(' ');
+
+      // Visual comparison
+      cy.percyCanvasSnapshot(
+        'Viewport Navigation - 2nd viewport inverted and rotated'
+      );
+      // Set 1 viewport layout
+      cy.setLayout(1, 1);
+    });
+  });
+});
@@ -168,7 +168,7 @@ Cypress.Commands.add(
 );

 Cypress.Commands.add('expectMinimumThumbnails', (seriesToWait = 1) => {
-  cy.get('[data-cy=thumbnail-list]', { timeout: 10000 }).should($itemList => {
+  cy.get('[data-cy=thumbnail-list]', { timeout: 20000 }).should($itemList => {
    expect($itemList.length >= seriesToWait).to.be.true;
  });
 });
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "3.3.7",
+  "version": "3.4.2",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -27,7 +27,7 @@
    "dev:viewer": "yarn run dev",
    "start": "yarn run dev",
    "test:e2e": "cypress open",
-    "test:e2e:ci": "percy exec -- cypress run --record --browser chrome",
+    "test:e2e:ci": "percy exec -- cypress run --config video=false --record --browser chrome --spec 'cypress/integration/visual-regression/**/*'",
    "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",
@@ -45,6 +45,7 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
+    "@ffmpeg-installer/ffmpeg": "1.0.20",
    "@ohif/core": "^2.3.2",
    "@ohif/extension-cornerstone": "^2.2.1",
    "@ohif/extension-dicom-html": "^1.1.0",
@@ -2,6 +2,7 @@ window.config = {
  routerBasename: '/',
  whiteLabelling: {},
  enableGoogleCloudAdapter: true,
+  healthcareApiEndpoint: 'https://healthcare.googleapis.com/v1beta1',
  servers: {
    // This is an array, but we'll only use the first entry for now
    dicomWeb: [],
@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { metadata, studies, utils, log } from '@ohif/core';
+import usePrevious from '../customHooks/usePrevious';

 import ConnectedViewer from './ConnectedViewer.js';
 import PropTypes from 'prop-types';
@@ -128,9 +129,9 @@ const _addSeriesToStudy = (studyMetadata, series) => {
 const _updateMetaDataManager = (study, studyMetadata, series) => {
  updateMetaDataManager(study, series);

-  const { studyInstanceUID } = study;
+  const { studyInstanceUid } = study;

-  if (!studyMetadataManager.get(studyInstanceUID)) {
+  if (!studyMetadataManager.get(studyInstanceUid)) {
    studyMetadataManager.add(studyMetadata);
  }
 };
@@ -314,9 +315,15 @@ function ViewerRetrieveStudyData({
    }
  };

+  const prevStudyInstanceUids = usePrevious(studyInstanceUids);
+
  useEffect(() => {
-    studyMetadataManager.purge();
-    purgeCancellablePromises();
+    const hasStudyInstanceUidsChanged = !(prevStudyInstanceUids && prevStudyInstanceUids.every(e => studyInstanceUids.includes(e)));
+
+    if (hasStudyInstanceUidsChanged) {
+      studyMetadataManager.purge();
+      purgeCancellablePromises();
+    }
  }, [studyInstanceUids]);

  useEffect(() => {
@@ -18,6 +18,7 @@ const getActiveServer = servers => {
 const getServers = (appConfig, project, location, dataset, dicomStore) => {
  let servers = [];
  if (appConfig.enableGoogleCloudAdapter) {
+    GoogleCloudApi.urlBase = appConfig.healthcareApiEndpoint;
    const pathUrl = GoogleCloudApi.getUrlBaseDicomWeb(
      project,
      location,
@@ -15,7 +15,11 @@ class GoogleCloudApi {
  }

  get urlBase() {
-    return `https://healthcare.googleapis.com/v1beta1`;
+    return this.healthcareApiEndpoint || 'https://healthcare.googleapis.com/v1beta1';
+  }
+
+  set urlBase(url) {
+    this.healthcareApiEndpoint = url;
  }

  get urlBaseProject() {
Author	SHA1	Message	Date
ohif-bot	1d02f5485f	chore(release): publish [skip ci] - @ohif/viewer@3.4.2	2020-01-17 22:45:01 +00:00
Mirna Silva	4c9a977920	Merge pull request #1382 from OHIF/mirna/test/visual-tests Percy fix for CI failure	2020-01-17 19:43:19 -03:00
Mirna Silva	b5db09c25e	Merge pull request #1383 from mirnasilva/percy-ci-fix Percy ci fix	2020-01-17 19:14:16 -03:00
Mirna Silva	8dc4a5b82a	Merge branch 'percy-ci-fix' of https://github.com/mirnasilva/Viewers into percy-ci-fix	2020-01-17 16:36:08 -03:00
Mirna Silva	44add9ce2f	Fix for save measurements failure	2020-01-17 16:35:26 -03:00
Mirna Silva	c19eceeede	Merge pull request #1381 from mirnasilva/percy-ci-fix Percy tests - fix for CI failure	2020-01-17 14:46:43 -03:00
Mirna Silva	72bc5a5ae5	Merge branch 'master' into percy-ci-fix	2020-01-17 14:45:13 -03:00
Mirna Silva	dfdf46dbdd	fix for CI failure	2020-01-17 14:31:53 -03:00
ohif-bot	571dff2c09	chore(release): publish [skip ci] - @ohif/viewer@3.4.1	2020-01-15 14:16:43 +00:00
Gustavo André Lelis	b9a66d4424	fix: 🐛 Metadata is being mistakenly purged (#1360 ) Closes: #1326	2020-01-15 09:15:10 -05:00
ohif-bot	7ab2e3e60d	chore(release): publish [skip ci] - @ohif/viewer@3.4.0	2020-01-14 15:26:35 +00:00
mukhlin	a5d6bc6a51	feat: Custom Healthcare API endpoint (#1367 ) * Add ability to configure Google Cloud Healthcare API endpoint. * Fixed bug in script. * Fixed PR remark. * Set Healthcare API endpoint in proper place.	2020-01-14 10:22:53 -05:00
ohif-bot	df612ca4a0	chore(release): publish [skip ci] - @ohif/viewer@3.3.8	2020-01-10 18:00:27 +00:00
Mirna Silva	a91ce57c43	Merge pull request #1363 from OHIF/task/improveVisualTest Task/improve visual tests. Related to PR #1327	2020-01-10 14:57:33 -03:00
Mirna Silva	342884f83e	Merge pull request #1327 from mirnasilva/1320_ImproveVisualRegression E2E test: Percy visual regression improvements	2020-01-10 14:30:01 -03:00
Mirna Silva	0fb39bad84	Changes on config file	2020-01-10 14:18:20 -03:00
Mirna Silva	c74c80bb6f	Fix for VTK test	2020-01-09 16:46:29 -03:00
Mirna Silva	910d5c65d5	Changing RELEASE config to run only percy tests	2020-01-09 16:17:22 -03:00
Mirna Silva	d0fb4843ab	Changing screenshot paths back to original	2020-01-09 15:29:39 -03:00
Mirna Silva	f488b857fe	Merge branch '1320_ImproveVisualRegression' of https://github.com/mirnasilva/Viewers into 1320_ImproveVisualRegression	2020-01-09 14:50:40 -03:00
Mirna Silva	256e8b1116	Merge branch 'master' into 1320_ImproveVisualRegression	2020-01-09 14:49:42 -03:00
Mirna Silva	168dd87747	Merge branch 'master' of https://github.com/mirnasilva/Viewers into 1320_ImproveVisualRegression	2020-01-08 15:21:43 -03:00
Mirna Silva	67f58f5f09	Added dependency ffmpeg-installer	2020-01-07 19:09:04 -03:00
Mirna Silva	dfc35885bb	Changed record to false	2020-01-07 18:28:16 -03:00
Mirna Silva	e9c449d1db	Changed path for cypress/videos	2020-01-07 18:07:20 -03:00
Mirna Silva	6dac50c7c6	Improvements on VTK visual tests 2	2020-01-07 17:23:35 -03:00
Mirna Silva	9be54f6164	Improvements on VTK visual tests	2020-01-07 16:52:28 -03:00
Mirna Silva	341cc5a4eb	Merge branch 'master' into 1320_ImproveVisualRegression	2020-01-06 19:07:20 -03:00
Mirna Silva	7b80171203	Removing unnecessary screenshots	2020-01-06 18:54:09 -03:00
Mirna Silva	ab0af86379	Merge branch '1320_ImproveVisualRegression' of https://github.com/mirnasilva/Viewers into 1320_ImproveVisualRegression	2020-01-06 17:09:24 -03:00
Mirna Silva	86426cb024	Changed command CI line for diff test paths	2020-01-06 17:08:00 -03:00
Mirna Silva	348840ef26	Merge branch 'master' of https://github.com/mirnasilva/Viewers into 1320_ImproveVisualRegression	2020-01-06 16:20:11 -03:00
Mirna Silva	52ef934961	Merge branch 'master' into 1320_ImproveVisualRegression	2020-01-06 14:48:30 -03:00
Mirna Silva	4ee2b135a7	Added more tests and updated CI config.yml	2019-12-24 01:17:02 -03:00
Mirna Silva	388fe04e09	E2E test: Percy visua regression improvements	2019-12-23 23:10:55 -03:00