[OHIF-339] - workflow changes (#1931)

* workflow changes

* Cherry pick OHIF-310 into this PR.

* fix label bug and dead code

* remove comment

* Wire up CreateReportButton

* fix additionalFindingTypes + save interaction

* Remove unused createReportAsync call

* stub for report hydration prompt

* Update PR

* Remove debuggers

* push updated code

* Push updates

* push

* fix sidebar save

* enable tracking of new study or series

* fix for duplicate created report series in sidebard

* fix for unexpected viewport dialog after visiting study list then a new study

* Fix for hydration not marking multiple series as active

* Reviewer changes.

* Respond to final review comment, add series description setting for export.

Co-authored-by: James A. Petts <jamesapetts@gmail.com>

extensions/measurement-tracking/src/_shared/PROMPT_RESPONSES.js

@@ -0,0 +1,10 @@
+const RESPONSE = {
+  NO_NEVER: -1,
+  CANCEL: 0,
+  CREATE_REPORT: 1,
+  ADD_SERIES: 2,
+  SET_STUDY_AND_SERIES: 3,
+  NO_NOT_FOR_SERIES: 4,
+};
+
+export default RESPONSE;

extensions/measurement-tracking/src/_shared/createReportAsync.js

@@ -1,11 +1,24 @@
 import React from 'react';
-import { DICOMSR } from '@ohif/core';
+import { DICOMSR, DicomMetadataStore } from '@ohif/core';
 
-async function createReportAsync(servicesManager, dataSource, measurements) {
+/**
+ *
+ * @param {*} servicesManager
+ * @param {*} dataSource
+ * @param {*} measurements
+ * @param {*} options
+ * @returns {string[]} displaySetInstanceUIDs
+ */
+async function createReportAsync(
+  servicesManager,
+  dataSource,
+  measurements,
+  options
+) {
   const {
+    DisplaySetService,
     UINotificationService,
     UIDialogService,
-    DisplaySetService,
   } = servicesManager.services;
   const loadingDialogId = UIDialogService.create({
     showOverlay: true,
@@ -19,17 +32,24 @@ async function createReportAsync(servicesManager, dataSource, measurements) {
     const naturalizedReport = await DICOMSR.storeMeasurements(
       measurements,
       dataSource,
-      ['ArrowAnnotate']
+      ['ArrowAnnotate'],
+      options
     );
 
-    DisplaySetService.makeDisplaySets([naturalizedReport], {
-      madeInClient: true,
-    });
+    // The "Mode" route listens for DicomMetadataStore changes
+    // When a new instance is added, it listens and
+    // automatically calls makeDisplaySets
+    DicomMetadataStore.addInstances([naturalizedReport], true);
+
+    const displaySetInstanceUID = DisplaySetService.getMostRecentDisplaySet();
+
     UINotificationService.show({
       title: 'Create Report',
       message: 'Measurements saved successfully',
       type: 'success',
     });
+
+    return [displaySetInstanceUID];
   } catch (error) {
     UINotificationService.show({
       title: 'Create Report',

extensions/measurement-tracking/src/_shared/createReportDialogPrompt.js

@@ -0,0 +1,79 @@
+/* eslint-disable react/display-name */
+import React from 'react';
+import { Dialog, Input } from '@ohif/ui';
+import RESPONSE from './PROMPT_RESPONSES';
+
+export default function createReportDialogPrompt(UIDialogService) {
+  return new Promise(function(resolve, reject) {
+    let dialogId = undefined;
+
+    const _handleClose = () => {
+      // Dismiss dialog
+      UIDialogService.dismiss({ id: dialogId });
+      // Notify of cancel action
+      resolve({ action: RESPONSE.CANCEL, value: undefined });
+    };
+
+    /**
+     *
+     * @param {string} param0.action - value of action performed
+     * @param {string} param0.value - value from input field
+     */
+    const _handleFormSubmit = ({ action, value }) => {
+      UIDialogService.dismiss({ id: dialogId });
+      switch (action.id) {
+        case 'save':
+          resolve({ action: RESPONSE.CREATE_REPORT, value: value.label });
+          break;
+        case 'cancel':
+          resolve({ action: RESPONSE.CANCEL, value: undefined });
+          break;
+      }
+    };
+
+    dialogId = UIDialogService.create({
+      centralize: true,
+      isDraggable: false,
+      content: Dialog,
+      useLastPosition: false,
+      showOverlay: true,
+      contentProps: {
+        title: 'Provide a name for your report',
+        value: { label: '' },
+        noCloseButton: true,
+        onClose: _handleClose,
+        actions: [
+          { id: 'cancel', text: 'Cancel', type: 'secondary' },
+          { id: 'save', text: 'Save', type: 'primary' },
+        ],
+        // TODO: Should be on button press...
+        onSubmit: _handleFormSubmit,
+        body: ({ value, setValue }) => {
+          const onChangeHandler = event => {
+            event.persist();
+            setValue(value => ({ ...value, label: event.target.value }));
+          };
+          const onKeyPressHandler = event => {
+            if (event.key === 'Enter') {
+              UIDialogService.dismiss({ id: dialogId });
+              resolve({ action: RESPONSE.CREATE_REPORT, value: value.label });
+            }
+          };
+          return (
+            <div className="p-4 bg-primary-dark">
+              <Input
+                autoFocus
+                className="mt-2 bg-black border-primary-main"
+                type="text"
+                containerClassName="mr-2"
+                value={value.label}
+                onChange={onChangeHandler}
+                onKeyPress={onKeyPressHandler}
+              />
+            </div>
+          );
+        },
+      },
+    });
+  });
+}