chore(release): publish [skip ci]

- @ohif/extension-vtk@1.1.2 - @ohif/i18n@0.52.3 - @ohif/ui@1.1.2 - @ohif/viewer@3.1.2
fix: translations (#1234 )
2019-12-12 05:54:34 +00:00 · 2019-12-12 00:46:58 -05:00 · 2019-12-11 16:48:26 +00:00 · 2019-12-11 11:46:10 -05:00
20 changed files with 254 additions and 34 deletions
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.1.1...@ohif/extension-vtk@1.1.2) (2019-12-12)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.1.0...@ohif/extension-vtk@1.1.1) (2019-12-11)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 # [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.0.2...@ohif/extension-vtk@1.1.0) (2019-12-11)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.1.0",
+  "version": "1.1.2",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -53,7 +53,7 @@
  },
  "devDependencies": {
    "@ohif/core": "^2.1.0",
-    "@ohif/ui": "^1.1.0",
+    "@ohif/ui": "^1.1.2",
    "cornerstone-tools": "^4.8.0",
    "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.

+## [0.52.3](https://github.com/OHIF/Viewers/compare/@ohif/i18n@0.52.2...@ohif/i18n@0.52.3) (2019-12-12)
+
+
+### Bug Fixes
+
+* translations ([#1234](https://github.com/OHIF/Viewers/issues/1234)) ([30b9e44](https://github.com/OHIF/Viewers/commit/30b9e4422073557287ef26a80b38eeb3f3fcff4c))
+
+
+
+
+
 ## [0.52.2](https://github.com/OHIF/Viewers/compare/@ohif/i18n@0.52.1...@ohif/i18n@0.52.2) (2019-11-28)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/i18n",
-  "version": "0.52.2",
+  "version": "0.52.3",
  "description": "Internationalization library for The OHIF Viewer",
  "author": "OHIF",
  "license": "MIT",
@@ -10,6 +10,7 @@
  "Clear": "Clear",
  "Coronal": "Coronal",
  "Crosshairs": "Crosshairs",
+  "Download": "Download",
  "Ellipse": "Ellipse",
  "Elliptical": "Elliptical",
  "Flip H": "Flip H",
@@ -10,18 +10,19 @@
  "Clear": "Limpiar",
  "Coronal": "Coronal",
  "Crosshairs": "Punto de mira",
+  "Download": "Descargar",
  "Ellipse": "Elipse",
  "Elliptical": "Elíptico",
-  "Flip H": "Espejo H",
-  "Flip V": "Espejo V",
+  "Flip H": "Voltear H",
+  "Flip V": "Voltear V",
  "Freehand": "Mano alzada",
-  "Invert": "Invertir",
+  "Invert": "Negativo",
  "Layout": "$t(Common:Layout)",
  "Length": "Longitud",
-  "Levels": "Niveles",
-  "Magnify": "Aumentar",
+  "Levels": "W/L",
+  "Magnify": "Lupa",
  "Manual": "Manual",
-  "Measurements": "Mediciones",
+  "Measurements": "Medidas",
  "More": "$t(Common:More)",
  "Next": "$t(Common:Next)",
  "Pan": "Mover",
@@ -32,11 +33,11 @@
  "Rectangle": "Rectángulo",
  "Reset": "$t(Common:Reset)",
  "Reset to Defaults": "$t(Common:Reset) por defecto",
-  "Rotate Right": "Rotar ->",
+  "Rotate Right": "Girar ->",
  "Sagittal": "Sagital",
  "Save": "Guardar",
-  "Stack Scroll": "Scroll en pila",
+  "Stack Scroll": "Scroll",
  "Stop": "$t(Common:Stop)",
  "Themes": "Temas",
-  "Zoom": "Zoom"
+  "Zoom": "Ampliar"
 }
@@ -1,12 +1,12 @@
 {
  "Image": "Imagen",
-  "Layout": "Disposición",
+  "Layout": "Formato",
  "Measurements": "Medidas",
  "More": "Más",
  "Next": "Siguiente",
  "Play": "Play",
  "Previous": "Anterior",
-  "Reset": "Resetear",
+  "Reset": "Restaurar",
  "RowsPerPage": "filas por página",
  "Series": "Secuencia",
  "Show": "Mostrar",
@@ -10,6 +10,7 @@
  "Clear": "Limpar",
  "Coronal": "Coronal",
  "Crosshairs": "Localizador",
+  "Download": "Baixar",
  "Ellipse": "Elipse",
  "Elliptical": "Elíptico",
  "Flip H": "Inverter H",
@@ -30,8 +31,8 @@
  "Probe": "Prova",
  "ROI Window": "Janela ROI",
  "Rectangle": "Retângulo",
-  "Reset": "Resetar",
-  "Reset to Defaults": "Restaurar para o Padrão",
+  "Reset": "$t(Common:Reset)",
+  "Reset to Defaults": "$t(Common:Reset) para o Padrão",
  "Rotate Right": "Girar à direita",
  "Sagittal": "Sagital",
  "Save": "Salvar",
@@ -6,6 +6,6 @@
  "Next": "Próximo",
  "Play": "Play",
  "Previous": "Anterior",
-  "Reset": "Reset",
+  "Reset": "Restaurar",
  "Stop": "Stop"
 }
@@ -1,6 +1,6 @@
 {
  "Cancel": "Cancelar",
-  "Reset to Defaults": "Restaurar Default",
+  "Reset to Defaults": "$t(Common:Reset) para Padrão",
  "ResetDefaultMessage": "Preferências resetadas com sucesso. <br /> Você deve <strong>Salvar</strong> para que essa ação seja realizada.",
  "Save": "Salvar",
  "SaveMessage": "Preferências salvas",
@@ -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.1.2](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.1.1...@ohif/ui@1.1.2) (2019-12-12)
+
+
+### Bug Fixes
+
+* translations ([#1234](https://github.com/OHIF/Viewers/issues/1234)) ([30b9e44](https://github.com/OHIF/Viewers/commit/30b9e4422073557287ef26a80b38eeb3f3fcff4c))
+
+
+
+
+
+## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.1.0...@ohif/ui@1.1.1) (2019-12-11)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
 # [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.0.1...@ohif/ui@1.1.0) (2019-12-11)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "1.1.0",
+  "version": "1.1.2",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -32,7 +32,7 @@ const ViewportDownloadForm = ({
  maximumSize,
  canvasClass,
 }) => {
-  const [t] = useTranslation('ViewportDownloadForm');
+  const [t] = useTranslation('Buttons');

  const [filename, setFilename] = useState(DEFAULT_FILENAME);
  const [fileType, setFileType] = useState('jpg');
@@ -196,11 +196,12 @@ const ViewportDownloadForm = ({
        )}
      </div>

-      <div className="file-info-container">
+      <div className="file-info-container" data-cy="file-info-container">
        <div className="col">
          <div className="width">
            <TextInput
              type="number"
+              data-cy="image-width"
              min={minimumSize}
              max={maximumSize}
              value={width}
@@ -211,6 +212,7 @@ const ViewportDownloadForm = ({
          <div className="height">
            <TextInput
              type="number"
+              data-cy="image-height"
              min={minimumSize}
              max={maximumSize}
              value={height}
@@ -224,6 +226,7 @@ const ViewportDownloadForm = ({
          <div className="file-name">
            <TextInput
              type="text"
+              data-cy="file-name"
              value={filename}
              onChange={event => setFilename(event.target.value)}
              label={t('File name')}
@@ -233,6 +236,7 @@ const ViewportDownloadForm = ({
          <div className="file-type">
            <Select
              value={fileType}
+              data-cy="file-type"
              onChange={event => setFileType(event.target.value)}
              options={FILE_TYPE_OPTIONS}
              label={t('File type')}
@@ -245,6 +249,7 @@ const ViewportDownloadForm = ({
            <label htmlFor="show-annotations" className="form-check-label">
              <input
                id="show-annotations"
+                data-cy="show-annotations"
                type="checkbox"
                className="form-check-input"
                checked={showAnnotations}
@@ -278,23 +283,33 @@ const ViewportDownloadForm = ({
        ></canvas>
      </div>

-      <div className="preview">
+      <div className="preview" data-cy="image-preview">
        <h4> {t('Image Preview')}</h4>
        <img
          className="viewport-preview"
          src={viewportPreview.src}
          alt="Viewport Preview"
+          data-cy="viewport-preview-img"
        />
      </div>

      <div className="actions">
        <div className="action-cancel">
-          <button type="button" className="btn btn-danger" onClick={onClose}>
+          <button
+            type="button"
+            data-cy="cancel-btn"
+            className="btn btn-danger"
+            onClick={onClose}
+          >
            {t('Cancel')}
          </button>
        </div>
        <div className="action-save">
-          <button onClick={downloadImage} className="btn btn-primary">
+          <button
+            onClick={downloadImage}
+            className="btn btn-primary"
+            data-cy="download-btn"
+          >
            {t('Download')}
          </button>
        </div>
@@ -29,7 +29,7 @@ const OHIFModal = ({
  const renderHeader = () => {
    return (
      title && (
-        <div className="OHIFModal__header">
+        <div className="OHIFModal__header" data-cy="modal-header">
          <h4>{title}</h4>
          {closeButton && (
            <button data-cy="close-button" onClick={onClose}>
@@ -44,6 +44,7 @@ const OHIFModal = ({
  return (
    <Modal
      className={classNames('OHIFModal', className)}
+      data-cy="modal"
      shouldCloseOnEsc={shouldCloseOnEsc}
      isOpen={isOpen}
      title={title}
@@ -51,7 +52,9 @@ const OHIFModal = ({
    >
      <>
        {renderHeader()}
-        <div className="OHIFModal__content">{children}</div>
+        <div className="OHIFModal__content" data-cy="modal-content">
+          {children}
+        </div>
      </>
    </Modal>
  );
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.1.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.1.1...@ohif/viewer@3.1.2) (2019-12-12)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [3.1.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.1.0...@ohif/viewer@3.1.1) (2019-12-11)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 # [3.1.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.0.3...@ohif/viewer@3.1.0) (2019-12-11)


@@ -81,10 +81,8 @@ describe('OHIF Cornerstone Hotkeys', () => {
  });

  it('uses hotkeys "RightArrow" and "LeftArrow" to navigate between multiple viewports', () => {
-    //Click on Layout button
-    cy.get('@layoutBtn').click();
-    //Select 3 viewports
-    cy.get('tbody > :nth-child(1) > :nth-child(3)').click();
+    //Select viewport layout (3,1)
+    cy.setLayout(3, 1);
    cy.waitViewportImageLoading();

    // Press multiples hotkeys on viewport #1
@@ -0,0 +1,126 @@
+describe('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.screenshot('Download Image Modal - Tablet experience');
+    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.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')
+      .should('contain.text', 'Download High Quality Image');
+    // Check input fields
+    cy.get('[data-cy=file-type]')
+      .select('png')
+      .should('have.value', 'png')
+      .select('jpg')
+      .should('have.value', 'jpg');
+    // Check image preview
+    cy.get('[data-cy="image-preview"]').should('contain.text', 'Image Preview');
+    cy.get('[data-cy="viewport-preview-img"]')
+      .should('have.attr', 'src')
+      .and('include', 'data:image');
+    // Check buttons
+    cy.get('[data-cy="cancel-btn"]')
+      .scrollIntoView()
+      .should('be.visible');
+    cy.get('[data-cy="download-btn"]')
+      .scrollIntoView()
+      .should('be.visible');
+  });
+
+  it('cancel changes on download modal', function() {
+    //Change Image Width, Filename and File Type
+    cy.get('[data-cy="image-width"]')
+      .clear()
+      .type('300');
+    cy.get('[data-cy="image-height"]') //Image Height should be the same as width
+      .should('have.value', '300');
+    cy.get('[data-cy="file-name"]')
+      .clear()
+      .type('new-filename');
+    cy.get('[data-cy=file-type]').select('png');
+    //Click on Cancel button
+    cy.get('[data-cy="cancel-btn"]')
+      .scrollIntoView()
+      .click();
+    //Check modal is closed
+    cy.get('[data-cy="modal"]').should('not.exist');
+    //Open Modal
+    cy.openDownloadImageModal();
+    //Verify default values was restored
+    cy.get('[data-cy="image-width"]').should('have.value', '512');
+    cy.get('[data-cy="file-name"]').should('have.value', 'image');
+    cy.get('[data-cy=file-type]').should('have.value', 'jpg');
+  });
+
+  // TO-DO once issue is fixed: https://github.com/OHIF/Viewers/issues/1217
+  // it('checks error messages for empty fields', function() {
+  //   //Clear fields Image Width and Filename
+  //   cy.get('[data-cy="image-width"]')
+  //     .clear();
+  //   cy.get('[data-cy="file-name"]').clear();
+
+  //   //Click on Download button
+  //   cy.get('[data-cy="download-btn"]')
+  //     .scrollIntoView()
+  //     .click();
+  //   //Check error message
+  // });
+
+  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.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')
+      .should('have.class', 'magnifyTool'); //Class "MagnifyTool" exists with annotations displayed on Image preview
+    // Uncheck "Show Annotations" option
+    cy.get('[data-cy="show-annotations"]')
+      .uncheck()
+      .wait(300);
+    // Check that class "MagnifyTool" should not exist
+    cy.get('[data-cy="modal-content"]')
+      .find('canvas')
+      .should('not.have.class', 'magnifyTool');
+  });
+});
@@ -11,6 +11,7 @@ export function initCornerstoneToolsAliases() {
  cy.get('.ToolbarRow > :nth-child(10)').as('cineBtn');
  cy.get('.expandableToolMenu').as('moreBtn');
  cy.get('.btn-group > .toolbar-button').as('layoutBtn');
+  cy.get('.viewport-element').as('viewport');
 }

 //Creating aliases for Common page elements
@@ -469,6 +469,18 @@ Cypress.Commands.add(
  }
 );

+Cypress.Commands.add('openDownloadImageModal', () => {
+  // Click on More button
+  cy.get('.expandableToolMenu')
+    .as('moreBtn')
+    .click();
+
+  // Click on Download button
+  cy.get('.tooltip-inner > :nth-child(13)')
+    .as('downloadBtn')
+    .click();
+});
+
 Cypress.Commands.add('setLanguage', (language, save = true) => {
  cy.openPreferences();

@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "3.1.0",
+  "version": "3.1.2",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -50,9 +50,9 @@
    "@ohif/extension-dicom-html": "^1.1.0",
    "@ohif/extension-dicom-microscopy": "^0.50.6",
    "@ohif/extension-dicom-pdf": "^1.0.0",
-    "@ohif/extension-vtk": "^1.1.0",
-    "@ohif/i18n": "^0.52.2",
-    "@ohif/ui": "^1.1.0",
+    "@ohif/extension-vtk": "^1.1.2",
+    "@ohif/i18n": "^0.52.3",
+    "@ohif/ui": "^1.1.2",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
Author	SHA1	Message	Date
ohif-bot	8c946a4742	chore(release): publish [skip ci] - @ohif/extension-vtk@1.1.2 - @ohif/i18n@0.52.3 - @ohif/ui@1.1.2 - @ohif/viewer@3.1.2	2019-12-12 05:54:34 +00:00
Rodrigo Antinarelli	30b9e44220	fix: translations (#1234 )	2019-12-12 00:46:58 -05:00
ohif-bot	380abe2705	chore(release): publish [skip ci] - @ohif/extension-vtk@1.1.1 - @ohif/ui@1.1.1 - @ohif/viewer@3.1.1	2019-12-11 16:48:26 +00:00
Mirna Silva	f4570c96c2	tests: Download Image File Modal (#1219 ) * E2E Tests: Download Image File Modal * CI fix * Fixes for PR comments * Small change just to check CI behavior * Fix for CI failure: comparing classes instead of image src * Fixed Download button test and blocked Download Dialog event * Deleting file ConnectedViewportDownloadForm.js This file was not supposed to be created by this PR. It was already deleted by another user on Master branch. * Removing wrong import line * Fixes based on PR comments * Fixes based on PR comments * test: remove assignment to window	2019-12-11 11:46:10 -05:00