chore(release): publish [skip ci]

- @ohif/extension-cornerstone@1.3.1 - @ohif/extension-vtk@0.52.3 - @ohif/ui@0.53.2 - @ohif/viewer@1.5.1
fix: 🐛 set current viewport as active when switching layouts (#1018 )
2019-10-09 19:55:40 +00:00 · 2019-10-09 15:37:26 -04:00 · 2019-10-09 15:30:00 -04:00 · 2019-10-09 12:57:24 -04:00
15 changed files with 173 additions and 128 deletions
@@ -142,8 +142,8 @@ jobs:
    steps:
      - attach_workspace:
          at: ~/repo
-      - setup_remote_docker:
-          docker_layer_caching: true
+#     - setup_remote_docker:
+#         docker_layer_caching: true
      - run:
          name: Build and push Docker image
          command: |
@@ -198,8 +198,8 @@ jobs:
    steps:
      - attach_workspace:
          at: ~/repo
-      - setup_remote_docker:
-          docker_layer_caching: true
+#     - setup_remote_docker:
+#         docker_layer_caching: true
      - run:
          name: Deploy latest version to viewer.ohif.org
          command: |
@@ -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.3.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.3.0...@ohif/extension-cornerstone@1.3.1) (2019-10-09)
+
+
+### Bug Fixes
+
+* 🐛 set tools bidirectional, eraser and annotate command ([#1020](https://github.com/OHIF/Viewers/issues/1020)) ([a28984e](https://github.com/OHIF/Viewers/commit/a28984e))
+
+
+
+
+
 # [1.3.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.5...@ohif/extension-cornerstone@1.3.0) (2019-10-09)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "1.3.0",
+  "version": "1.3.1",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -74,7 +74,7 @@ const definitions = [
    label: 'Annotate',
    icon: 'measure-non-target',
    //
-    type: TOOLBAR_BUTTON_TYPES.COMMAND,
+    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
    commandName: 'setToolActive',
    commandOptions: { toolName: 'ArrowAnnotate' },
  },
@@ -200,7 +200,7 @@ const definitions = [
        label: 'Bidirectional',
        icon: 'measure-target',
        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
+        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
        commandName: 'setToolActive',
        commandOptions: { toolName: 'Bidirectional' },
      },
@@ -209,7 +209,7 @@ const definitions = [
        label: 'Eraser',
        icon: 'eraser',
        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
+        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
        commandName: 'setToolActive',
        commandOptions: { toolName: 'Eraser' },
      },
@@ -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.

+## [0.52.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.52.2...@ohif/extension-vtk@0.52.3) (2019-10-09)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [0.52.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.52.1...@ohif/extension-vtk@0.52.2) (2019-10-09)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "0.52.2",
+  "version": "0.52.3",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -52,7 +52,7 @@
  },
  "devDependencies": {
    "@ohif/core": "^1.2.0",
-    "@ohif/ui": "^0.53.1",
+    "@ohif/ui": "^0.53.2",
    "cornerstone-tools": "^4.0.9",
    "cornerstone-wado-image-loader": "^3.0.0",
    "dcmjs": "^0.6.1",
@@ -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.

+## [0.53.2](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.53.1...@ohif/ui@0.53.2) (2019-10-09)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
 ## [0.53.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.53.0...@ohif/ui@0.53.1) (2019-10-04)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "0.53.1",
+  "version": "0.53.2",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -35,7 +35,7 @@ class StudyBrowser extends Component {
          );
        } else {
          return (
-            <div className="ThumbnailEntryContainer">
+            <div className="ThumbnailEntryContainer" data-cy="thumbnail-list">
              <ThumbnailEntry
                key={thumb.displaySetInstanceUid}
                {...study}
@@ -45,7 +45,7 @@ class ThumbnailEntryDragSource extends Component {
    const dropEffect = 'copy';

    return connectDragSource(
-      <div className="ThumbnailEntryContainer">
+      <div className="ThumbnailEntryContainer" data-cy="thumbnail-list">
        <DragPreview {...this.props} />
        <ThumbnailEntry {...this.props} />
      </div>,
@@ -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.5.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.5.0...@ohif/viewer@1.5.1) (2019-10-09)
+
+
+### Bug Fixes
+
+* 🐛 set current viewport as active when switching layouts ([#1018](https://github.com/OHIF/Viewers/issues/1018)) ([2a74355](https://github.com/OHIF/Viewers/commit/2a74355))
+
+
+
+
+
 # [1.5.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.4.5...@ohif/viewer@1.5.0) (2019-10-09)


@@ -1,47 +1,48 @@
-
 describe('OHIF Study Viewer Page', () => {
-  
  before(() => {
-      cy.openStudy("MISTER^MR");
-    });
-  
-    it('checks if series thumbnails are being displayed', ()=> {
-      cy.get('.ThumbnailEntryContainer')
+    cy.openStudy('MISTER^MR');
+    cy.waitDicomImage();
+  });
+
+  it('checks if series thumbnails are being displayed', () => {
+    cy.get('[data-cy="thumbnail-list"]')
      .its('length')
      .should('be.gt', 1);
-    });
-
-    it('drags and drop a series thumbnail into viewport', () => {
-      cy.get('.ThumbnailEntryContainer:nth-child(2)') //element to be dragged
-        .drag('.cornerstone-canvas'); //dropzone element
-      
-      const overlaySeriesInformation = 'div.ViewportOverlay > div.bottom-left.overlay-element > div';
-      const expectedText = 'Ser: 2Img: 1 1/13512 x 512Loc: -17.60 mm Thick: 3.00 mm';
-        
-      cy.get(overlaySeriesInformation)
-        .should('have.text', expectedText);
-    });
-
-    it('checks if Series left panel can be hidden/displayed', ()=> {
-      const seriesButton = '.pull-left > .RoundedButtonGroup > .roundedButtonWrapper > .roundedButton';
-      const leftPanel = 'section.sidepanel.from-left';
-
-      cy.get(seriesButton).click(); 
-      cy.get(leftPanel).should('not.be.enabled')
-
-      cy.get(seriesButton).click();
-      cy.get(leftPanel).should('be.visible');
-    });
-
-    it('checks if Measurements right panel can be hidden/displayed', ()=> {
-      const measurementsButton = '.pull-right > .RoundedButtonGroup > .roundedButtonWrapper > .roundedButton';
-      const rightPanel = 'section.sidepanel.from-right';
-
-      cy.get(measurementsButton).click();
-      cy.get(rightPanel).should('be.visible');
-      
-      cy.get(measurementsButton).click();
-      cy.get(rightPanel).should('not.be.enabled');
-    });
-
  });
+
+  it('drags and drop a series thumbnail into viewport', () => {
+    cy.get('[data-cy="thumbnail-list"]:nth-child(2)') //element to be dragged
+      .drag('.cornerstone-canvas'); //dropzone element
+
+    const overlaySeriesInformation =
+      'div.ViewportOverlay > div.bottom-left.overlay-element > div';
+    const expectedText =
+      'Ser: 2Img: 1 1/13512 x 512Loc: -17.60 mm Thick: 3.00 mm';
+
+    cy.get(overlaySeriesInformation).should('have.text', expectedText);
+  });
+
+  it('checks if Series left panel can be hidden/displayed', () => {
+    const seriesButton =
+      '.pull-left > .RoundedButtonGroup > .roundedButtonWrapper > .roundedButton';
+    const leftPanel = 'section.sidepanel.from-left';
+
+    cy.get(seriesButton).click();
+    cy.get(leftPanel).should('not.be.enabled');
+
+    cy.get(seriesButton).click();
+    cy.get(leftPanel).should('be.visible');
+  });
+
+  it('checks if Measurements right panel can be hidden/displayed', () => {
+    const measurementsButton =
+      '.pull-right > .RoundedButtonGroup > .roundedButtonWrapper > .roundedButton';
+    const rightPanel = 'section.sidepanel.from-right';
+
+    cy.get(measurementsButton).click();
+    cy.get(rightPanel).should('be.visible');
+
+    cy.get(measurementsButton).click();
+    cy.get(rightPanel).should('not.be.enabled');
+  });
+});
@@ -1,6 +1,6 @@
-import { DragSimulator } from "../helpers/DragSimulator.js";
-import { doesNotReject } from "assert";
-import { disconnect } from "cluster";
+import { DragSimulator } from '../helpers/DragSimulator.js';
+import { doesNotReject } from 'assert';
+import { disconnect } from 'cluster';

 // ***********************************************
 // This example commands.js shows you how to
@@ -28,21 +28,19 @@ import { disconnect } from "cluster";
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

-Cypress.Commands.add('openStudy', (patientName) => {
-    cy.visit('/');
-    cy.get('#patientName')
-      .type(patientName);
+Cypress.Commands.add('openStudy', patientName => {
+  cy.visit('/');
+  cy.get('#patientName').type(patientName);

-    cy.get('.studylistStudy > .patientName').as('patientResult')
-      .then({ timeout: 5000 }, ($patientResult) => {
-        cy.contains(patientName)
-        .click();
-      })
-  }
-);
+  cy.get('.studylistStudy > .patientName')
+    .as('patientResult')
+    .then({ timeout: 5000 }, $patientResult => {
+      cy.contains(patientName).click();
+    });
+});

-Cypress.Commands.add('drag', {prevSubject: 'element',},
-  (...args) => DragSimulator.simulate(...args)
+Cypress.Commands.add('drag', { prevSubject: 'element' }, (...args) =>
+  DragSimulator.simulate(...args)
 );

 /**
@@ -53,20 +51,18 @@ Cypress.Commands.add('drag', {prevSubject: 'element',},
 * @param {number[]} firstClick - Click position [x, y]
 * @param {number[]} secondClick - Click position [x, y]
 */
-Cypress.Commands.add('addLine', (viewport, firstClick, secondClick) =>  {
-
-  cy.get(viewport).then(($viewport) => {
-    const [ x1, y1 ] = firstClick;
-    const [ x2, y2 ] = secondClick;
+Cypress.Commands.add('addLine', (viewport, firstClick, secondClick) => {
+  cy.get(viewport).then($viewport => {
+    const [x1, y1] = firstClick;
+    const [x2, y2] = secondClick;

    cy.wrap($viewport)
-      .click(x1, y1, {force: true})
-      .trigger('mousemove', {clientX:x2, clientY:y2})
-      .click(x2, y2, {force: true})
+      .click(x1, y1, { force: true })
+      .trigger('mousemove', { clientX: x2, clientY: y2 })
+      .click(x2, y2, { force: true });
  });
 });

-
 /**
 * Command to perform three clicks into three different positions. Each position must be [x, y].
 * The positions are considering the element as reference, therefore, top-left of the element will be (0, 0).
@@ -76,62 +72,66 @@ Cypress.Commands.add('addLine', (viewport, firstClick, secondClick) =>  {
 * @param {number[]} secondClick - Click position [x, y]
 * @param {number[]} thirdClick - Click position [x, y]
 */
-Cypress.Commands.add('addAngle', (viewport, firstClick, secondClick, thirdClick) =>  {
-
-  cy.get(viewport).then(($viewport) => {
-    const [ x1, y1 ] = firstClick;
-    const [ x2, y2 ] = secondClick;
-    const [ x3, y3 ] = thirdClick;
-
-    cy.wrap($viewport)
-      .click(x1, y1, {force: true})
-      .trigger('mousemove', {clientX:x2, clientY:y2})
-      .click(x2, y2, {force: true})
-      .trigger('mousemove', {clientX:x3, clientY:y3})
-      .click(x3, y3, {force: true})
-  });
-});
+Cypress.Commands.add(
+  'addAngle',
+  (viewport, firstClick, secondClick, thirdClick) => {
+    cy.get(viewport).then($viewport => {
+      const [x1, y1] = firstClick;
+      const [x2, y2] = secondClick;
+      const [x3, y3] = thirdClick;

+      cy.wrap($viewport)
+        .click(x1, y1, { force: true })
+        .trigger('mousemove', { clientX: x2, clientY: y2 })
+        .click(x2, y2, { force: true })
+        .trigger('mousemove', { clientX: x3, clientY: y3 })
+        .click(x3, y3, { force: true });
+    });
+  }
+);

 //Command to wait DICOM image to load into the viewport
-Cypress.Commands.add('waitDicomImage', (timeout = 10000) => {
+Cypress.Commands.add('waitDicomImage', (timeout = 20000) => {
  cy.window()
    .its('cornerstone')
-    .then($cornerstone => {
+    .then({ timeout }, $cornerstone => {
      return new Cypress.Promise(resolve => {
-            const onEvent = (renderedEvt) => {
-            const element = renderedEvt.detail.element;
+        const onEvent = renderedEvt => {
+          const element = renderedEvt.detail.element;

-            element.removeEventListener('cornerstoneimagerendered', onEvent);
-            $cornerstone.events.removeEventListener('cornerstoneimagerendered', onEvent);
-              resolve();
-          }
-          const onEnabled = (enabledEvt) => {
-              const element = enabledEvt.detail.element;
-              
-                element.addEventListener('cornerstoneimagerendered', onEvent);
-          }
-          $cornerstone.events.addEventListener('cornerstoneelementenabled', onEnabled);
+          element.removeEventListener('cornerstoneimagerendered', onEvent);
+          $cornerstone.events.removeEventListener(
+            'cornerstoneimagerendered',
+            onEvent
+          );
+          resolve();
+        };
+        const onEnabled = enabledEvt => {
+          const element = enabledEvt.detail.element;
+
+          element.addEventListener('cornerstoneimagerendered', onEvent);
+        };
+        $cornerstone.events.addEventListener(
+          'cornerstoneelementenabled',
+          onEnabled
+        );
+      });
    });
-  });
-
 });

-
 //Command to reset the viewport changes throught the cornerstone method
 Cypress.Commands.add('resetViewport', () => {
-  cy.get('@resetBtn').click()
+  cy.get('@resetBtn').click();
 });

-
 Cypress.Commands.add('imageZoomIn', () => {
  cy.get('@zoomBtn').click();

  //drags the mouse inside the viewport to be able to interact with series
  cy.get('@viewport')
-  .trigger('mousedown', 'top', { which: 1 })
-  .trigger('mousemove', 'center', { which: 1 })
-  .trigger('mouseup');
+    .trigger('mousedown', 'top', { which: 1 })
+    .trigger('mousemove', 'center', { which: 1 })
+    .trigger('mouseup');
 });

 Cypress.Commands.add('imageContrast', () => {
@@ -139,7 +139,7 @@ Cypress.Commands.add('imageContrast', () => {

  //drags the mouse inside the viewport to be able to interact with series
  cy.get('@viewport')
-  .trigger('mousedown', 'center', { which: 1 })
-  .trigger('mousemove', 'top', { which: 1 })
-  .trigger('mouseup');
-});
+    .trigger('mousedown', 'center', { which: 1 })
+    .trigger('mousemove', 'top', { which: 1 })
+    .trigger('mouseup');
+});
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "1.5.0",
+  "version": "1.5.1",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -51,9 +51,9 @@
    "@ohif/extension-dicom-html": "^1.0.0",
    "@ohif/extension-dicom-microscopy": "^0.50.6",
    "@ohif/extension-dicom-pdf": "^1.0.0",
-    "@ohif/extension-vtk": "^0.52.2",
+    "@ohif/extension-vtk": "^0.52.3",
    "@ohif/i18n": "^0.50.5",
-    "@ohif/ui": "^0.53.1",
+    "@ohif/ui": "^0.53.2",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
@@ -2,18 +2,19 @@ import { LayoutButton } from '@ohif/ui';
 import OHIF from '@ohif/core';
 import { connect } from 'react-redux';

-const { setLayout } = OHIF.redux.actions;
+const { setLayout, setViewportActive } = OHIF.redux.actions;

 const mapStateToProps = state => {
  return {
    currentLayout: state.viewports.layout,
+    activeViewportIndex: state.viewports.activeViewportIndex
  };
 };

 const mapDispatchToProps = dispatch => {
  return {
    // TODO: Change if layout switched becomes more complex
-    onChange: (selectedCell, currentLayout) => {
+    onChange: (selectedCell, currentLayout, activeViewportIndex) => {
      let viewports = [];
      const rows = selectedCell.row + 1;
      const columns = selectedCell.col + 1;
@@ -36,6 +37,11 @@ const mapDispatchToProps = dispatch => {
        viewports,
      };

+      const maxActiveIndex = rows * columns - 1;
+      if (activeViewportIndex > maxActiveIndex) {
+        dispatch(setViewportActive(0));
+      }
+
      dispatch(setLayout(layout));
    },
  };
@@ -43,10 +49,10 @@ const mapDispatchToProps = dispatch => {

 const mergeProps = (propsFromState, propsFromDispatch) => {
  const onChangeFromDispatch = propsFromDispatch.onChange;
-  const { currentLayout } = propsFromState;
+  const { currentLayout, activeViewportIndex } = propsFromState;

  return {
-    onChange: (selectedCell) => onChangeFromDispatch(selectedCell, currentLayout)
+    onChange: selectedCell => onChangeFromDispatch(selectedCell, currentLayout, activeViewportIndex)
  };
 }
Author	SHA1	Message	Date
ohif-bot	cb2088daf7	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.3.1 - @ohif/extension-vtk@0.52.3 - @ohif/ui@0.53.2 - @ohif/viewer@1.5.1	2019-10-09 19:55:40 +00:00
Igor Octaviano	2a743554b6	fix: 🐛 set current viewport as active when switching layouts (#1018 ) * fix: 🐛 set current viewport as active when switching layouts check if current viewport index is less than the current layout lenght and set 0 if so or keep current selected cell index as active viewport Closes: 999 * chore: 🤖 commenting out docker layer caching in the short-term commenting out docker layer caching in the short-term * refactor: 💡 refactor layout matrix index conditional	2019-10-09 15:37:26 -04:00
Igor Octaviano	a28984ef1f	fix: 🐛 set tools bidirectional, eraser and annotate command (#1020 ) annotate, bidirectional and eraser had types as command but they should be typed as setToolActive Closes: 981	2019-10-09 15:30:00 -04:00
Rodrigo Antinarelli	95e5e11d09	test: E2E Tests - Thumbnail loading (#1017 ) * fix: E2E Tests - Thumbnail loading * rename data-cy attr	2019-10-09 12:57:24 -04:00