Refactor modal handling for display sets and findings; extract modals into partials for improved maintainability

2026-03-23 16:13:56 +00:00
parent 90e22435a5
commit de5b6c36f3
4 changed files with 92 additions and 65 deletions
@@ -331,7 +331,32 @@
        var popup = document.createElement('div'); popup.id = 'markup-popup'; popup.className = 'markup-popup';
        popup.innerHTML = '<div style="font-weight:600;margin-bottom:.25rem;">'+ (label||type+':'+pk) +'</div>';
        var openBtn = document.createElement('button'); openBtn.type='button'; openBtn.className='btn btn-sm btn-outline-primary me-2'; openBtn.textContent='Open';
-        openBtn.addEventListener('click', function(){ var url = getDetailUrl(type, pk); if(url) showModalForUrl(url, label); popup.remove(); });
+        openBtn.addEventListener('click', function(){
+            var url = getDetailUrl(type, pk);
+            try{
+                // Prefer page-specific modal loaders if present so we reuse existing Bootstrap modals/viewers
+                if(type === 'displayset'){
+                    if(typeof window.loadDisplaysetModal === 'function'){
+                        window.loadDisplaysetModal(url, pk);
+                        popup.remove();
+                        return;
+                    }
+                    var dsBtn = document.querySelector('.view-displayset-modal[data-ds-id="'+pk+'"]');
+                    if(dsBtn){ dsBtn.click(); popup.remove(); return; }
+                }
+                if(type === 'seriesfinding' || type === 'finding'){
+                    if(typeof window.loadFindingModal === 'function'){
+                        window.loadFindingModal(pk, url);
+                        popup.remove();
+                        return;
+                    }
+                    var fBtn = document.querySelector('.view-finding-modal[data-finding-id="'+pk+'"]');
+                    if(fBtn){ fBtn.click(); popup.remove(); return; }
+                }
+            }catch(e){ console.warn('error invoking page modal loader', e); }
+            if(url) showModalForUrl(url, label);
+            popup.remove();
+        });
        var closeBtn = document.createElement('button'); closeBtn.type='button'; closeBtn.className='btn btn-sm btn-outline-secondary'; closeBtn.textContent='Close'; closeBtn.addEventListener('click', function(){ popup.remove(); });
        popup.appendChild(openBtn); popup.appendChild(closeBtn);
        document.body.appendChild(popup);