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

extensions/default/src/DicomWebDataSource/dcm4cheeReject.js

@@ -1,4 +1,4 @@
-export default function(wadoRoot) {
+export default function (wadoRoot) {
   return {
     series: (StudyInstanceUID, SeriesInstanceUID) => {
       return new Promise((resolve, reject) => {
@@ -15,7 +15,7 @@ export default function(wadoRoot) {
 
         console.log(xhr);
 
-        xhr.onreadystatechange = function() {
+        xhr.onreadystatechange = function () {
           //Call a function when the state changes.
           if (xhr.readyState == 4) {
             switch (xhr.status) {

extensions/default/src/DicomWebDataSource/index.js

@@ -1,11 +1,5 @@
 import { api } from 'dicomweb-client';
-import {
-  DicomMetadataStore,
-  IWebApiDataSource,
-  utils,
-  errorHandler,
-  classes,
-} from '@ohif/core';
+import { DicomMetadataStore, IWebApiDataSource, utils, errorHandler, classes } from '@ohif/core';
 
 import {
   mapParams,
@@ -18,10 +12,7 @@ import dcm4cheeReject from './dcm4cheeReject';
 
 import getImageId from './utils/getImageId';
 import dcmjs from 'dcmjs';
-import {
-  retrieveStudyMetadata,
-  deleteStudyMetadataPromise,
-} from './retrieveStudyMetadata.js';
+import { retrieveStudyMetadata, deleteStudyMetadataPromise } from './retrieveStudyMetadata.js';
 import StaticWadoClient from './utils/StaticWadoClient';
 import getDirectURL from '../utils/getDirectURL';
 import { fixBulkDataURI } from './utils/fixBulkDataURI';
@@ -30,8 +21,7 @@ const { DicomMetaDictionary, DicomDict } = dcmjs.data;
 
 const { naturalizeDataset, denaturalizeDataset } = DicomMetaDictionary;
 
-const ImplementationClassUID =
-  '2.25.270695996825855179949881587723571202391.2.0.0';
+const ImplementationClassUID = '2.25.270695996825855179949881587723571202391.2.0.0';
 const ImplementationVersionName = 'OHIF-VIEWER-2.0.0';
 const EXPLICIT_VR_LITTLE_ENDIAN = '1.2.840.10008.1.2.1';
 
@@ -61,10 +51,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
 
   const implementation = {
     initialize: ({ params, query }) => {
-      if (
-        dicomWebConfig.onConfiguration &&
-        typeof dicomWebConfig.onConfiguration === 'function'
-      ) {
+      if (dicomWebConfig.onConfiguration && typeof dicomWebConfig.onConfiguration === 'function') {
         dicomWebConfig = dicomWebConfig.onConfiguration(dicomWebConfig, {
           params,
           query,
@@ -126,7 +113,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
     query: {
       studies: {
         mapParams: mapParams.bind(),
-        search: async function(origParams) {
+        search: async function (origParams) {
           qidoDicomWebClient.headers = getAuthrorizationHeader();
           const { studyInstanceUid, seriesInstanceUid, ...mappedParams } =
             mapParams(origParams, {
@@ -134,12 +121,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
               supportsWildcard: dicomWebConfig.supportsWildcard,
             }) || {};
 
-          const results = await qidoSearch(
-            qidoDicomWebClient,
-            undefined,
-            undefined,
-            mappedParams
-          );
+          const results = await qidoSearch(qidoDicomWebClient, undefined, undefined, mappedParams);
 
           return processResults(results);
         },
@@ -147,12 +129,9 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       },
       series: {
         // mapParams: mapParams.bind(),
-        search: async function(studyInstanceUid) {
+        search: async function (studyInstanceUid) {
           qidoDicomWebClient.headers = getAuthrorizationHeader();
-          const results = await seriesInStudy(
-            qidoDicomWebClient,
-            studyInstanceUid
-          );
+          const results = await seriesInStudy(qidoDicomWebClient, studyInstanceUid);
 
           return processSeriesResults(results);
         },
@@ -161,13 +140,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       instances: {
         search: (studyInstanceUid, queryParameters) => {
           qidoDicomWebClient.headers = getAuthrorizationHeader();
-          qidoSearch.call(
-            undefined,
-            qidoDicomWebClient,
-            studyInstanceUid,
-            null,
-            queryParameters
-          );
+          qidoSearch.call(undefined, qidoDicomWebClient, studyInstanceUid, null, queryParameters);
         },
       },
     },
@@ -213,9 +186,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
           madeInClient = false,
         } = {}) => {
           if (!StudyInstanceUID) {
-            throw new Error(
-              'Unable to query for SeriesMetadata without StudyInstanceUID'
-            );
+            throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
           }
 
           if (dicomWebConfig.enableStudyLazyLoad) {
@@ -250,8 +221,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
           await wadoDicomWebClient.storeInstances(options);
         } else {
           const meta = {
-            FileMetaInformationVersion:
-              dataset._meta.FileMetaInformationVersion.Value,
+            FileMetaInformationVersion: dataset._meta.FileMetaInformationVersion.Value,
             MediaStorageSOPClassUID: dataset.SOPClassUID,
             MediaStorageSOPInstanceUID: dataset.SOPInstanceUID,
             TransferSyntaxUID: EXPLICIT_VR_LITTLE_ENDIAN,
@@ -340,10 +310,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       DicomMetadataStore.addSeriesMetadata(seriesMetadata, madeInClient);
 
       Object.keys(instancesPerSeries).forEach(seriesInstanceUID =>
-        DicomMetadataStore.addInstances(
-          instancesPerSeries[seriesInstanceUID],
-          madeInClient
-        )
+        DicomMetadataStore.addInstances(instancesPerSeries[seriesInstanceUID], madeInClient)
       );
     },
 
@@ -357,17 +324,15 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       const enableStudyLazyLoad = true;
       wadoDicomWebClient.headers = generateWadoHeader();
       // Get Series
-      const {
-        preLoadData: seriesSummaryMetadata,
-        promises: seriesPromises,
-      } = await retrieveStudyMetadata(
-        wadoDicomWebClient,
-        StudyInstanceUID,
-        enableStudyLazyLoad,
-        filters,
-        sortCriteria,
-        sortFunction
-      );
+      const { preLoadData: seriesSummaryMetadata, promises: seriesPromises } =
+        await retrieveStudyMetadata(
+          wadoDicomWebClient,
+          StudyInstanceUID,
+          enableStudyLazyLoad,
+          filters,
+          sortCriteria,
+          sortFunction
+        );
 
       /**
        * naturalizes the dataset, and adds a retrieve bulkdata method
@@ -412,8 +377,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
                 // the bulk data and DICOM video cases where the second ArrayBuffer is
                 // the bulk data. Here we play it safe and do a find.
                 const ret =
-                  (val instanceof Array &&
-                    val.find(arrayBuffer => arrayBuffer?.byteLength)) ||
+                  (val instanceof Array && val.find(arrayBuffer => arrayBuffer?.byteLength)) ||
                   undefined;
                 value.Value = ret;
                 return ret;
@@ -456,10 +420,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       }
 
       function setSuccessFlag() {
-        const study = DicomMetadataStore.getStudy(
-          StudyInstanceUID,
-          madeInClient
-        );
+        const study = DicomMetadataStore.getStudy(StudyInstanceUID, madeInClient);
         study.isLoaded = true;
       }
 
@@ -520,13 +481,10 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
     },
     getStudyInstanceUIDs({ params, query }) {
       const { StudyInstanceUIDs: paramsStudyInstanceUIDs } = params;
-      const queryStudyInstanceUIDs = utils.splitComma(
-        query.getAll('StudyInstanceUIDs')
-      );
+      const queryStudyInstanceUIDs = utils.splitComma(query.getAll('StudyInstanceUIDs'));
 
       const StudyInstanceUIDs =
-        (queryStudyInstanceUIDs.length && queryStudyInstanceUIDs) ||
-        paramsStudyInstanceUIDs;
+        (queryStudyInstanceUIDs.length && queryStudyInstanceUIDs) || paramsStudyInstanceUIDs;
       const StudyInstanceUIDsAsArray =
         StudyInstanceUIDs && Array.isArray(StudyInstanceUIDs)
           ? StudyInstanceUIDs

extensions/default/src/DicomWebDataSource/qido.js

@@ -54,10 +54,7 @@ function processResults(qidoStudies) {
       patientName: utils.formatPN(getName(qidoStudy['00100010'])) || '',
       instances: Number(getString(qidoStudy['00201208'])) || 0, // number
       description: getString(qidoStudy['00081030']) || '',
-      modalities:
-        getString(
-          getModalities(qidoStudy['00080060'], qidoStudy['00080061'])
-        ) || '',
+      modalities: getString(getModalities(qidoStudy['00080060'], qidoStudy['00080061'])) || '',
     })
   );
 
@@ -105,12 +102,7 @@ export function processSeriesResults(qidoSeries) {
  * @param {string} [queryParamaters]
  * @returns {Promise<results>} - Promise that resolves results
  */
-async function search(
-  dicomWebClient,
-  studyInstanceUid,
-  seriesInstanceUid,
-  queryParameters
-) {
+async function search(dicomWebClient, studyInstanceUid, seriesInstanceUid, queryParameters) {
   let searchResult = await dicomWebClient.searchForStudies({
     studyInstanceUid: undefined,
     queryParams: queryParameters,
@@ -136,10 +128,7 @@ export function seriesInStudy(dicomWebClient, studyInstanceUID) {
 }
 
 export default function searchStudies(server, filter) {
-  const queryParams = getQIDOQueryParams(
-    filter,
-    server.qidoSupportsIncludeField
-  );
+  const queryParams = getQIDOQueryParams(filter, server.qidoSupportsIncludeField);
   const options = {
     queryParams,
   };

extensions/default/src/DicomWebDataSource/retrieveStudyMetadata.js

@@ -28,14 +28,10 @@ export function retrieveStudyMetadata(
   // corresponding promise from the "StudyMetaDataPromises" map...
 
   if (!dicomWebClient) {
-    throw new Error(
-      `${moduleName}: Required 'dicomWebClient' parameter not provided.`
-    );
+    throw new Error(`${moduleName}: Required 'dicomWebClient' parameter not provided.`);
   }
   if (!StudyInstanceUID) {
-    throw new Error(
-      `${moduleName}: Required 'StudyInstanceUID' parameter not provided.`
-    );
+    throw new Error(`${moduleName}: Required 'StudyInstanceUID' parameter not provided.`);
   }
 
   // Already waiting on result? Return cached promise
@@ -52,7 +48,7 @@ export function retrieveStudyMetadata(
       filters,
       sortCriteria,
       sortFunction
-    ).then(function(data) {
+    ).then(function (data) {
       resolve(data);
     }, reject);
   });

extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts

@@ -50,14 +50,7 @@ export default class StaticWadoClient extends api.DICOMwebClient {
     const lowerParams = this.toLowerParams(queryParams);
     const filtered = searchResult.filter(study => {
       for (const key of Object.keys(StaticWadoClient.studyFilterKeys)) {
-        if (
-          !this.filterItem(
-            key,
-            lowerParams,
-            study,
-            StaticWadoClient.studyFilterKeys
-          )
-        ) {
+        if (!this.filterItem(key, lowerParams, study, StaticWadoClient.studyFilterKeys)) {
           return false;
         }
       }
@@ -80,14 +73,7 @@ export default class StaticWadoClient extends api.DICOMwebClient {
 
     const filtered = searchResult.filter(series => {
       for (const key of Object.keys(StaticWadoClient.seriesFilterKeys)) {
-        if (
-          !this.filterItem(
-            key,
-            lowerParams,
-            series,
-            StaticWadoClient.seriesFilterKeys
-          )
-        ) {
+        if (!this.filterItem(key, lowerParams, series, StaticWadoClient.seriesFilterKeys)) {
           return false;
         }
       }
@@ -132,10 +118,7 @@ export default class StaticWadoClient extends api.DICOMwebClient {
       } else if (desired[desired.length - 1] === '*') {
         return actual.indexOf(desired.substring(0, desired.length - 1)) != -1;
       } else if (desired[0] === '*') {
-        return (
-          actual.indexOf(desired.substring(1)) ===
-          actual.length - desired.length + 1
-        );
+        return actual.indexOf(desired.substring(1)) === actual.length - desired.length + 1;
       }
     }
     return desired === actual;

extensions/default/src/DicomWebDataSource/utils/fixBulkDataURI.ts

@@ -20,10 +20,7 @@ function fixBulkDataURI(value, instance, dicomWebConfig) {
   // in case of the relative path, make it absolute. The current DICOM standard says
   // the bulkdataURI is relative to the series. However, there are situations where
   // it can be relative to the study too
-  if (
-    !value.BulkDataURI.startsWith('http') &&
-    !value.BulkDataURI.startsWith('/')
-  ) {
+  if (!value.BulkDataURI.startsWith('http') && !value.BulkDataURI.startsWith('/')) {
     if (dicomWebConfig.bulkDataURI?.relativeResolution === 'studies') {
       value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${instance.StudyInstanceUID}/${value.BulkDataURI}`;
     } else if (

extensions/default/src/DicomWebDataSource/utils/getImageId.js

@@ -24,12 +24,7 @@ function buildInstanceWadoUrl(config, instance) {
  * @param thumbnail
  * @returns {string} The imageId to be used by Cornerstone
  */
-export default function getImageId({
-  instance,
-  frame,
-  config,
-  thumbnail = false,
-}) {
+export default function getImageId({ instance, frame, config, thumbnail = false }) {
   if (!instance) {
     return;
   }

extensions/default/src/DicomWebDataSource/wado/retrieveMetadata.js

@@ -20,9 +20,7 @@ async function RetrieveMetadata(
   sortFunction
 ) {
   const RetrieveMetadataLoader =
-    enableStudyLazyLoad !== false
-      ? RetrieveMetadataLoaderAsync
-      : RetrieveMetadataLoaderSync;
+    enableStudyLazyLoad !== false ? RetrieveMetadataLoaderAsync : RetrieveMetadataLoaderSync;
 
   const retrieveMetadataLoader = new RetrieveMetadataLoader(
     dicomWebClient,

extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoader.js

@@ -14,13 +14,7 @@ export default class RetrieveMetadataLoader {
    * @param {string} [filter.seriesInstanceUID] - series instance uid to filter results against
    * @param {Function} [sortSeries] - Custom sort function for series
    */
-  constructor(
-    client,
-    studyInstanceUID,
-    filters = {},
-    sortCriteria,
-    sortFunction
-  ) {
+  constructor(client, studyInstanceUID, filters = {}, sortCriteria, sortFunction) {
     this.client = client;
     this.studyInstanceUID = studyInstanceUID;
     this.filters = filters;

extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderAsync.js

@@ -1,8 +1,5 @@
 import dcmjs from 'dcmjs';
-import {
-  sortStudySeries,
-  sortingCriteria,
-} from '@ohif/core/src/utils/sortStudy';
+import { sortStudySeries, sortingCriteria } from '@ohif/core/src/utils/sortStudy';
 import RetrieveMetadataLoader from './retrieveMetadataLoader';
 
 /**
@@ -12,11 +9,7 @@ import RetrieveMetadataLoader from './retrieveMetadataLoader';
  * @param {Array} seriesInstanceUIDList A list of Series Instance UIDs
  * @returns {Object} Returns an object which supports loading of instances from each of given Series Instance UID
  */
-function makeSeriesAsyncLoader(
-  client,
-  studyInstanceUID,
-  seriesInstanceUIDList
-) {
+function makeSeriesAsyncLoader(client, studyInstanceUID, seriesInstanceUIDList) {
   return Object.freeze({
     hasNext() {
       return seriesInstanceUIDList.length > 0;
@@ -43,11 +36,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
    */
   *getPreLoaders() {
     const preLoaders = [];
-    const {
-      studyInstanceUID,
-      filters: { seriesInstanceUID } = {},
-      client,
-    } = this;
+    const { studyInstanceUID, filters: { seriesInstanceUID } = {}, client } = this;
 
     if (seriesInstanceUID) {
       const options = {
@@ -73,8 +62,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
 
     return sortStudySeries(
       naturalized,
-      sortCriteria ||
-        sortingCriteria.seriesSortCriteria.seriesInfoSortingCriteria,
+      sortCriteria || sortingCriteria.seriesSortCriteria.seriesInfoSortingCriteria,
       sortFunction
     );
   }
@@ -84,11 +72,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
 
     const seriesInstanceUIDs = preLoadData.map(s => s.SeriesInstanceUID);
 
-    const seriesAsyncLoader = makeSeriesAsyncLoader(
-      client,
-      studyInstanceUID,
-      seriesInstanceUIDs
-    );
+    const seriesAsyncLoader = makeSeriesAsyncLoader(client, studyInstanceUID, seriesInstanceUIDs);
 
     const promises = [];
 

extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderSync.js

@@ -31,11 +31,7 @@ export default class RetrieveMetadataLoaderSync extends RetrieveMetadataLoader {
    */
   *getLoaders() {
     const loaders = [];
-    const {
-      studyInstanceUID,
-      filters: { seriesInstanceUID } = {},
-      client,
-    } = this;
+    const { studyInstanceUID, filters: { seriesInstanceUID } = {}, client } = this;
 
     if (seriesInstanceUID) {
       loaders.push(
@@ -46,9 +42,7 @@ export default class RetrieveMetadataLoaderSync extends RetrieveMetadataLoader {
       );
     }
 
-    loaders.push(
-      client.retrieveStudyMetadata.bind(client, { studyInstanceUID })
-    );
+    loaders.push(client.retrieveStudyMetadata.bind(client, { studyInstanceUID }));
 
     yield* loaders;
   }