chore(prettier): full repo linting and code reformatting once and for all (#3627)

platform/app/cypress/support/DragSimulator.js

@@ -6,18 +6,12 @@ export const DragSimulator = {
   counter: 0,
   rectsEqual(r1, r2) {
     return (
-      r1.top === r2.top &&
-      r1.right === r2.right &&
-      r1.bottom === r2.bottom &&
-      r1.left === r2.left
+      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
-    );
+    return !this.rectsEqual(this.initialSourcePosition, currentSourcePosition);
   },
   get hasTriesLeft() {
     return this.counter < this.MAX_TRIES;
@@ -71,8 +65,6 @@ export const DragSimulator = {
   simulate(sourceWrapper, targetSelector, position = 'center') {
     return cy
       .get(targetSelector)
-      .then(targetWrapper =>
-        this.init(sourceWrapper.get(0), targetWrapper.get(0), position)
-      );
+      .then(targetWrapper => this.init(sourceWrapper.get(0), targetWrapper.get(0), position));
   },
 };

platform/app/cypress/support/aliases.js

@@ -3,16 +3,10 @@ export function initCornerstoneToolsAliases() {
   cy.get('[data-cy="StackScroll"]').as('stackScrollBtn');
   cy.get('[data-cy="Zoom"]').as('zoomBtn');
   cy.get('[data-cy="WindowLevel-split-button-primary"]').as('wwwcBtnPrimary');
-  cy.get('[data-cy="WindowLevel-split-button-secondary"]').as(
-    'wwwcBtnSecondary'
-  );
+  cy.get('[data-cy="WindowLevel-split-button-secondary"]').as('wwwcBtnSecondary');
   cy.get('[data-cy="Pan"]').as('panBtn');
-  cy.get('[data-cy="MeasurementTools-split-button-primary"]').as(
-    'measurementToolsBtnPrimary'
-  );
-  cy.get('[data-cy="MeasurementTools-split-button-secondary"]').as(
-    'measurementToolsBtnSecondary'
-  );
+  cy.get('[data-cy="MeasurementTools-split-button-primary"]').as('measurementToolsBtnPrimary');
+  cy.get('[data-cy="MeasurementTools-split-button-secondary"]').as('measurementToolsBtnSecondary');
   // cy.get('[data-cy="Angle"]').as('angleBtn');
   cy.get('[data-cy="MoreTools-split-button-primary"]').as('moreBtnPrimary');
   cy.get('[data-cy="MoreTools-split-button-secondary"]').as('moreBtnSecondary');
@@ -37,12 +31,8 @@ export function initCommonElementsAliases() {
   cy.get('[data-cy="studyBrowser-panel"]').as('seriesPanel');
   cy.get('[data-cy="viewport-overlay-top-right"]').as('viewportInfoTopRight');
   cy.get('[data-cy="viewport-overlay-top-left"]').as('viewportInfoTopLeft');
-  cy.get('[data-cy="viewport-overlay-bottom-right"]').as(
-    'viewportInfoBottomRight'
-  );
-  cy.get('[data-cy="viewport-overlay-bottom-left"]').as(
-    'viewportInfoBottomLeft'
-  );
+  cy.get('[data-cy="viewport-overlay-bottom-right"]').as('viewportInfoBottomRight');
+  cy.get('[data-cy="viewport-overlay-bottom-left"]').as('viewportInfoBottomLeft');
 
   cy.get('.left-mid.orientation-marker').as('viewportInfoMidLeft');
   cy.get('.top-mid.orientation-marker').as('viewportInfoMidTop');
@@ -50,9 +40,7 @@ export function initCommonElementsAliases() {
 
 //Creating aliases for Routes
 export function initRouteAliases() {
-  cy.intercept('GET', '**/series**', { statusCode: 200, body: [] }).as(
-    'getStudySeries'
-  );
+  cy.intercept('GET', '**/series**', { statusCode: 200, body: [] }).as('getStudySeries');
 
   // Todo: for some reason cypress does not redirect to the correct url
   // so we intercept the request and redirect it to the correct url

platform/app/cypress/support/commands.js

@@ -59,10 +59,7 @@ Cypress.Commands.add(
   (StudyInstanceUID, otherParams = '', mode = '/basic-test') => {
     cy.location('pathname').then($url => {
       cy.log($url);
-      if (
-        $url === 'blank' ||
-        !$url.includes(`${mode}/${StudyInstanceUID}${otherParams}`)
-      ) {
+      if ($url === 'blank' || !$url.includes(`${mode}/${StudyInstanceUID}${otherParams}`)) {
         cy.openStudyInViewer(StudyInstanceUID, otherParams, mode);
         cy.waitDicomImage();
         // Very short wait to ensure pending updates are handled
@@ -91,14 +88,9 @@ Cypress.Commands.add('openStudyModality', Modality => {
   cy.initRouteAliases();
   cy.visit('/');
 
-  cy.get('#filter-accessionOrModalityOrDescription')
-    .type(Modality)
-    .waitQueryList();
+  cy.get('#filter-accessionOrModalityOrDescription').type(Modality).waitQueryList();
 
-  cy.get('[data-cy="study-list-results"]')
-    .contains(Modality)
-    .first()
-    .click();
+  cy.get('[data-cy="study-list-results"]').contains(Modality).first().click();
 });
 
 /**
@@ -175,60 +167,47 @@ 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;
+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 });
-    });
-  }
-);
+    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('expectMinimumThumbnails', (seriesToWait = 1) => {
-  cy.get('[data-cy="study-browser-thumbnail"]', { timeout: 50000 }).should(
-    $itemList => {
-      expect($itemList.length >= seriesToWait).to.be.true;
-    }
-  );
+  cy.get('[data-cy="study-browser-thumbnail"]', { timeout: 50000 }).should($itemList => {
+    expect($itemList.length >= seriesToWait).to.be.true;
+  });
 });
 
 //Command to wait DICOM image to load into the viewport
-Cypress.Commands.add(
-  'waitDicomImage',
-  (mode = '/basic-test', timeout = 50000) => {
-    cy.window()
-      .its('cornerstone')
-      .should($cornerstone => {
-        const enabled = $cornerstone.getEnabledElements();
-        if (enabled?.length) {
-          enabled.forEach((item, i) => {
-            if (
-              item.viewport.viewportStatus !==
-              $cornerstone.Enums.ViewportStatus.RENDERED
-            ) {
-              throw new Error(
-                `Viewport ${i} in state ${item.viewport.viewportStatus}`
-              );
-            }
-          });
-        } else {
-          throw new Error('No enabled elements');
-        }
-      });
-    // This shouldn't be necessary, but seems to be.
-    cy.wait(250);
-    cy.log('DICOM image loaded');
-  }
-);
+Cypress.Commands.add('waitDicomImage', (mode = '/basic-test', timeout = 50000) => {
+  cy.window()
+    .its('cornerstone')
+    .should($cornerstone => {
+      const enabled = $cornerstone.getEnabledElements();
+      if (enabled?.length) {
+        enabled.forEach((item, i) => {
+          if (item.viewport.viewportStatus !== $cornerstone.Enums.ViewportStatus.RENDERED) {
+            throw new Error(`Viewport ${i} in state ${item.viewport.viewportStatus}`);
+          }
+        });
+      } else {
+        throw new Error('No enabled elements');
+      }
+    });
+  // This shouldn't be necessary, but seems to be.
+  cy.wait(250);
+  cy.log('DICOM image loaded');
+});
 
 //Command to reset and clear all the changes made to the viewport
 Cypress.Commands.add('resetViewport', () => {
@@ -392,18 +371,14 @@ Cypress.Commands.add('setLayout', (columns = 1, rows = 1) => {
 });
 
 function convertCanvas(documentClone) {
-  documentClone
-    .querySelectorAll('canvas')
-    .forEach(selector => canvasToImage(selector));
+  documentClone.querySelectorAll('canvas').forEach(selector => canvasToImage(selector));
 
   return documentClone;
 }
 
 function unconvertCanvas(documentClone) {
   // Remove previously generated images
-  documentClone
-    .querySelectorAll('[data-percy-image]')
-    .forEach(selector => selector.remove());
+  documentClone.querySelectorAll('[data-percy-image]').forEach(selector => selector.remove());
   // Restore canvas visibility
   documentClone.querySelectorAll('[data-percy-canvas]').forEach(selector => {
     selector.removeAttribute('data-percy-canvas');
@@ -413,9 +388,7 @@ function unconvertCanvas(documentClone) {
 
 function canvasToImage(selectorOrEl) {
   let canvas =
-    typeof selectorOrEl === 'object'
-      ? selectorOrEl
-      : document.querySelector(selectorOrEl);
+    typeof selectorOrEl === 'object' ? selectorOrEl : document.querySelector(selectorOrEl);
   let image = document.createElement('img');
   let canvasImageBase64 = canvas.toDataURL('image/png');
 
@@ -443,10 +416,7 @@ Cypress.Commands.add('openPreferences', () => {
         .scrollIntoView()
         .click()
         .then(() => {
-          cy.get('[data-cy="options-dropdown"]')
-            .last()
-            .click()
-            .wait(200);
+          cy.get('[data-cy="options-dropdown"]').last().click().wait(200);
         });
     }
   });
@@ -481,9 +451,7 @@ Cypress.Commands.add('closePreferences', () => {
   cy.get('body').then(body => {
     // Close notification if displayed
     if (body.find('.sb-closeIcon').length > 0) {
-      cy.get('.sb-closeIcon')
-        .first()
-        .click({ force: true });
+      cy.get('.sb-closeIcon').first().click({ force: true });
     }
 
     // Close User Preferences Modal (if displayed)
@@ -495,9 +463,7 @@ Cypress.Commands.add('closePreferences', () => {
 
 Cypress.Commands.add('selectPreferencesTab', tabAlias => {
   cy.initPreferencesModalAliases();
-  cy.get(tabAlias)
-    .click()
-    .should('have.class', 'active');
+  cy.get(tabAlias).click().should('have.class', 'active');
   initPreferencesModalFooterBtnAliases();
 });
 
@@ -513,9 +479,7 @@ Cypress.Commands.add('resetUserHotkeyPreferences', () => {
   // Close Success Message overlay (if displayed)
   cy.get('body').then(body => {
     if (body.find('.sb-closeIcon').length > 0) {
-      cy.get('.sb-closeIcon')
-        .first()
-        .click({ force: true });
+      cy.get('.sb-closeIcon').first().click({ force: true });
     }
     // Click on Save Button
     cy.get('@saveBtn').click();
@@ -534,28 +498,23 @@ Cypress.Commands.add('resetUserGeneralPreferences', () => {
   // Close Success Message overlay (if displayed)
   cy.get('body').then(body => {
     if (body.find('.sb-closeIcon').length > 0) {
-      cy.get('.sb-closeIcon')
-        .first()
-        .click({ force: true });
+      cy.get('.sb-closeIcon').first().click({ force: true });
     }
     // Click on Save Button
     cy.get('@saveBtn').click();
   });
 });
 
-Cypress.Commands.add(
-  'setNewHotkeyShortcutOnUserPreferencesModal',
-  (function_label, shortcut) => {
-    // Within scopes all `.get` and `.contains` to within the matched elements
-    // dom instead of checking from document
-    cy.get('.HotkeysPreferences').within(() => {
-      cy.contains(function_label) // label we're looking for
-        .parent()
-        .find('input') // closest input to that label
-        .type(shortcut, { force: true }); // Set new shortcut for that function
-    });
-  }
-);
+Cypress.Commands.add('setNewHotkeyShortcutOnUserPreferencesModal', (function_label, shortcut) => {
+  // Within scopes all `.get` and `.contains` to within the matched elements
+  // dom instead of checking from document
+  cy.get('.HotkeysPreferences').within(() => {
+    cy.contains(function_label) // label we're looking for
+      .parent()
+      .find('input') // closest input to that label
+      .type(shortcut, { force: true }); // Set new shortcut for that function
+  });
+});
 
 Cypress.Commands.add(
   'setWindowLevelPreset',
@@ -590,9 +549,7 @@ Cypress.Commands.add(
 
 Cypress.Commands.add('openDownloadImageModal', () => {
   // Click on More button
-  cy.get('[data-cy="Capture"]')
-    .as('captureBtn')
-    .click();
+  cy.get('[data-cy="Capture"]').as('captureBtn').click();
 });
 
 Cypress.Commands.add('setLanguage', (language, save = true) => {
@@ -609,16 +566,12 @@ Cypress.Commands.add('setLanguage', (language, save = true) => {
   // Close Success Message overlay (if displayed)
   cy.get('body').then(body => {
     if (body.find('.sb-closeIcon').length > 0) {
-      cy.get('.sb-closeIcon')
-        .first()
-        .click({ force: true });
+      cy.get('.sb-closeIcon').first().click({ force: true });
     }
 
     //Click on Save/Cancel button
     const toClick = save ? '@saveBtn' : '@cancelBtn';
-    cy.get(toClick)
-      .scrollIntoView()
-      .click();
+    cy.get(toClick).scrollIntoView().click();
   });
 });
 
@@ -626,7 +579,7 @@ Cypress.Commands.add('setLanguage', (language, save = true) => {
 // https://github.com/cypress-io/cypress/issues/7362
 // uncomment this if you really need the network logs
 const origLog = Cypress.log;
-Cypress.log = function(opts, ...other) {
+Cypress.log = function (opts, ...other) {
   if (opts.displayName === 'script' || opts.name === 'request') {
     return;
   }