From 5f08cae235c6f22060858fb97fb675d733172c73 Mon Sep 17 00:00:00 2001 From: Birm Date: Tue, 28 Jul 2026 14:37:19 -0400 Subject: [PATCH 1/4] easier to use dicomweb --- apps/dicom-web/table.html | 35 ++++++++++- apps/dicom-web/table.js | 119 +++++++++++++++++++++++++------------- apps/table.html | 6 ++ core/Store.js | 22 +++++++ 4 files changed, 142 insertions(+), 40 deletions(-) diff --git a/apps/dicom-web/table.html b/apps/dicom-web/table.html index 65f0e8118..679277dd0 100644 --- a/apps/dicom-web/table.html +++ b/apps/dicom-web/table.html @@ -99,10 +99,43 @@

caMicroscope

+ +
- + + + + + + diff --git a/apps/dicom-web/table.js b/apps/dicom-web/table.js index b4710805f..be49782f1 100644 --- a/apps/dicom-web/table.js +++ b/apps/dicom-web/table.js @@ -1,21 +1,3 @@ -/** - * static variables - */ - -const sources = [{ - 'name': 'j4care', - 'url': 'https://ihe.j4care.com:18443/dcm4chee-arc/aets/DCM4CHEE/rs', - -}, { - 'name': 'google', - 'url': 'https://dicomwebproxy.app/dicomWeb', -}, { - 'name': 'BMD', - 'url': 'https://dicom-wg26.bmd-software.com/ext/dicom-web', -}]; -// const j4careStudiesUrl = 'https://development.j4care.com:11443/dcm4chee-arc/aets/DCM4CHEE/rs' -// const dicomWebStudiesUrl = 'https://dicomwebproxy-bqmq3usc3a-uc.a.run.app/dicomWeb' - /** * global variables */ @@ -29,20 +11,15 @@ const datatableConfig = { ], }; - +// DICOMweb sources are persisted as a Configuration document +// (config_name: 'dicomweb_sources', configuration: [{id, name, url}]), +// the same pattern used for e.g. channel-view presets. `pageStates.sourcesDoc` +// holds the loaded document (or null if none exists yet) so add/remove can +// tell whether to create or update it. const pageStates = { + sourcesDoc: null, sources: { - data: [{ - 'name': 'j4care', - 'url': 'https://ihe.j4care.com:18443/dcm4chee-arc/aets/DCM4CHEE/rs', - - }, { - 'name': 'google', - 'url': 'https://dicomwebproxy-bqmq3usc3a-uc.a.run.app/dicomWeb', - }, { - 'name': 'BMD', - 'url': 'https://dicom-wg26.bmd-software.com/ext/dicom-web', - }], + data: [], }, studies: { data: null, @@ -56,6 +33,64 @@ const pageStates = { status: 'sources', // 'sources, studies, series, instsances' }; var studies = []; +var store; + +/** + * loads the dicomweb_sources Configuration document into pageStates. + * @return {promise} - resolves once pageStates.sourcesDoc/sources.data are populated + */ +function loadSources() { + return store.getConfigByName('dicomweb_sources').then((list) => { + const doc = (list && list.length) ? list[0] : null; + // Configuration/find returns _id as extended-JSON ({$oid: ...}), but + // Configuration/update expects a plain string; normalize it here. + if (doc && doc._id && doc._id.$oid) doc._id = doc._id.$oid; + pageStates.sourcesDoc = doc; + pageStates.sources.data = doc ? doc.configuration : []; + }); +} + +/** + * adds a new source (read from the Add Source dialog inputs), persists it, + * and refreshes the sources table. + */ +async function addSource() { + const name = document.getElementById('sourceNameInput').value.trim(); + const url = document.getElementById('sourceUrlInput').value.trim(); + if (!name || !/^https?:\/\//i.test(url)) { + alert('Please provide a name and a URL starting with http:// or https://'); + return; + } + const source = {id: randomId(), name: name, url: url}; + if (!pageStates.sourcesDoc) { + const result = await store.post('Configuration', { + config_name: 'dicomweb_sources', + configuration: [source], + }); + pageStates.sourcesDoc = {_id: result.insertedIds['0'], configuration: [source]}; + } else { + pageStates.sourcesDoc.configuration.push(source); + await store.updateDicomwebSources( + pageStates.sourcesDoc._id, pageStates.sourcesDoc.configuration); + } + pageStates.sources.data = pageStates.sourcesDoc.configuration; + document.getElementById('sourceNameInput').value = ''; + document.getElementById('sourceUrlInput').value = ''; + $('#add-source-dialog').modal('hide'); + datatable.clear().rows.add(pageStates.sources.data).draw(); +} + +/** + * removes a source by id, persists the change, and refreshes the sources table. + * @param {string} id - the source's id (not the Configuration doc's _id) + */ +async function removeSource(id) { + pageStates.sourcesDoc.configuration = pageStates.sourcesDoc.configuration.filter((s) => s.id !== id); + await store.updateDicomwebSources( + pageStates.sourcesDoc._id, pageStates.sourcesDoc.configuration); + pageStates.sources.data = pageStates.sourcesDoc.configuration; + datatable.clear().rows.add(pageStates.sources.data).draw(); +} function getStudies(baseUrl) { @@ -98,12 +133,13 @@ function sanitize(string) { } -function initialize() { +async function initialize() { const params = getUrlVars(); console.log('params'); console.log(params); // store - const store = new Store('../../data/'); + store = new Store('../../data/'); + await loadSources(); if (params.status=='studies'&¶ms.source) { pageStates.status = params.status; } else if (params.status=='series'&¶ms.source&¶ms.studyId) { // series table @@ -118,15 +154,20 @@ function initialize() { //
  • Instances
    • switch (pageStates.status) { case 'sources': + $('#addSourceBtn').show(); $('#breadcrumb').append(`
  • Sources
    • `); function generateLink(data, type, row) { - return `${row.name}`; + return `${sanitize(row.name)}`; + } + function generateRemove(data, type, row) { + return ``; } datatable = $('#datatable').DataTable({ ...datatableConfig, 'data': pageStates[pageStates.status].data, 'columns': [ {data: 'name', title: 'Name', render: generateLink}, + {data: null, title: '', render: generateRemove}, ], }); @@ -134,8 +175,8 @@ function initialize() { case 'studies': // get source info - var idx = sources.findIndex((elt)=>elt.name==params.source); - var src = sources[idx]; + var idx = pageStates.sources.data.findIndex((elt)=>elt.name==decodeURIComponent(params.source)); + var src = pageStates.sources.data[idx]; // create breadcrumb for studies $('#breadcrumb').append(`
  • Sources
    • `); @@ -181,8 +222,8 @@ function initialize() { break; case 'series': // get source info - var idx = sources.findIndex((elt)=>elt.name==params.source); - var src = sources[idx]; + var idx = pageStates.sources.data.findIndex((elt)=>elt.name==decodeURIComponent(params.source)); + var src = pageStates.sources.data[idx]; // create breadcrumb for series $('#breadcrumb').append(`
  • Sources
    • `); @@ -323,8 +364,8 @@ function initialize() { break; case 'instances': // get source info - var idx = sources.findIndex((elt)=>elt.name==params.source); - var src = sources[idx]; + var idx = pageStates.sources.data.findIndex((elt)=>elt.name==decodeURIComponent(params.source)); + var src = pageStates.sources.data[idx]; // create breadcrumb for instances const backSeriesUrl = `../dicom-web/table.html?source=${params.source}&status=series&studyId=${params.studyId}`; $('#breadcrumb').append(`
  • Sources
    • `); diff --git a/apps/table.html b/apps/table.html index 7cbd0c0db..853ffc1a7 100644 --- a/apps/table.html +++ b/apps/table.html @@ -155,6 +155,12 @@

    caMicroscope

    class="fas fa-server">  DICOM +
    + +  DICOMweb +