Fixes after rebasing

platform/viewer/src/OHIFStandaloneViewer.js

@@ -191,8 +191,8 @@ class OHIFStandaloneViewer extends Component {
                   {match === null ? (
                     <></>
                   ) : (
-                      <Component match={match} location={this.props.location} />
-                    )}
+                    <Component match={match} location={this.props.location} />
+                  )}
                 </CSSTransition>
               )}
             </Route>

platform/viewer/src/components/ViewportGrid/ConnectedViewportGrid.js

@@ -37,9 +37,6 @@ const mapStateToProps = state => {
   };
 };
 
-const ConnectedViewportGrid = connect(
-  mapStateToProps,
-  null
-)(ViewportGrid);
+const ConnectedViewportGrid = connect(mapStateToProps, null)(ViewportGrid);
 
 export default ConnectedViewportGrid;

platform/viewer/src/components/ViewportGrid/ViewportGrid.js

@@ -12,7 +12,7 @@ import EmptyViewport from './EmptyViewport.js';
 
 const { loadAndCacheDerivedDisplaySets } = utils;
 
-const ViewportGrid = function (props) {
+const ViewportGrid = function(props) {
   const {
     activeViewportIndex,
     availablePlugins,
@@ -24,7 +24,7 @@ const ViewportGrid = function (props) {
     studies,
     viewportData,
     children,
-    isStudyLoaded
+    isStudyLoaded,
   } = props;
 
   const rowSize = 100 / numRows;

platform/viewer/src/connectedComponents/Viewer.js

@@ -307,16 +307,19 @@ class Viewer extends Component {
                 activeIndex={this.props.activeViewportIndex}
               />
             ) : (
-                <ConnectedStudyBrowser
-                  studies={this.state.thumbnails}
-                  studyMetadata={this.props.studies}
-                />
-              )}
+              <ConnectedStudyBrowser
+                studies={this.state.thumbnails}
+                studyMetadata={this.props.studies}
+              />
+            )}
           </SidePanel>
 
           {/* MAIN */}
           <div className={classNames('main-content')}>
-            <ConnectedViewerMain studies={this.props.studies} isStudyLoaded={this.props.isStudyLoaded} />
+            <ConnectedViewerMain
+              studies={this.props.studies}
+              isStudyLoaded={this.props.isStudyLoaded}
+            />
           </div>
 
           {/* RIGHT */}
@@ -349,7 +352,7 @@ export default withDialog(Viewer);
  * @param {Study[]} studies
  * @param {DisplaySet[]} studies[].displaySets
  */
-const _mapStudiesToThumbnails = function (studies) {
+const _mapStudiesToThumbnails = function(studies) {
   return studies.map(study => {
     const { StudyInstanceUID } = study;
 

platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js

@@ -105,7 +105,7 @@ const _showUserMessage = (queryParamApplied, message, dialog = {}) => {
     return;
   }
 
-  const { show: showUserMessage = () => { } } = dialog;
+  const { show: showUserMessage = () => {} } = dialog;
   showUserMessage({
     message,
   });
@@ -125,7 +125,7 @@ const _addSeriesToStudy = (studyMetadata, series) => {
 
   studyMetadata.createAndAddDisplaySetsForSeries(
     sopClassHandlerModules,
-    seriesMetadata,
+    seriesMetadata
   );
   study.displaySets = studyMetadata.getDisplaySets();
   _updateStudyMetadataManager(study, studyMetadata);
@@ -265,7 +265,8 @@ function ViewerRetrieveStudyData({
       return loadNextSeries();
     };
 
-    const concurrentRequestsAllowed = maxConcurrentMetadataRequests || studyMetadata.getSeriesCount();
+    const concurrentRequestsAllowed =
+      maxConcurrentMetadataRequests || studyMetadata.getSeriesCount();
     const promises = Array(concurrentRequestsAllowed)
       .fill(null)
       .map(loadNextSeries);

platform/viewer/src/context/AppContext.js

@@ -6,7 +6,7 @@ let AppContext = React.createContext({});
 
 export const CONTEXTS = {
   CORNERSTONE: 'ACTIVE_VIEWPORT::CORNERSTONE',
-  VTK: 'ACTIVE_VIEWPORT::VTK'
+  VTK: 'ACTIVE_VIEWPORT::VTK',
 };
 
 export const useAppContext = () => useContext(AppContext);
@@ -25,7 +25,11 @@ export const withAppContext = Component => {
   return function WrappedComponent(props) {
     const { appConfig, activeContexts } = useAppContext();
     return (
-      <Component {...props} appConfig={appConfig} activeContexts={activeContexts} />
+      <Component
+        {...props}
+        appConfig={appConfig}
+        activeContexts={activeContexts}
+      />
     );
   };
 };

platform/viewer/src/routes/routesUtil.js

@@ -54,7 +54,7 @@ const ROUTES_DEF = {
     },
     IHEInvokeImageDisplay: {
       path: '/IHEInvokeImageDisplay',
-      component: IHEInvokeImageDisplay
+      component: IHEInvokeImageDisplay,
     },
   },
   gcloud: {