Merge branch 'master' of github.com:ImagingDataCommons/slim into feat…

…/polygon-bulk-annotations

.github/workflows/run_container_tests.yml → .github/workflows/container-tests.yml

@@ -1,24 +1,32 @@
-name: container tests
+name: slim/container-tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build-and-test-containers:
-
+    name: "Build and test containers"
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/[email protected]
+
+      - name: Setup Node
+        uses: actions/[email protected]
+        with:
+          node-version: 20.8.1
+
       - name: Build and run containers using docker compose
         run: docker-compose up -d
+
       - name: Test web page
         run: |
           curl -sI http://localhost:8008/ | grep -o '200 OK'
           curl -s http://localhost:8008/ | grep -o '<title>Slim</title>'
+
       - name: Test DICOMweb service
         run: |
           sleep 20

.github/workflows/deploy-to-firebase.yml

@@ -0,0 +1,37 @@
+name: slim/deploy-to-firebase
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  deploy-firebase:
+    name: "Deploy to Firebase"
+    if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+
+      - name: Setup Node
+        uses: actions/[email protected]
+        with:
+          node-version: 20.8.1
+
+      - name: Install Yarn
+        run: sudo npm i -g yarn
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Build
+        run: REACT_APP_CONFIG=preview PUBLIC_URL=/ yarn build
+
+      - name: Deploy
+        uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_SLIM }}"
+          projectId: idc-external-006

.github/workflows/deploy-to-github-pages.yml

@@ -0,0 +1,33 @@
+name: slim/deploy-to-github-pages
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  deploy-to-github-pages:
+    name: "Deploy to GitHub Pages"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout to repository
+        uses: actions/[email protected]
+
+      - name: Setup Node
+        uses: actions/[email protected]
+        with:
+          node-version: 20.8.1
+
+      - name: Install Yarn
+        run: sudo npm i -g yarn
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Build and deploy to GitHub Pages
+        run: |
+          git remote set-url origin https://git:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
+          yarn deploy -- -u "github-actions-bot <[email protected]>"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: slim/release
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    name: "Bump version and cut a release"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+        with:
+          ref: master
+          persist-credentials: false
+
+      - name: Setup node
+        uses: actions/[email protected]
+        with:
+          node-version: 20.8.1
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Build
+        run: yarn build
+
+      - name: Zip build
+        run: zip -r build.zip build
+
+      - name: Bump version and cut a release
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+          GIT_AUTHOR_NAME: ${{ vars.RELEASE_GIT_AUTHOR_NAME }}
+          GIT_AUTHOR_EMAIL: ${{ vars.RELEASE_GIT_AUTHOR_EMAIL }}
+          GIT_COMMITTER_NAME: ${{ vars.RELEASE_GIT_COMMITTER_NAME }}
+          GIT_COMMITTER_EMAIL: ${{ vars.RELEASE_GIT_COMMITTER_EMAIL }}
+        run: npx semantic-release --branches master

.github/workflows/unit-tests.yml

@@ -0,0 +1,32 @@
+name: slim/build-and-run-unit-tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build-and-test:
+    name: "Build and run unit tests"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+
+      - name: Setup Node
+        uses: actions/[email protected]
+        with:
+          node-version: 20.8.1
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Build
+        run: yarn build
+
+      - name: Lint
+        run: yarn lint
+
+      - name: Test
+        run: yarn test

.releaserc.json

@@ -0,0 +1,43 @@
+{
+    "plugins": [
+        "@semantic-release/commit-analyzer",
+        "@semantic-release/release-notes-generator",
+        [
+            "@semantic-release/changelog",
+            {
+                "changelogFile": "docs/CHANGELOG.md"
+            }
+        ],
+        [
+            "@semantic-release/npm",
+            {
+                "npmPublish": false
+            }
+        ],
+        [
+            "@semantic-release/git",
+            {
+                "assets": [
+                    "docs",
+                    "package.json"
+                ],
+                "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+            }
+        ],
+        [
+            "@semantic-release/github",
+            {
+                "assets": [
+                    {
+                        "path": "build.zip",
+                        "label": "slim-${nextRelease.gitTag}.zip"
+                    },
+                    {
+                        "path": "docs/CHANGELOG.md",
+                        "label": "${nextRelease.gitTag}-CHANGELOG.md"
+                    }
+                ]
+            }
+        ]
+    ]
+}

Dockerfile

@@ -13,10 +13,10 @@ RUN apt-get update && \
     nginx && \
     apt-get clean
 
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
+RUN curl -fsSL https://deb.nodesource.com/setup_21.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    curl -sS https://deb.nodesource.com/setup_16.x | bash - && \
+    curl -sS https://deb.nodesource.com/setup_21.x | bash - && \
     apt-get update && \
     apt-get install -y --no-install-suggests --no-install-recommends \
     nodejs \

docs/CHANGELOG.md

@@ -0,0 +1,39 @@
+## [0.31.2](https://github.com/ImagingDataCommons/slim/compare/v0.31.1...v0.31.2) (2024-05-08)
+
+
+### Bug Fixes
+
+* **ROI:** Avoid removing highlighting of ROI after closing ROI info dialog and use double click to open it ([#197](https://github.com/ImagingDataCommons/slim/issues/197)) ([a76a79f](https://github.com/ImagingDataCommons/slim/commit/a76a79f46c09f876933e9a6d57b667d673f13e96))
+
+## [0.31.1](https://github.com/ImagingDataCommons/slim/compare/v0.31.0...v0.31.1) (2024-05-08)
+
+
+### Bug Fixes
+
+* **.github:** Refactor workflows ([#205](https://github.com/ImagingDataCommons/slim/issues/205)) ([552f99f](https://github.com/ImagingDataCommons/slim/commit/552f99f3052c039801f0a6b86564445a3497cc26))
+
+# [0.31.0](https://github.com/ImagingDataCommons/slim/compare/v0.30.0...v0.31.0) (2024-05-07)
+
+
+### Bug Fixes
+
+* **package.json:** Fix Inefficient Regular Expression Complexity in nth-check (vulnerability) ([#151](https://github.com/ImagingDataCommons/slim/issues/151)) ([4f42258](https://github.com/ImagingDataCommons/slim/commit/4f4225889cedb853c79db84bac8aee94f0b41715))
+* security issues ([#179](https://github.com/ImagingDataCommons/slim/issues/179)) ([eb8ddc0](https://github.com/ImagingDataCommons/slim/commit/eb8ddc093427547e7e178973fc871c47fa18ed61))
+
+
+### Features
+
+* add secondary dicom server ([#188](https://github.com/ImagingDataCommons/slim/issues/188)) ([356009f](https://github.com/ImagingDataCommons/slim/commit/356009f6a86cd96bfa6c6b478adb46683fbdcd3d))
+
+# [0.31.0](https://github.com/ImagingDataCommons/slim/compare/v0.30.0...v0.31.0) (2024-05-07)
+
+
+### Bug Fixes
+
+* **package.json:** Fix Inefficient Regular Expression Complexity in nth-check (vulnerability) ([#151](https://github.com/ImagingDataCommons/slim/issues/151)) ([4f42258](https://github.com/ImagingDataCommons/slim/commit/4f4225889cedb853c79db84bac8aee94f0b41715))
+* security issues ([#179](https://github.com/ImagingDataCommons/slim/issues/179)) ([eb8ddc0](https://github.com/ImagingDataCommons/slim/commit/eb8ddc093427547e7e178973fc871c47fa18ed61))
+
+
+### Features
+
+* add secondary dicom server ([#188](https://github.com/ImagingDataCommons/slim/issues/188)) ([356009f](https://github.com/ImagingDataCommons/slim/commit/356009f6a86cd96bfa6c6b478adb46683fbdcd3d))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "slim",
-  "version": "0.14.1",
+  "version": "0.31.2",
   "homepage": "https://github.com/imagingdatacommons/slim",
   "private": true,
   "author": "ImagingDataCommons",
@@ -54,7 +54,7 @@
     "detect-browser": "^5.2.1",
     "dicom-microscopy-viewer": "^0.45.1",
     "dicomweb-client": "^0.10.3",
-    "gh-pages": "^3.2.3",
+    "gh-pages": "^5.0.0",
     "oidc-client": "^1.11.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -64,7 +64,13 @@
     "react-test-renderer": "^18.2.0",
     "retry": "^0.13.1",
     "ts-standard": "^11.0.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.7.4",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^12.0.0",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^10.0.3",
+    "@semantic-release/npm": "^12.0.0",
+    "@semantic-release/release-notes-generator": "^13.0.0"
   },
   "dependencies": {
     "react-error-boundary": "^3.1.4"