chore: Clean up unused files, imports, and work on getting end-to-end tests and unit tests running (#2272)

extensions/default/package.json

@@ -29,12 +29,14 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "@ohif/i18n": "^0.52.8",
-    "react-i18next": "^10.11.0",
+    "dcmjs": "0.16.1",
+    "dicomweb-client": "^0.6.0",
     "prop-types": "^15.6.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-i18next": "^10.11.0",
     "webpack": "^4.0.0",
-    "dcmjs": "0.16.1"
+    "webpack-merge": "^5.7.3"
   },
   "dependencies": {
     "@babel/runtime": "7.7.6"

extensions/default/src/DicomWebDataSource/index.js

@@ -10,7 +10,7 @@ import dcm4cheeReject from './dcm4cheeReject';
 import { DicomMetadataStore, IWebApiDataSource, utils } from '@ohif/core';
 
 import getImageId from './utils/getImageId';
-import * as dcmjs from 'dcmjs';
+import dcmjs from 'dcmjs';
 import {
   retrieveStudyMetadata,
   deleteStudyMetadataPromise,

extensions/default/src/DicomWebDataSource/qido.js

@@ -170,7 +170,8 @@ function mapParams(params, options = {}) {
   const parameters = {
     // Named
     PatientName: withWildcard(params.patientName),
-    PatientID: withWildcard(params.patientId),
+    //PatientID: withWildcard(params.patientId),
+    "00100020": withWildcard(params.patientId), // Temporarily to make the tests pass with dicomweb-server.. Apparently it's broken?
     AccessionNumber: withWildcard(params.accessionNumber),
     StudyDescription: withWildcard(params.studyDescription),
     ModalitiesInStudy: params.modalitiesInStudy,

extensions/default/src/PanelMeasurementTable.js

@@ -43,20 +43,16 @@ export default function PanelMeasurementTable({
     };
   }, [MeasurementService]);
 
-  // const activeMeasurementItem = 0;
-
   return (
-    <>
-      <div className="overflow-x-hidden overflow-y-auto invisible-scrollbar">
-        <MeasurementTable
-          title="Measurements"
-          amount={displayMeasurements.length}
-          data={displayMeasurements}
-          onClick={({ id }) => alert(`Click: ${id}`)}
-          onEdit={({ id }) => alert(`Edit: ${id}`)}
-        />
-      </div>
-    </>
+    <div className="overflow-x-hidden overflow-y-auto invisible-scrollbar">
+      <MeasurementTable
+        title="Measurements"
+        amount={displayMeasurements.length}
+        data={displayMeasurements}
+        onClick={({ id }) => alert(`Click: ${id}`)}
+        onEdit={({ id }) => alert(`Edit: ${id}`)}
+      />
+    </div>
   );
 }
 

extensions/default/src/Toolbar/ToolbarLayoutSelector.jsx

@@ -48,7 +48,7 @@ function LayoutSelector() {
         )
       }
       isActive={isOpen}
-      type="primary"
+      type="toggle"
     />
   );
 }

extensions/default/src/getContextModule.js

@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { ViewModelContext } from '@ohif/core';
 
 const HelloWorldContext = React.createContext({
   message: 'HelloWorldContextTesting',