diff --git a/.circleci/config.yml b/.circleci/config.yml index 96fa185c84c..d2fce6395a3 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 1df0a98070d..43fec70cfdf 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 59c2e876746..5c1fee88e25 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 */}
- {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 a247326e3ea..fce3fb4ed62 100644 --- a/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx +++ b/platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx @@ -104,18 +104,20 @@ const SegmentationGroupTable = ({
) : (
- + {!disableEditing && ( + + )} {!disableEditing && showAddSegment && ( onSegmentAdd(activeSegmentationId)} /> )}