othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prevent viewer crash when opening DICOM Tag Browser from empty viewport (#5827)

Browse Source
This commit is contained in:
Ghadeer Albattarni 2026-02-24 08:53:05 -05:00 committed by GitHub
parent a8f709982f
commit d11d6d401b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/default/src/commandsModule.ts
View File

@ -656,7 +656,9 @@ const commandsModule = ({
const displaySets = displaySetService.activeDisplaySets;
const { UIModalService } = servicesManager.services;
const defaultDisplaySetInstanceUID = displaySetInstanceUID || displaySetInstanceUIDs[0];
const defaultDisplaySetInstanceUID =
displaySetInstanceUID || displaySetInstanceUIDs[0] || displaySets[0]?.displaySetInstanceUID;
UIModalService.show({
content: DicomTagBrowser,
contentProps: {

53
tests/DicomTagBrowser.spec.ts
View File

@ -60,3 +60,56 @@ test('should display the long series name properly within the series select butt
outerBoxLabel: 'trigger',
});
});
test('should open DICOM Tag Browser from empty viewport and show default series', async ({
page,
mainToolbarPageObject,
viewportPageObject,
DOMOverlayPageObject,
}) => {
const studyInstanceUID = '1.3.6.1.4.1.25403.345050719074.3824.20170125095258.1';
const mode = 'viewer';
await visitStudy(page, studyInstanceUID, mode, 2000);
// Switch to 3x3 layout
await mainToolbarPageObject.layoutSelection.click();
await page.getByTestId('Layout-2-2').click();
await viewportPageObject.getNth(6).pane.click();
await mainToolbarPageObject.moreTools.tagBrowser.click();
const dicomTagBrowser = DOMOverlayPageObject.dialog.dicomTagBrowser;
await dicomTagBrowser.waitVisible();
const seriesSelect = dicomTagBrowser.seriesSelect;
const optionText = await seriesSelect.getOptionText(0);
await expect(seriesSelect.value).toContainText(optionText);
});
test('should open DICOM Tag Browser with active viewport series when viewport has display set', async ({
page,
mainToolbarPageObject,
viewportPageObject,
DOMOverlayPageObject,
}) => {
const studyInstanceUID = '1.3.6.1.4.1.25403.345050719074.3824.20170125095258.1';
const mode = 'viewer';
await visitStudy(page, studyInstanceUID, mode, 2000);
await mainToolbarPageObject.layoutSelection.click();
await page.getByTestId('Layout-2-2').click();
await viewportPageObject.getNth(2).pane.click();
await mainToolbarPageObject.moreTools.tagBrowser.click();
const dicomTagBrowser = DOMOverlayPageObject.dialog.dicomTagBrowser;
await dicomTagBrowser.waitVisible();
const seriesSelect = dicomTagBrowser.seriesSelect;
const optionText = await seriesSelect.getOptionText(2);
await expect(seriesSelect.value).toContainText(optionText);
});

9
tests/pages/DicomTagBrowserPageObject.ts
View File

@ -29,13 +29,16 @@ export class DicomTagBrowserPageObject {
await trigger.click();
},
async selectOption(index) {
async getOptionText(index) {
await this.click();
const optionText = await options.nth(index).innerText();
const selectedText = optionText.split('\n')[0].trim();
const trimmedOptionText = optionText.split('\n')[0].trim();
return trimmedOptionText;
},
async selectOption(index) {
const selectedText = await this.getOptionText(index);
await options.nth(index).click();
return selectedText;
},
};