From 2f28a0deab5e43f432bbd9b5989928c9b0450278 Mon Sep 17 00:00:00 2001
From: ZZzzaaKK <66885975+ZZzzaaKK@users.noreply.github.com>
Date: Thu, 2 Oct 2025 23:05:45 +0200
Subject: [PATCH] fix(studyBrowserCustomization): fix thumbnail menu item
 actions in study browser (#5283)

---
 extensions/default/src/commandsModule.ts      |  5 +++++
 .../studyBrowserCustomization.ts              | 22 ++-----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/extensions/default/src/commandsModule.ts b/extensions/default/src/commandsModule.ts
index b701ab3be..3784b14a7 100644
--- a/extensions/default/src/commandsModule.ts
+++ b/extensions/default/src/commandsModule.ts
@@ -65,6 +65,11 @@ const commandsModule = ({
      * @param options.removeFirst - Optional flag to remove the display set first if it's already added
      */
     addDisplaySetAsLayer: ({ viewportId, displaySetInstanceUID, removeFirst = false }) => {
+      if (!viewportId) {
+          const { activeViewportId } = servicesManager.services.viewportGridService.getState();
+          viewportId = activeViewportId;
+      }
+
       if (!viewportId || !displaySetInstanceUID) {
         console.warn('Missing required parameters for addDisplaySetAsLayer command');
         return;
diff --git a/extensions/default/src/customizations/studyBrowserCustomization.ts b/extensions/default/src/customizations/studyBrowserCustomization.ts
index a2ea9a83b..286832a80 100644
--- a/extensions/default/src/customizations/studyBrowserCustomization.ts
+++ b/extensions/default/src/customizations/studyBrowserCustomization.ts
@@ -9,31 +9,13 @@ export default {
       id: 'tagBrowser',
       label: i18n.t('StudyBrowser:Tag Browser'),
       iconName: 'DicomTagBrowser',
-      onClick: ({ commandsManager, displaySetInstanceUID }: withAppTypes) => {
-        commandsManager.runCommand('openDICOMTagViewer', {
-          displaySetInstanceUID,
-        });
-      },
+      commands: 'openDICOMTagViewer',
     },
     {
       id: 'addAsLayer',
       label: i18n.t('StudyBrowser:Add as Layer'),
       iconName: 'ViewportViews',
-      onClick: ({ commandsManager, displaySetInstanceUID, servicesManager }: withAppTypes) => {
-        const { viewportGridService } = servicesManager.services;
-
-        // Get the active viewport
-        const { activeViewportId } = viewportGridService.getState();
-        if (!activeViewportId) {
-          return;
-        }
-
-        // Use the new command to add the display set as a layer
-        commandsManager.runCommand('addDisplaySetAsLayer', {
-          viewportId: activeViewportId,
-          displaySetInstanceUID,
-        });
-      },
+      commands: 'addDisplaySetAsLayer',
     },
   ],
   'studyBrowser.sortFunctions': [