chore(release): publish [skip ci]

- @ohif/viewer@1.1.4
test: [TEST E2E] Drag and drop thumbnail into viewport (#904 )
2019-09-17 01:39:08 +00:00 · 2019-09-16 21:26:14 -04:00 · 2019-09-16 13:53:41 -04:00 · 2019-09-16 12:53:05 -04:00 · 2019-09-16 14:41:16 +00:00 · 2019-09-16 10:26:59 -04:00
24 changed files with 264 additions and 30 deletions
@@ -234,13 +234,16 @@ workflows:
            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
                add wait-on' # Use yarn latest
          yarn: true
-          store_artifacts: true
+          store_artifacts: false
          working_directory: platform/viewer
          build: yarn run build
          start: yarn run test:e2e:dist
          wait-on: 'http://localhost:3000'
          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
+          post-steps:
+            - store_artifacts:
+                path: platform/viewer/cypress/screenshots
          requires:
            - UNIT_TESTS
      # E2E: script-tag
@@ -250,13 +253,16 @@ workflows:
            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
                add wait-on' # Use yarn latest
          yarn: true
-          store_artifacts: true
+          store_artifacts: false
          working_directory: platform/viewer
          build: yarn run build:package
          start: yarn run test:e2e:dist
          wait-on: 'http://localhost:3000'
          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
+          post-steps:
+            - store_artifacts:
+                path: platform/viewer/cypress/screenshots
          requires:
            - UNIT_TESTS

@@ -286,6 +292,8 @@ workflows:
          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
          post-steps:
+            - store_artifacts:
+                path: platform/viewer/cypress/screenshots
            - store_test_results:
                path: cypress/results
          requires:
@@ -297,7 +305,7 @@ workflows:
            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
                add wait-on' # Use yarn latest
          yarn: true
-          store_artifacts: true
+          store_artifacts: false
          working_directory: platform/viewer
          build: yarn run build:package
          start: yarn run test:e2e:dist
@@ -305,6 +313,8 @@ workflows:
          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
          no-workspace: true # Don't persist workspace
          post-steps:
+            - store_artifacts:
+                path: platform/viewer/cypress/screenshots
            - store_test_results:
                path: cypress/results
          requires:
@@ -7,13 +7,13 @@ daysUntilStale: 21
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - 'Story 🙌'
+  - 'Story :raised_hands:'
  - 'Bug: Verified 🐛'
  - 'Task: CI/Tooling 🤖'
  - 'Task: Docs 📖'
  - 'Task: Docs :book:'
  - 'Task: Refactor 🛠'
-  - 'Task: Tests 🔬'
+  - 'Task: Tests :microscope:'
  - 'PR: Awaiting Review 👀'
  - 'Triage 🏳️'
  - 'Announcement 🎉'
@@ -123,8 +123,7 @@ window.config = {
  `window.OHIFStandaloneViewer.installViewer(window.config);`

 This exact setup is demonstrated in this
-[CodeSandbox](https://codesandbox.io/s/ohif-viewer-script-tag-usage-c4u4t) and
-in our
+[CodeSandbox](https://codesandbox.io/s/viewer-script-tag-tprch) and in our
 [Embedding The Viewer](https://docs.ohif.org/deployment/recipes/embedded-viewer.html)
 deployment recipe.

@@ -205,5 +205,5 @@ Please feel free to suggest or contribute your own recipes.
 [host-static-assets]: https://www.netlify.com/blog/2016/05/18/9-reasons-your-site-should-be-static/
 [cors]: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
 [code-flows]: https://medium.com/@darutk/diagrams-of-all-the-openid-connect-flows-6968e3990660
-[code-sandbox]: https://codesandbox.io/s/ohif-viewer-script-tag-usage-b3st9
+[code-sandbox]: https://codesandbox.io/s/viewer-script-tag-tprch
 <!-- prettier-ignore-end -->
@@ -134,8 +134,8 @@ conflict issues.
  -->

 <!-- prettier-ignore-start -->
-[code-sandbox]: https://codesandbox.io/s/ohif-script-tag-v103-iniiu
-[whole-slide-base-demo]: https://iniiu.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2020.1519719354.757
-[ext-code-sandbox]: https://codesandbox.io/s/ohif-script-tag-v103-runtime-extensions-34bw5
-[whole-slide-ext-demo]: https://34bw5.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2448.1519719572.518
+[code-sandbox]: https://codesandbox.io/s/viewer-script-tag-tprch
+[whole-slide-base-demo]: https://tprch.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2020.1519719354.757
+[ext-code-sandbox]: https://codesandbox.io/s/viewer-script-tag-microscopy-extension-44unk
+[whole-slide-ext-demo]: https://44unk.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2448.1519719572.518
 <!-- prettier-ignore-end -->
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.2.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.1.1...@ohif/extension-cornerstone@1.2.0) (2019-09-12)
+
+
+### Features
+
+* **Annotate:** Add annotate tool back to toolbar ([26be967](https://github.com/OHIF/Viewers/commit/26be967))
+
+
+
+
+
+## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.1.0...@ohif/extension-cornerstone@1.1.1) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 # [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.0.1...@ohif/extension-cornerstone@1.1.0) (2019-09-12)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "1.1.0",
+  "version": "1.2.0",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -34,7 +34,7 @@
    "cornerstone-math": "^0.1.8",
    "cornerstone-tools": "^4.0.1",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.6.0",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "hammerjs": "^2.0.8",
    "prop-types": "^15.6.2",
@@ -120,6 +120,7 @@ async function handleSegmentationStorage(
    referenceDisplaySet
  );
  const stack = Object.assign({}, cachedStack);
+
  stack.currentImageIdIndex = 0;

  return {
@@ -69,6 +69,15 @@ const definitions = [
    commandName: 'setToolActive',
    commandOptions: { toolName: 'Length' },
  },
+  {
+    id: 'ArrowAnnotate',
+    label: 'Annotate',
+    icon: 'measure-non-target',
+    //
+    type: TOOLBAR_BUTTON_TYPES.COMMAND,
+    commandName: 'setToolActive',
+    commandOptions: { toolName: 'ArrowAnnotate' },
+  },
  {
    id: 'Angle',
    label: 'Angle',
@@ -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.50.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.6...@ohif/extension-dicom-html@0.50.7) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 ## [0.50.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.5...@ohif/extension-dicom-html@0.50.6) (2019-09-10)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-html",
-  "version": "0.50.6",
+  "version": "0.50.7",
  "description": "OHIF extension for rendering structured reports to HTML",
  "author": "OHIF",
  "license": "MIT",
@@ -29,7 +29,7 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "dcmjs": "^0.6.0",
+    "dcmjs": "^0.6.1",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^16.8.6"
@@ -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.50.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.12...@ohif/extension-vtk@0.50.13) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [0.50.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.11...@ohif/extension-vtk@0.50.12) (2019-09-12)

 **Note:** Version bump only for package @ohif/extension-vtk
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "0.50.12",
+  "version": "0.50.13",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -34,7 +34,7 @@
    "@ohif/ui": "^0.50.0",
    "cornerstone-core": "^2.2.8",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.6.0",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
@@ -55,7 +55,7 @@
    "@ohif/ui": "^0.51.0",
    "cornerstone-tools": "^4.0.0",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.6.0",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "gh-pages": "^2.0.1",
    "i18next": "^17.0.3",
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.4](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.1.3...@ohif/viewer@1.1.4) (2019-09-17)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [1.1.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.1.2...@ohif/viewer@1.1.3) (2019-09-16)
+
+
+### Bug Fixes
+
+* 🐛 Fix issue on not loading gcloud ([#919](https://github.com/OHIF/Viewers/issues/919)) ([f723546](https://github.com/OHIF/Viewers/commit/f723546))
+
+
+
+
+
+## [1.1.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.1.1...@ohif/viewer@1.1.2) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.1.0...@ohif/viewer@1.1.1) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 # [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.5...@ohif/viewer@1.1.0) (2019-09-12)


@@ -1,5 +1,6 @@
 {
  "baseUrl": "http://localhost:3000",
-  "video": true,
+  "video": false,
+  "chromeWebSecurity": false,
  "projectId": "4oe38f"
 }
@@ -0,0 +1,78 @@
+const dataTransfer = new DataTransfer();
+
+export const DragSimulator = {
+      MAX_TRIES: 1,
+      DELAY_INTERVAL_MS: 10,
+      counter: 0,
+      rectsEqual(r1, r2) {
+        return (
+          r1.top === r2.top &&
+          r1.right === r2.right &&
+          r1.bottom === r2.bottom &&
+          r1.left === r2.left
+        );
+      },
+      get dropped() {
+        const currentSourcePosition = this.source.getBoundingClientRect();
+        return !this.rectsEqual(
+          this.initialSourcePosition,
+          currentSourcePosition
+        );
+      },
+      get hasTriesLeft() {
+        return this.counter < this.MAX_TRIES;
+      },
+      dragstart() {
+        cy.log('**DRAG START**');
+        cy.wrap(this.source)
+          .trigger('mousedown', { which: 1, button: 0 })
+          .trigger('dragstart', { dataTransfer })
+          .trigger('drag', {});
+      },
+      drop() {
+        cy.log('**DROP**');
+        return cy
+          .wrap(this.target)
+          .trigger('mousemove', 'center')
+          .trigger('dragover', { dataTransfer, force: true })
+          .trigger('drop', { dataTransfer, force: true })
+          .trigger('dragend', { dataTransfer })
+          .trigger('mouseup', { which: 1, button: 0 });
+      },
+      dragover() {
+        cy.log('**DRAGOVER**');
+        if (!this.dropped && this.hasTriesLeft) {
+          this.counter += 1;
+          return cy
+            .wrap(this.target)
+            .trigger('mousemove', 'center')
+            .trigger('dragover', {
+              dataTransfer,
+              position: this.position,
+            })
+            .wait(this.DELAY_INTERVAL_MS)
+            .then(() => this.dragover());
+        }
+        return this.drop().then(() => true);
+      },
+      init(source, target, position) {
+        this.source = source;
+        this.target = target;
+        this.position = position;
+        this.counter = 0;
+
+        this.dragstart();
+
+        return cy.wait(this.DELAY_INTERVAL_MS).then(() => {
+          this.initialSourcePosition = this.source.getBoundingClientRect();
+          return this.dragover();
+        });
+      },
+      simulate(sourceWrapper, targetSelector, position = 'center') {
+        return cy
+          .get(targetSelector)
+          .then(targetWrapper =>
+            this.init(sourceWrapper.get(0), targetWrapper.get(0), position)
+          );
+      },
+    };
@@ -0,0 +1,48 @@
+describe('OHIF Study Viewer Page', () => {
+  
+  before(() => {
+      cy.openStudy("MISTER^MR");
+    });
+  
+    it('checks if series thumbnails are being displayed', ()=> {
+      cy.get('.ThumbnailEntryContainer')
+      .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');
+    });
+
+  });
+  
@@ -1,3 +1,5 @@
+import { DragSimulator } from "../helpers/DragSimulator.js";
+
 // ***********************************************
 // This example commands.js shows you how to
 // create various custom commands and overwrite
@@ -23,3 +25,17 @@
 //
 // -- 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);
+    cy.get('.studylistStudy > .patientName')
+      .contains(patientName)
+      .click();
+  }
+);
+
+Cypress.Commands.add('drag', {prevSubject: 'element',},
+  (...args) => DragSimulator.simulate(...args)
+);
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "1.1.0",
+  "version": "1.1.4",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -45,11 +45,11 @@
  "dependencies": {
    "@babel/runtime": "^7.5.5",
    "@ohif/core": "^0.50.8",
-    "@ohif/extension-cornerstone": "^1.1.0",
-    "@ohif/extension-dicom-html": "^0.50.6",
+    "@ohif/extension-cornerstone": "^1.2.0",
+    "@ohif/extension-dicom-html": "^0.50.7",
    "@ohif/extension-dicom-microscopy": "^0.50.5",
    "@ohif/extension-dicom-pdf": "^0.50.4",
-    "@ohif/extension-vtk": "^0.50.12",
+    "@ohif/extension-vtk": "^0.50.13",
    "@ohif/i18n": "^0.50.4",
    "@ohif/ui": "^0.51.0",
    "@tanem/react-nprogress": "^1.1.25",
@@ -59,7 +59,7 @@
    "cornerstone-math": "^0.1.8",
    "cornerstone-tools": "^4.0.0",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.6.0",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "dicomweb-client": "^0.4.4",
    "hammerjs": "^2.0.8",
@@ -17,6 +17,8 @@
    <meta name="HandheldFriendly" content="True" />
    <meta name="apple-mobile-web-app-capable" content="yes" />

+    <script src="https://polyfill.io/v3/polyfill.min.js?flags=gated&features=default%2CObject.values%2CArray.prototype.flat%2CObject.entries%2CSymbol%2CArray.prototype.includes%2CString.prototype.repeat%2CArray.prototype.find"></script>
+
    <!-- WEB FONTS -->
    <link
      href="https://fonts.googleapis.com/css?family=Sanchez"
@@ -83,7 +83,7 @@ class App extends Component {
  constructor(props) {
    super(props);

-    this.appConfig = props;
+    this._appConfig = props;
    const { servers, extensions, hotkeys, oidc } = props;

    this.initUserManager(oidc);
@@ -5854,10 +5854,10 @@ dateformat@^3.0.0:
  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==

-dcmjs@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.6.0.tgz#fa9f973a86992b41730b0200e7f9d74d2dc0c23d"
-  integrity sha512-jc0PTYi2q+kEjYsBanxOX3YFPQtau/5zi9FUkX3RewPJdZSibaKZVa6McHyeRLx+/6fCheGlzywnnFIkQ65fQA==
+dcmjs@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.6.1.tgz#453f764bca2cd8e3430126ba8385ef4c77071bcd"
+  integrity sha512-sJ0cRVZY02GSaAW5S9JPcv8+7iDtgrM0L/niYWAvu2piSa4bFSXwKi+t4XevAfkm+mF0sXZtaD15bw+/oiCYkw==
  dependencies:
    "@babel/polyfill" "^7.2.5"
    "@babel/runtime" "^7.3.1"
Author	SHA1	Message	Date
ohif-bot	e27d5b58a4	chore(release): publish [skip ci] - @ohif/viewer@1.1.4	2019-09-17 01:39:08 +00:00
Mirna Silva	a18b292a9d	test: [TEST E2E] Drag and drop thumbnail into viewport (#904 ) * TEST E2E: Drag and drop thumbnail into viewport * TEST E2E: Drag and drop thumbnail into viewport * fix: add pollyfill to script-tag template * Add wait's to command * Try to store artifacts * ci: updated artifact location * Changing Patient to MisterMR * Refactors based on PR comments * Adding new sub-folders to separate the testing scripts according to context/features * Adding test cases for Side Panels Measurements and Series * Removing duplicated file OHIFStudyViewer.spec.js	2019-09-16 21:26:14 -04:00
Danny Brown	7bd1507a89	chore: bad stale bot	2019-09-16 13:53:41 -04:00
Danny Brown	a634177578	chore: bad stale bot	2019-09-16 12:53:05 -04:00
ohif-bot	fe4d71ad0b	chore(release): publish [skip ci] - @ohif/viewer@1.1.3	2019-09-16 14:41:16 +00:00
ladeirarodolfo	f723546e6b	fix: 🐛 Fix issue on not loading gcloud (#919 ) Fixed issue on not loading gcloud. Error on name variable declaration	2019-09-16 10:26:59 -04:00
Danny Brown	348b8949d4	docs: update code sandbox links to use sandboxes in our team (#915 )	2019-09-13 14:54:15 -04:00
ohif-bot	26e037dee7	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.2.0 - @ohif/viewer@1.1.2	2019-09-12 19:34:57 +00:00
Romulo Bordezani	26be96783d	feat(Annotate): Add annotate tool back to toolbar * feat(Arrow Annotate Tool) * feat(Arrow Annotate Tool) * refactor: label "Arrow Annotate" to "Annotate" to match viewer-legacy	2019-09-12 15:22:09 -04:00
ohif-bot	029ba1fb4a	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.1.1 - @ohif/extension-dicom-html@0.50.7 - @ohif/extension-vtk@0.50.13 - @ohif/viewer@1.1.1	2019-09-12 10:40:45 +00:00
James Petts	56d658f02d	Merge pull request #913 from JamesAPetts/dcmjs0.6.1 chore: 🤖 Upgrade dcmjs to 0.6.1	2019-09-12 12:24:36 +02:00
James A. Petts	64921b905f	Cosmetic change to trigger netlify rebuild.	2019-09-12 11:26:36 +02:00
James A. Petts	d00d7daf41	chore: 🤖 Upgrade dcmjs to 0.6.1	2019-09-12 11:22:46 +02:00