From 4dc2acdefa872dd1d8df47f465e9e9656f95f67f Mon Sep 17 00:00:00 2001
From: rodrigobasilio2022
 <114958722+rodrigobasilio2022@users.noreply.github.com>
Date: Tue, 3 Oct 2023 15:02:21 -0300
Subject: [PATCH] fix(editing): regression bug in disable editing (#3687)

---
 .circleci/config.yml                          |  6 +++--
 .../cypress/integration/MultiStudy.spec.js    | 11 ++++----
 .../SegmentationGroupSegment.tsx              |  4 ++-
 .../SegmentationGroupTable.tsx                | 26 ++++++++++---------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 96fa185c8..d2fce6395 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -416,11 +416,13 @@ jobs:
 workflows:
   PR_CHECKS:
     jobs:
-      - BUILD_PACKAGES_QUICK
+      - BUILD_PACKAGES_QUICK:
+          filters:
+            branches:
+              ignore: master
       - UNIT_TESTS:
           requires:
             - BUILD_PACKAGES_QUICK
-
       - CYPRESS_CUSTOM_RUN:
           name: 'Cypress Tests'
           context: cypress
diff --git a/platform/app/cypress/integration/MultiStudy.spec.js b/platform/app/cypress/integration/MultiStudy.spec.js
index 1df0a9807..43fec70cf 100644
--- a/platform/app/cypress/integration/MultiStudy.spec.js
+++ b/platform/app/cypress/integration/MultiStudy.spec.js
@@ -1,13 +1,12 @@
 describe('OHIF Multi Study', () => {
   const beforeSetup = () => {
-    cy.checkStudyRouteInViewer(
+    cy.initViewer(
       '1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1,1.2.840.113619.2.5.1762583153.215519.978957063.78',
-      '&hangingProtocolId=@ohif/hpCompare'
+      {
+        params: '&hangingProtocolId=@ohif/hpCompare',
+        minimumThumbnails: 3,
+      }
     );
-    cy.expectMinimumThumbnails(4);
-    cy.initCornerstoneToolsAliases();
-    cy.initCommonElementsAliases();
-    cy.waitDicomImage();
   };
 
   it('Should display 2 comparison up', () => {
diff --git a/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupSegment.tsx b/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupSegment.tsx
index 59c2e8767..5c1fee88e 100644
--- a/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupSegment.tsx
+++ b/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupSegment.tsx
@@ -131,6 +131,7 @@ const SegmentItem = ({
           {/* Icons that show only when hovering */}
           <div className="hidden group-hover/row:flex">
             <HoveringIcons
+              disableEditing={disableEditing}
               onEdit={onEdit}
               isLocked={isLocked}
               isVisible={isVisible}
@@ -147,6 +148,7 @@ const SegmentItem = ({
 };
 
 const HoveringIcons = ({
+  disableEditing,
   onEdit,
   isLocked,
   isVisible,
@@ -172,7 +174,7 @@ const HoveringIcons = ({
 
   return (
     <div className="flex items-center">
-      {createIcon('row-edit', onEdit)}
+      {!disableEditing && createIcon('row-edit', onEdit)}
       {createIcon(
         isLocked ? 'row-lock' : 'row-unlock',
         onToggleLocked,
diff --git a/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx b/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx
index a247326e3..fce3fb4ed 100644
--- a/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx
+++ b/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx
@@ -104,18 +104,20 @@ const SegmentationGroupTable = ({
             </div>
           ) : (
             <div className="mt-1 select-none">
-              <SegmentationDropDownRow
-                segmentations={segmentations}
-                disableEditing={disableEditing}
-                activeSegmentation={activeSegmentation}
-                onActiveSegmentationChange={onActiveSegmentationChange}
-                onSegmentationDelete={onSegmentationDelete}
-                onSegmentationEdit={onSegmentationEdit}
-                onSegmentationDownload={onSegmentationDownload}
-                storeSegmentation={storeSegmentation}
-                onSegmentationAdd={onSegmentationAdd}
-                onToggleSegmentationVisibility={onToggleSegmentationVisibility}
-              />
+              {!disableEditing && (
+                <SegmentationDropDownRow
+                  segmentations={segmentations}
+                  disableEditing={disableEditing}
+                  activeSegmentation={activeSegmentation}
+                  onActiveSegmentationChange={onActiveSegmentationChange}
+                  onSegmentationDelete={onSegmentationDelete}
+                  onSegmentationEdit={onSegmentationEdit}
+                  onSegmentationDownload={onSegmentationDownload}
+                  storeSegmentation={storeSegmentation}
+                  onSegmentationAdd={onSegmentationAdd}
+                  onToggleSegmentationVisibility={onToggleSegmentationVisibility}
+                />
+              )}
               {!disableEditing && showAddSegment && (
                 <AddSegmentRow onClick={() => onSegmentAdd(activeSegmentationId)} />
               )}