From 2639d90e5e6996a3c142daedd5748164c23168e3 Mon Sep 17 00:00:00 2001
From: Alireza <ar.sedghi@gmail.com>
Date: Fri, 19 Aug 2022 19:35:29 -0400
Subject: [PATCH] fix: hanging protocol for the tmtv (#2882)

---
 extensions/tmtv/src/Panels/PanelPetSUV.tsx          | 11 +++++++----
 extensions/tmtv/src/getHangingProtocolModule.js     | 13 +------------
 modes/tmtv/src/index.js                             |  2 +-
 .../HangingProtocolService/ProtocolEngine.js        |  7 +++++--
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/extensions/tmtv/src/Panels/PanelPetSUV.tsx b/extensions/tmtv/src/Panels/PanelPetSUV.tsx
index 9f895cce5..3e6f102fe 100644
--- a/extensions/tmtv/src/Panels/PanelPetSUV.tsx
+++ b/extensions/tmtv/src/Panels/PanelPetSUV.tsx
@@ -24,8 +24,11 @@ const DEFAULT_MEATADATA = {
  */
 export default function PanelPetSUV({ servicesManager, commandsManager }) {
   const { t } = useTranslation('PanelSUV');
-  const { DisplaySetService, ToolGroupService, ToolBarService } =
-    servicesManager.services;
+  const {
+    DisplaySetService,
+    ToolGroupService,
+    ToolBarService,
+  } = servicesManager.services;
   const [metadata, setMetadata] = useState(DEFAULT_MEATADATA);
   const [ptDisplaySet, setPtDisplaySet] = useState(null);
 
@@ -210,7 +213,7 @@ export default function PanelPetSUV({ servicesManager, commandsManager }) {
               }}
             />
             <Input
-              label={t('Injection Time (Seconds)')}
+              label={t('Injection Time (s)')}
               labelClassName="text-white"
               className="mt-1 mb-2 bg-black border-primary-main"
               type="text"
@@ -228,7 +231,7 @@ export default function PanelPetSUV({ servicesManager, commandsManager }) {
               }}
             />
             <Input
-              label={t('Acquisition Time (Seconds)')}
+              label={t('Acquisition Time (s)')}
               labelClassName="text-white"
               className="mt-1 mb-2 bg-black border-primary-main"
               type="text"
diff --git a/extensions/tmtv/src/getHangingProtocolModule.js b/extensions/tmtv/src/getHangingProtocolModule.js
index 22b0d3bf7..d92a5fd08 100644
--- a/extensions/tmtv/src/getHangingProtocolModule.js
+++ b/extensions/tmtv/src/getHangingProtocolModule.js
@@ -1,5 +1,5 @@
 const ptCT = {
-  id: 'test',
+  id: 'tmtv-pt-ct',
   locked: true,
   hasUpdatedPriorsInformation: false,
   name: 'Default',
@@ -15,17 +15,6 @@ const ptCT = {
   ],
   imageLoadStrategy: 'interleaveTopToBottom', // "default" , "interleaveTopToBottom",  "interleaveCenter"
   protocolMatchingRules: [
-    {
-      id: 'wauZK2QNEfDPwcAQo',
-      weight: 1,
-      attribute: 'StudyInstanceUID',
-      constraint: {
-        contains: {
-          value: '1.3.6.1.4.',
-        },
-      },
-      required: false,
-    },
     {
       id: 'wauZK2QNEfDPwcAQo',
       weight: 1,
diff --git a/modes/tmtv/src/index.js b/modes/tmtv/src/index.js
index d4a7234d2..734020e9e 100644
--- a/modes/tmtv/src/index.js
+++ b/modes/tmtv/src/index.js
@@ -186,7 +186,7 @@ function modeFactory({ modeConfiguration }) {
       },
     ],
     extensions: extensionDependencies,
-    hangingProtocols: [ohif.hangingProtocols, tmtv.hangingProtocols],
+    hangingProtocols: [tmtv.hangingProtocols],
     sopClassHandlers: [ohif.sopClassHandler],
     hotkeys: [...hotkeys.defaults.hotkeyBindings],
   };
diff --git a/platform/core/src/services/HangingProtocolService/ProtocolEngine.js b/platform/core/src/services/HangingProtocolService/ProtocolEngine.js
index 7649c2e5d..260c7a248 100644
--- a/platform/core/src/services/HangingProtocolService/ProtocolEngine.js
+++ b/platform/core/src/services/HangingProtocolService/ProtocolEngine.js
@@ -116,12 +116,15 @@ export default class ProtocolEngine {
       }
     });
 
-    // If no matches were found, select the default protocol
+    // If no matches were found, select the default protocol if provided
+    // if not select the first protocol in the list
     if (!matched.length) {
       return [
         {
           score: 1,
-          protocol: this.protocols.find(protocol => protocol.id === 'default'),
+          protocol:
+            this.protocols.find(protocol => protocol.id === 'default') ??
+            this.protocols[0],
         },
       ];
     }