Sec patches

.github/workflows/axe-a11y-check.yml

@@ -15,26 +15,26 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm install -g http-server
+      - run: npm ci
+      - run: npm install -g http-server@14.1.1
       - run: npm run build --if-present
       - run: http-server -s &
       - name: Install specific version of ChromeDriver
         run: npm install -g chromedriver@125
       - name: Run axe
         id: axe-test
         run: |
-          npm install -g @axe-core/cli
+          npm install -g @axe-core/cli@4.12.1
           sleep 90
           axe http://127.0.0.1:8080 --chromedriver-path $(npm root -g)/chromedriver/bin/chromedriver --exit || echo "status=warning" >> $GITHUB_ENV
-      
+
       - name: Set output status to warning (if test fails)
         if: env.status == 'warning'
         run: echo "::warning::Accessibility tests failed, but this does not block (most) PRs."

.github/workflows/node.js.yml

@@ -12,22 +12,17 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm install
-    - run: npm install jsdom
-    - run: npm install -g http-server
-    - run: npm install -g mocha
-    - run: npm install eslint
-    - run: npm install eslint-config-google
-    - run: http-server -s &
-    - run: npm run build --if-present
+    - run: npm ci
+    - run: npx http-server -s . &
     - run: npm run lint
     - run: npm test
+    - run: npm run test-mocha

.github/workflows/test.yml

@@ -14,18 +14,21 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'  
+          node-version: '24.x'
 
-      - name: Install dependencies and ESLint
-        run: |
-          npm install
-          npm install eslint eslint-config-google
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Start static file server
+        run: npx http-server -s . &
 
-      - name: Run Jest tests and linting
+      - name: Run linting and tests
         run: |
-          npm run lint && npm test
+          npm run lint
+          npm test
+          npm run test-mocha

.mocharc.json

@@ -0,0 +1,4 @@
+{
+  "require": "./test/config.js",
+  "spec": "test/ui/**/*.js"
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM httpd:alpine
+FROM httpd:2.4-alpine
 EXPOSE 80
 ARG cacheoff
 COPY ./ /usr/local/apache2/htdocs/

apps/Info.html

@@ -16,7 +16,7 @@
 
 	<title>caMicroscope - Information Dashboard</title>
 
-	<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"	integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"	crossorigin="anonymous"></script>
+	<script src="../common/jquery.js"></script>
 
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css" 
 		rel="stylesheet" 
@@ -191,6 +191,7 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
 	<script src='../common/util.js'></script>
 	<script src='../common/ajv.js'></script>
 	<script src='../components/loading/loading.js'></script>
+	<script src="../common/dompurify.js"></script>
 	<script src="./loader/loader.js"></script>
 	<script src="./loader/chunked_upload.js"></script>
 

apps/admin/admin.html

@@ -116,11 +116,7 @@
       </div>
     </div>
     <!-- bootstrap -->
-    <script
-      src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
-      integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
-      crossorigin="anonymous"
-    ></script>
+    <script src="../../common/jquery.js"></script>
     <script
       src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
       integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"

apps/batchloader/batchloader.html

@@ -17,7 +17,7 @@
     <script>
       __auth_check(2);
     </script>
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script src="../../common/jquery.js"></script>
     <script
       src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
       integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"

apps/collection/collection.html

@@ -269,7 +269,7 @@ <h6 class="modal-title" id="del-label">
   <button type="button" class="close"><span aria-hidden="true">&times;</span></button>
 </div> -->
 
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script src="../../common/jquery.js"></script>
     <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
     <script
       src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"

apps/dev-workbench/createAlgo/bench.html

@@ -25,10 +25,7 @@
       rel="stylesheet"
     />
     <!-- JQuery -->
-    <script
-      type="text/javascript"
-      src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"
-    ></script>
+    <script type="text/javascript" src="../../../common/jquery.js"></script>
     <!-- Bootstrap tooltips -->
     <script
       type="text/javascript"

apps/dev-workbench/workbench.html

@@ -27,10 +27,7 @@
       rel="stylesheet"
     />
     <!-- JQuery -->
-    <script
-
-      src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"
-    ></script>
+    <script src="../../common/jquery.js"></script>
     <!-- Bootstrap tooltips -->
     <script
 

apps/dicom-web/table.html

@@ -22,13 +22,13 @@
 	<script src='../../common/util.js'></script>
 	<script src='../../common/ajv.js'></script>
 	<script src='../../components/loading/loading.js'></script>
+	<script src="../../common/dompurify.js"></script>
 	<script src="../loader/loader.js"></script>
 	<script src="../loader/chunked_upload.js"></script>
 	<script type="text/javascript" src="https://apis.google.com/js/api.js"></script>
 	<title>CaMicroscope Data Table</title>
 
-	<script src="https://code.jquery.com/jquery-3.4.1.min.js"
-		></script>
+	<script src="../../common/jquery.js"></script>
 		<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css"
 		rel="stylesheet"
 		integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
@@ -99,10 +99,43 @@ <h1 class="h1">caMicroscope</h1>
                 <div class="col">
                     <!-- breadcrumb for tracking -->
                     <nav aria-label="breadcrumb"><ol id="breadcrumb" class="breadcrumb"></ol></nav>
+                    <!-- add source button, only relevant on the sources view -->
+                    <button type="button" id="addSourceBtn" class="btn btn-success mb-2" style="display:none;" data-bs-toggle="modal" data-bs-target="#add-source-dialog">
+                        <i class="fas fa-plus"></i> Add Source
+                    </button>
                     <!-- datatables -->
                     <table id="datatable" class="display" width="100%"></table>
                 </div>
-            </div>        
+            </div>
+        </div>
+    </div>
+
+    <!-- add source dialog -->
+    <div class="modal fade" id="add-source-dialog" tabindex="-1" role="dialog"
+        aria-labelledby="title-of-dialog-add-source" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="title-of-dialog-add-source">Add DICOMweb Source</h5>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="sourceNameInput">Name</label>
+                        <input type="text" class="form-control" id="sourceNameInput" placeholder="e.g. Google">
+                    </div>
+                    <div class="form-group mt-2">
+                        <label for="sourceUrlInput">URL</label>
+                        <input type="text" class="form-control" id="sourceUrlInput" placeholder="https://example.com/dicomWeb">
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-success" onclick="addSource();">Add</button>
+                </div>
+            </div>
         </div>
     </div>