chore(version): Update package versions [skip ci]

chore(version): version.json [skip ci]
fix(modes): don't attempt to retrieve a stage index if HPs (#4552 )
2024-12-03 14:33:02 +00:00 · 2024-12-03 14:32:54 +00:00 · 2024-12-03 09:14:41 -05:00 · 2024-11-27 13:08:18 -05:00 · 2024-11-13 04:21:28 +00:00 · 2024-11-13 04:21:19 +00:00
1989 changed files with 35110 additions and 99803 deletions
@@ -1,52 +1,72 @@
 version: 2.1

+### ABOUT
+#
+# This configuration powers our Circleci.io integration
+#
+# Note:
+# Netlify works independently from this configuration to
+# create pull request previews and to update `https://docs.ohif.org`
+###
+
+## https://github.com/cypress-io/circleci-orb
+##
 orbs:
  codecov: codecov/codecov@1.0.5
-  cypress: cypress-io/cypress@3.4.2
+  cypress: cypress-io/cypress@3.3.1
+
+executors:
+  cypress-custom:
+    description: |
+      Single Docker container used to run Cypress Tests
+    docker:
+      - image: cimg/node:<< parameters.node-version >>-browsers
+    parameters:
+      node-version:
+        default: '18.16.1'
+        description: |
+          The version of Node to run your tests with.
+        type: string

 defaults: &defaults
  docker:
-    - image: cimg/node:20.18.1
+    - image: cimg/node:18.18
      environment:
-        TERM: xterm
+        TERM: xterm # Enable colors in term
        QUICK_BUILD: true
  working_directory: ~/repo

-commands:
-  install_bun:
-    steps:
-      - restore_cache:
-          keys:
-            - bun-cache-v2-{{ arch }}-latest
-      - run:
-          name: Install Bun
-          command: |
-            if [ ! -d "$HOME/.bun" ]; then
-              curl -fsSL https://bun.sh/install | bash
-            fi
-            echo 'export BUN_INSTALL="$HOME/.bun"' >> $BASH_ENV
-            echo 'export PATH="$BUN_INSTALL/bin:$PATH"' >> $BASH_ENV
-            source $BASH_ENV
-      - save_cache:
-          key: bun-cache-v2-{{ arch }}-latest
-          paths:
-            - ~/.bun
-
 jobs:
+  ###
+  # Workflow: PR_CHECKS
+  ###
  UNIT_TESTS:
    <<: *defaults
    resource_class: large
    steps:
-      - install_bun
+      # Update yarn
+      - run: yarn -v
      - run: node --version
+      # Checkout code and ALL Git Tags
      - checkout
+      - restore_cache:
+          name: Restore Yarn and Cypress Package Cache
+          keys:
+            # when lock file changes, use increasingly general patterns to restore cache
+            - yarn-packages-{{ checksum "yarn.lock" }}
+            - yarn-packages-
      - run:
          name: Install Dependencies
-          command: bun install --no-save
+          command: yarn install --frozen-lockfile
+      - save_cache:
+          name: Save Yarn Package Cache
+          paths:
+            - ~/.cache ## Cache yarn and Cypress
+          key: yarn-packages-{{ checksum "yarn.lock" }}
      # RUN TESTS
      - run:
          name: 'JavaScript Test Suite'
-          command: bun run test:unit:ci
+          command: yarn run test:unit:ci
      # platform/app
      - run:
          name: 'VIEWER: Combine report output'
@@ -74,23 +94,36 @@ jobs:
          file: '/home/circleci/repo/platform/core/coverage/reports'
          flags: 'core'

+  ###
+  # Workflow: DEPLOY
+  ###
  BUILD:
    <<: *defaults
    resource_class: large
    steps:
      # Checkout code and ALL Git Tags
      - checkout
-      - install_bun
+      - restore_cache:
+          name: Restore Yarn and Cypress Package Cache
+          keys:
+            # when lock file changes, use increasingly general patterns to restore cache
+            - yarn-packages-{{ checksum "yarn.lock" }}
+            - yarn-packages-
      - run:
          name: Install Dependencies
-          command: bun install --no-save
+          command: yarn install --frozen-lockfile
+      - save_cache:
+          name: Save Yarn Package Cache
+          paths:
+            - ~/.cache ## Cache yarn and Cypress
+          key: yarn-packages-{{ checksum "yarn.lock" }}
      # Build & Test
      - run:
          name: 'Perform the versioning before build'
-          command: bun ./version.mjs
+          command: node ./version.mjs
      - run:
          name: 'Build the OHIF Viewer'
-          command: bun run build
+          command: yarn run build
          no_output_timeout: 45m
      - run:
          name: 'Upload SourceMaps, Send Deploy Notification'
@@ -112,18 +145,30 @@ jobs:
            - commit.txt
            - version.json

+  # just to make sure later on we can publish them
  BUILD_PACKAGES_QUICK:
    <<: *defaults
    resource_class: large
    steps:
-      - install_bun
+      - run: yarn -v
      # Checkout code and ALL Git Tags
      - checkout
      - attach_workspace:
          at: ~/repo
+      # Use increasingly general patterns to restore cache
+      - restore_cache:
+          name: Restore Yarn and Cypress Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+            - yarn-packages-
      - run:
          name: Install Dependencies
-          command: bun install --frozen-lockfile
+          command: yarn install --frozen-lockfile
+      - save_cache:
+          name: Save Yarn Package Cache
+          paths:
+            - ~/.cache/yarn
+          key: yarn-packages-{{ checksum "yarn.lock" }}
      - run:
          name: Avoid hosts unknown for github
          command: |
@@ -138,24 +183,38 @@ jobs:
      - run:
          name: build half of the packages (to avoid out of memory in circleci)
          command: |
-            bun run build:package-all
+            yarn run build:package-all
      - run:
          name: build the other half of the packages
          command: |
-            bun run build:package-all-1
+            yarn run build:package-all-1

+  ###
+  # Workflow: RELEASE
+  ###
  NPM_PUBLISH:
    <<: *defaults
    resource_class: large
    steps:
-      - install_bun
+      - run: yarn -v
      # Checkout code and ALL Git Tags
      - checkout
      - attach_workspace:
          at: ~/repo
+      # Use increasingly general patterns to restore cache
+      - restore_cache:
+          name: Restore Yarn and Cypress Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+            - yarn-packages-
      - run:
          name: Install Dependencies
-          command: bun install --no-save
+          command: yarn install --frozen-lockfile
+      - save_cache:
+          name: Save Yarn Package Cache
+          paths:
+            - ~/.cache/yarn
+          key: yarn-packages-{{ checksum "yarn.lock" }}
      - run:
          name: Avoid hosts unknown for github
          command: |
@@ -170,11 +229,11 @@ jobs:
      - run:
          name: build half of the packages (to avoid out of memory in circleci)
          command: |
-            bun run build:package-all
+            yarn run build:package-all
      - run:
          name: build the other half of the packages
          command: |
-            bun run build:package-all-1
+            yarn run build:package-all-1
      - run:
          name: increase min time out
          command: |
@@ -186,14 +245,14 @@ jobs:
      - run:
          name: publish package versions
          command: |
-            bun ./publish-version.mjs
+            node ./publish-version.mjs
      - run:
          name: Again set the NPM registry (was deleted in the version script)
          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
      - run:
          name: publish package dist
          command: |
-            bun ./publish-package.mjs
+            node ./publish-package.mjs
      - persist_to_workspace:
          root: ~/repo
          paths:
@@ -208,7 +267,7 @@ jobs:
      - setup_remote_docker:
          docker_layer_caching: false
      - run:
-          name: Build Docker image for amd64
+          name: Build and push Docker image from the release branch
          command: |
            # This file will exist if a new version was published by
            # our command in the previous job.
@@ -222,50 +281,12 @@ jobs:
              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
              echo $IMAGE_VERSION
              echo $IMAGE_VERSION_FULL
-              # Build our amd64 image, auth, and push
-              docker build --platform linux/amd64 --tag ohif/app:$IMAGE_VERSION_FULL-amd64 --tag ohif/app:latest-amd64 .
+              # Build our image, auth, and push
+              docker build --tag ohif/app:$IMAGE_VERSION_FULL --tag ohif/app:latest .
              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-              docker push ohif/app:$IMAGE_VERSION_FULL-amd64
-              docker push ohif/app:latest-amd64
+              docker push ohif/app:$IMAGE_VERSION_FULL
+              docker push ohif/app:latest
            fi
-      - persist_to_workspace:
-          root: ~/repo
-          paths:
-            - .
-
-  DOCKER_RELEASE_PUBLISH_ARM:
-    <<: *defaults
-    resource_class: arm.large
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - setup_remote_docker:
-          docker_layer_caching: false
-      - run:
-          name: Build Docker image for arm64
-          command: |
-            # This file will exist if a new version was published by
-            # our command in the previous job.
-            if [[ ! -e version.txt ]]; then
-              exit 0
-            else
-              # Remove npm config
-              rm -f ./.npmrc
-              # Set our version number using vars
-              export IMAGE_VERSION=$(cat version.txt)
-              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
-              echo $IMAGE_VERSION
-              echo $IMAGE_VERSION_FULL
-              # Build our arm64 image, auth, and push
-              docker build --platform linux/arm64 --tag ohif/app:$IMAGE_VERSION_FULL-arm64 --tag ohif/app:latest-arm64 .
-              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-              docker push ohif/app:$IMAGE_VERSION_FULL-arm64
-              docker push ohif/app:latest-arm64
-            fi
-      - persist_to_workspace:
-          root: ~/repo
-          paths:
-            - .

  DOCKER_BETA_PUBLISH:
    <<: *defaults
@@ -276,7 +297,7 @@ jobs:
      - setup_remote_docker:
          docker_layer_caching: false
      - run:
-          name: Build Docker image for amd64 (Beta)
+          name: Build and push Docker image from the master branch (beta releases)
          command: |
            echo $(ls -l)

@@ -288,155 +309,108 @@ jobs:
            else
              echo "Building and pushing Docker image from the master branch (beta releases)"
              rm -f ./.npmrc
-
              # Set our version number using vars
              export IMAGE_VERSION=$(cat version.txt)
              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
              echo $IMAGE_VERSION
              echo $IMAGE_VERSION_FULL
-              # Build our amd64 image, auth, and push
-              docker build --platform linux/amd64 --tag ohif/app:$IMAGE_VERSION_FULL-amd64 --tag ohif/app:latest-beta-amd64 .
+              # Build our image, auth, and push
+
+              echo "starting docker build"
+              docker build --tag ohif/app:$IMAGE_VERSION_FULL .
              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-              docker push ohif/app:$IMAGE_VERSION_FULL-amd64
-              docker push ohif/app:latest-beta-amd64
+
+              echo "starting docker push"
+              docker push ohif/app:$IMAGE_VERSION_FULL
            fi

-  DOCKER_BETA_PUBLISH_ARM:
-    <<: *defaults
-    resource_class: arm.large
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - setup_remote_docker:
-          docker_layer_caching: false
-      - run:
-          name: Build Docker image for arm64 (Beta)
-          command: |
-            echo $(ls -l)
-
-            # This file will exist if a new version was published by
-            # our command in the previous job.
-            if [[ ! -e version.txt ]]; then
-              echo "don't have version txt"
-              exit 0
-            else
-              echo "Building and pushing ARM64 Docker image from the master branch (beta releases)"
-              rm -f ./.npmrc
-              # Set our version number using vars
-              export IMAGE_VERSION=$(cat version.txt)
-              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
-              echo $IMAGE_VERSION
-              echo $IMAGE_VERSION_FULL
-              # Build our arm64 image, auth, and push
-              docker build --platform linux/arm64 --tag ohif/app:$IMAGE_VERSION_FULL-arm64 --tag ohif/app:latest-beta-arm64 .
-              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-              docker push ohif/app:$IMAGE_VERSION_FULL-arm64
-              docker push ohif/app:latest-beta-arm64
-            fi
-
-  CYPRESS:
-    <<: *defaults
+  # This is copied from the Cypress orb since the default for cypress/run is node 16 and
+  # we migrated to 18
+  CYPRESS_CUSTOM_RUN:
+    description: |
+      A single, complete job to run Cypress end-to-end tests in your application.
+    executor: cypress-custom
+    parallelism: << parameters.parallelism >>
+    parameters:
+      cypress-cache-key:
+        default: cypress-cache-{{ arch }}-{{ checksum "package.json" }}
+        description: Cache key used to cache the Cypress binary.
+        type: string
+      cypress-cache-path:
+        default: ~/.cache/Cypress
+        description: |
+          By default, this will cache the '~/.cache/Cypress' directory so that the Cypress binary is cached. You can override this by providing your own cache path.
+        type: string
+      cypress-command:
+        default: npx cypress run
+        description: Command used to run your Cypress tests
+        type: string
+      include-branch-in-node-cache-key:
+        default: false
+        description: |
+          If true, this cache will only apply to runs within the same branch. (Adds -{{ .Branch }}- to the node cache key)
+        type: boolean
+      install-browsers:
+        default: false
+        description: |
+          Cypress runs by default in the Electron browser. Use this flag to install additional browsers to run your tests in.
+          This is only needed if you are passing the `--browser` flag in your `cypress-command`.
+          This parameter leverages the `circleci/browser-tools` orb and includes Chrome and FireFox.
+          If you need additional browser support you can set this to false and use an executor with a docker image
+          that includes the browsers of your choosing. See https://hub.docker.com/r/cypress/browsers/tags
+        type: boolean
+      install-command:
+        default: ''
+        description: Overrides the default NPM command (npm ci)
+        type: string
+      node-cache-version:
+        default: v1
+        description:
+          Change the default node cache version if you need to clear the cache for any reason.
+        type: string
+      package-manager:
+        default: npm
+        description: Select the default node package manager to use. NPM v5+ Required.
+        enum:
+          - npm
+          - yarn
+          - yarn-berry
+        type: enum
+      parallelism:
+        default: 4
+        description: |
+          Number of Circle machines to use for load balancing, min 1
+          (requires `parallel` and `record` flags in your `cypress-command`)
+        type: integer
+      post-install:
+        default: ''
+        description: |
+          Additional commands to run after running install but before verifying Cypress and saving cache.
+        type: string
+      start-command:
+        default: ''
+        description: Command used to start your local dev server for Cypress to tests against
+        type: string
+      working-directory:
+        default: ''
+        description: Directory containing package.json
+        type: string
    resource_class: large
-    parallelism: 8
    steps:
-      - install_bun
-      - run:
-          name: Install System Dependencies
-          command: |
-            sudo apt-get update
-            sudo apt-get install -y xvfb libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6
-      - run:
-          name: Start Xvfb
-          command: Xvfb :99 -screen 0 1920x1080x24 &
-          background: true
-      - run:
-          name: Export Display Variable
-          command: export DISPLAY=:99
      - cypress/install:
-          install-command: bun install --no-save
-          package-manager: yarn
+          cypress-cache-key: << parameters.cypress-cache-key >>
+          cypress-cache-path: << parameters.cypress-cache-path >>
+          include-branch-in-node-cache-key: << parameters.include-branch-in-node-cache-key >>
+          install-browsers: << parameters.install-browsers >>
+          install-command: << parameters.install-command >>
+          node-cache-version: << parameters.node-cache-version >>
+          package-manager: << parameters.package-manager >>
+          post-install: << parameters.post-install >>
+          working-directory: << parameters.working-directory >>
      - cypress/run-tests:
-          cypress-command: |
-            npx wait-on@latest http://localhost:3000 && cd platform/app && npx cypress run --record --parallel
-          start-command: bun run test:data && bun run test:e2e:serve
-
-  DOCKER_MULTIARCH_MANIFEST:
-    <<: *defaults
-    resource_class: large
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - setup_remote_docker:
-          docker_layer_caching: false
-      - run:
-          name: Create and push multi-architecture manifest
-          command: |
-            # This file will exist if a new version was published by
-            # our command in the previous job.
-            if [[ ! -e version.txt ]]; then
-              exit 0
-            else
-              echo "Building and pushing multi-architecture manifest from the master branch (release releases)"
-              rm -f ./.npmrc
-              # Set our version number using vars
-              export IMAGE_VERSION=$(cat version.txt)
-              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
-              echo $IMAGE_VERSION
-              echo $IMAGE_VERSION_FULL
-              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-
-              # Create and push manifest for specific version
-              docker manifest create ohif/app:$IMAGE_VERSION_FULL \
-                --amend ohif/app:$IMAGE_VERSION_FULL-amd64 \
-                --amend ohif/app:$IMAGE_VERSION_FULL-arm64
-              docker manifest push ohif/app:$IMAGE_VERSION_FULL
-
-              # Create and push manifest for "latest" tag
-              docker manifest create ohif/app:latest \
-                --amend ohif/app:latest-amd64 \
-                --amend ohif/app:latest-arm64
-              docker manifest push ohif/app:latest
-            fi
-
-  DOCKER_BETA_MULTIARCH_MANIFEST:
-    <<: *defaults
-    resource_class: large
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - setup_remote_docker:
-          docker_layer_caching: false
-      - run:
-          name: Create and push multi-architecture manifest (Beta)
-          command: |
-            echo $(ls -l)
-
-            # This file will exist if a new version was published by
-            # our command in the previous job.
-            if [[ ! -e version.txt ]]; then
-              exit 0
-            else
-              echo "Building and pushing multi-architecture manifest from the master branch (beta releases)"
-              rm -f ./.npmrc
-              # Set our version number using vars
-              export IMAGE_VERSION=$(cat version.txt)
-              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
-              echo $IMAGE_VERSION
-              echo $IMAGE_VERSION_FULL
-              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-
-              # Create and push manifest for specific beta version
-              docker manifest create ohif/app:$IMAGE_VERSION_FULL \
-                --amend ohif/app:$IMAGE_VERSION_FULL-amd64 \
-                --amend ohif/app:$IMAGE_VERSION_FULL-arm64
-              docker manifest push ohif/app:$IMAGE_VERSION_FULL
-
-              # Create and push manifest for "latest-beta" tag
-              docker manifest create ohif/app:latest-beta \
-                --amend ohif/app:latest-beta-amd64 \
-                --amend ohif/app:latest-beta-arm64
-              docker manifest push ohif/app:latest-beta
-            fi
+          cypress-command: << parameters.cypress-command >>
+          start-command: << parameters.start-command >>
+          working-directory: << parameters.working-directory >>

 workflows:
  PR_CHECKS:
@@ -445,12 +419,61 @@ workflows:
          filters:
            branches:
              ignore: master
-      - UNIT_TESTS
-      - CYPRESS:
+      - UNIT_TESTS:
+          requires:
+            - BUILD_PACKAGES_QUICK
+      - CYPRESS_CUSTOM_RUN:
          name: 'Cypress Tests'
          context: cypress
+          matrix:
+            parameters:
+              start-command:
+                - yarn run test:data && yarn run test:e2e:serve
+              install-browsers:
+                - true
+              cypress-command:
+                - 'npx wait-on@latest http://localhost:3000 && cd platform/app &&  npx cypress run
+                  --record --browser chrome --parallel'
+              package-manager:
+                - 'yarn'
+              cypress-cache-key:
+                - 'yarn-packages-{{ checksum "yarn.lock" }}'
+              cypress-cache-path:
+                - '~/.cache/Cypress'
+          requires:
+            - BUILD_PACKAGES_QUICK

-  # viewer-dev.ohif.org
+  # PR_OPTIONAL_VISUAL_TESTS:
+  #   jobs:
+  #     - AWAIT_APPROVAL:
+  #         type: approval
+  #     # Update hub.docker.org
+  #     - cypress/run:
+  #         name: 'Generate Percy Snapshots'
+  #         executor: cypress/browsers-chrome76
+  #         browser: chrome
+  #         pre-steps:
+  #           - run: 'rm -rf ~/.yarn && yarn -v && yarn global add wait-on'
+  #         yarn: true
+  #         store_artifacts: false
+  #         working_directory: platform/app
+  #         build:
+  #           yarn test:data && npx cross-env QUICK_BUILD=true APP_CONFIG=config/dicomweb-server.js
+  #           yarn run build
+  #         # start server --> verify running --> percy + chrome + cypress
+  #         command: yarn run test:e2e:dist
+  #         cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
+  #         no-workspace: true # Don't persist workspace
+  #         post-steps:
+  #           - store_artifacts:
+  #               path: platform/app/cypress/screenshots
+  #           - store_artifacts:
+  #               path: platform/app/cypress/videos
+  #         requires:
+  #           - AWAIT_APPROVAL
+
+  # Our master branch deploys to viewer-dev.ohif.org, the viewer.ohif.org is
+  # deployed from the release branch which is more stable and less frequently updated.
  DEPLOY_MASTER:
    jobs:
      - BUILD:
@@ -463,14 +486,9 @@ workflows:
      - DOCKER_BETA_PUBLISH:
          requires:
            - NPM_PUBLISH
-      - DOCKER_BETA_PUBLISH_ARM:
-          requires:
-            - DOCKER_BETA_PUBLISH
-      - DOCKER_BETA_MULTIARCH_MANIFEST:
-          requires:
-            - DOCKER_BETA_PUBLISH_ARM

-  # viewer.ohif.org
+  # Our release branch deploys to viewer.ohif.org and is more stable and less
+  # frequently updated after being tested in the staging environment.
  DEPLOY_RELEASE:
    jobs:
      - BUILD:
@@ -487,9 +505,50 @@ workflows:
      - DOCKER_RELEASE_PUBLISH:
          requires:
            - NPM_PUBLISH
-      - DOCKER_RELEASE_PUBLISH_ARM:
-          requires:
-            - DOCKER_RELEASE_PUBLISH
-      - DOCKER_MULTIARCH_MANIFEST:
-          requires:
-            - DOCKER_RELEASE_PUBLISH_ARM
+
+  ###
+  # Unit and E2E tests have already run for PR_CHECKS
+  # Re-running should not gain us any confidence here
+  ###
+  # RELEASE:
+  #   jobs:
+  #     - NPM_PUBLISH:
+  #         filters:
+  #           branches:
+  #             only: master
+  #     - DOCS_PUBLISH:
+  #         filters:
+  #           branches:
+  #             only: master
+  #     # Update base branch snapshots
+  #     # and record a Cypress dashboard test run
+  #     - cypress/run:
+  #         name: 'Generate Percy Snapshots'
+  #         executor: cypress/browsers-chrome76
+  #         browser: chrome
+  #         pre-steps:
+  #           - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
+  #               add wait-on' # Use yarn latest
+  #         yarn: true
+  #         store_artifacts: false
+  #         working_directory: platform/app
+  #         build:
+  #           npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js yarn run
+  #           build
+  #         # start server --> verify running --> percy + chrome + cypress
+  #         command: yarn run test:e2e:dist
+  #         cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
+  #         no-workspace: true # Don't persist workspace
+  #         post-steps:
+  #           - store_artifacts:
+  #               path: platform/app/cypress/screenshots
+  #           - store_artifacts:
+  #               path: platform/app/cypress/videos
+  #           - store_test_results:
+  #               path: platform/app/cypress/results
+  #         filters:
+  #           branches:
+  #             only: master
+  #     - DOCKER_MASTER_PUBLISH:
+  #         requires:
+  #           - NPM_PUBLISH
@@ -1,7 +1,4 @@
 server {
-  gzip_static  always;
-  gzip_proxied expired no-cache no-store private auth;
-  gunzip       on;
  listen ${PORT} default_server;
  listen [::]:${PORT} default_server;
  location / {
@@ -7,30 +7,11 @@ if [ -n "$SSL_PORT" ]
    envsubst '${PORT}' < /usr/src/default.conf.template > /etc/nginx/conf.d/default.conf
 fi

-
-if [ -n "$APP_CONFIG" ]; then
-  echo "$APP_CONFIG" > /usr/share/nginx/html${PUBLIC_URL}app-config.js
-  echo "Using custom APP_CONFIG environment variable"
-else
-  echo "Not using custom APP_CONFIG"
+if [ -n "$APP_CONFIG" ]
+  then
+    echo "$APP_CONFIG" > /usr/share/nginx/html/app-config.js
 fi

-if [ -f /usr/share/nginx/html${PUBLIC_URL}app-config.js ]; then
-  if [ -s /usr/share/nginx/html${PUBLIC_URL}app-config.js ]; then
-    echo "Detected non-empty app-config.js. Ensuring .gz file is updated..."
-    rm -f /usr/share/nginx/html${PUBLIC_URL}app-config.js.gz
-    gzip /usr/share/nginx/html${PUBLIC_URL}app-config.js
-    touch /usr/share/nginx/html${PUBLIC_URL}app-config.js
-    echo "Compressed app-config.js to app-config.js.gz"
-  else
-    echo "app-config.js is empty. Skipping compression."
-  fi
-else
-  echo "No app-config.js file found. Skipping compression."
-fi
-
-
-
 if [ -n "$CLIENT_ID" ] || [ -n "$HEALTHCARE_API_ENDPOINT" ]
  then
    # If CLIENT_ID is specified, use the google.js configuration with the modified ID
@@ -59,6 +40,6 @@ if [ -n "$CLIENT_ID" ] || [ -n "$HEALTHCARE_API_ENDPOINT" ]
 	  cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js
 fi

-echo "Starting Nginx to serve the OHIF Viewer on ${PUBLIC_URL}"
+echo "Starting Nginx to serve the OHIF Viewer..."

 exec "$@"
@@ -1,4 +0,0 @@
-find platform/app/dist -name "*.js" -exec gzip -9 "{}" \; -exec touch "{}" \;
-find platform/app/dist -name "*.map" -exec gzip -9 "{}" \; -exec touch "{}" \;
-find platform/app/dist -name "*.css" -exec gzip -9 "{}" \; -exec touch "{}" \;
-find platform/app/dist -name "*.svg" -exec gzip -9 "{}" \; -exec touch "{}" \;
@@ -8,11 +8,11 @@
 # have this file as their .dockerignore.

 # Output
-**/dist/
-**/build/
+dist/
+build/

 # Dependencies
-**/node_modules/
+node_modules/

 # Root
 README.md
@@ -33,5 +33,5 @@ dockerfile
 .scripts/
 .vscode/
 coverage/
-platform/docs/
+docs/
 testdata/
@@ -18,8 +18,7 @@
  },
  "rules": {
    // Enforce consistent brace style for all control statements for readability
-    "curly": "error",
-    "import/no-anonymous-default-export": "off"
+    "curly": "error"
  },
  "globals": {
    "cy": true,
@@ -1,7 +0,0 @@
-version: 2
-enable-beta-ecosystems: true
-updates:
-  - package-ecosystem: 'npm'
-    directory: '/'
-    schedule:
-      interval: 'daily'
@@ -64,7 +64,7 @@ body:
    attributes:
      label: 'Node version'
      description: 'Your Node.js version.'
-      placeholder: 'e.g., 20.18.1'
+      placeholder: 'e.g., 18.16.1'
    validations:
      required: true
  - type: input
@@ -9,27 +9,24 @@ jobs:
    timeout-minutes: 60
    runs-on: ubuntu-latest
    container:
-      image: mcr.microsoft.com/playwright:v1.50.0-noble
+      image: mcr.microsoft.com/playwright:v1.49.0-noble
    strategy:
      fail-fast: false
      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        shardTotal: [10]
+        shardIndex: [1, 2, 3, 4, 5]
+        shardTotal: [5]
    steps:
      - uses: actions/checkout@v4
-      - name: Install unzip
-        run: apt-get update && apt-get install -y unzip
-      - uses: oven-sh/setup-bun@v2
      - uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 18
      - name: Install dependencies
-        run: bun install --frozen-lockfile
-      - name: Set up Git safe directory
-        run: git config --global --add safe.directory /__w/Viewers/Viewers
+        run: yarn install --frozen-lockfile
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps
      - name: Run Playwright tests
        run:
-          export NODE_OPTIONS="--max_old_space_size=8192" && bun x playwright test --shard=${{
+          export NODE_OPTIONS="--max_old_space_size=8192" && npx playwright test --shard=${{
          matrix.shardIndex }}/${{ matrix.shardTotal }}

      - name: Upload blob report to GitHub Actions Artifacts
@@ -44,20 +41,14 @@ jobs:
    if: ${{ !cancelled() }}
    needs: [playwright-tests]
    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.48.1-focal
    steps:
-      - name: Install unzip
-        run: apt-get update && apt-get install -y unzip
-      - uses: oven-sh/setup-bun@v2
      - uses: actions/checkout@v4
      - uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 18
      - name: Install dependencies
-        run: bun install --frozen-lockfile
-      - name: Set up Git safe directory
-        run: git config --global --add safe.directory /__w/Viewers/Viewers
+        run: yarn install --frozen-lockfile
+
      - name: Download blob reports from GitHub Actions Artifacts
        uses: actions/download-artifact@v4
        with:
@@ -66,7 +57,7 @@ jobs:
          merge-multiple: true

      - name: Merge into HTML Report
-        run: bun x playwright merge-reports --reporter html ./all-blob-reports
+        run: npx playwright merge-reports --reporter html ./all-blob-reports

      - name: Upload HTML report
        uses: actions/upload-artifact@v4
@@ -1,6 +1,5 @@
 # Packages
 node_modules
-.cursor/

 # Output
 build
@@ -1 +1 @@
-20.9.0
+18.16.1
@@ -168,10 +168,6 @@ module.exports = (env, argv, { SRC_DIR, ENTRY }) => {
            },
          ],
        },
-        {
-          test: /\.(woff|woff2|eot|ttf|otf)$/i,
-          type: 'asset/resource',
-        },
      ], //.concat(vtkRules),
    },
    resolve: {
@@ -1,4 +1,3 @@
-# syntax=docker/dockerfile:1.7-labs
 # This dockerfile is used to publish the `ohif/app` image on dockerhub.
 #
 # It's a good example of how to build our static application and package it
@@ -20,84 +19,61 @@
 #


-# syntax=docker/dockerfile:1.7-labs
-# This dockerfile is used to publish the `ohif/app` image on dockerhub.
-#
-# It's a good example of how to build our static application and package it
-# with a web server capable of hosting it as static content.
-#
-# docker build
-# --------------
-# If you would like to use this dockerfile to build and tag an image, make sure
-# you set the context to the project's root directory:
-# https://docs.docker.com/engine/reference/commandline/build/
-#
-#
-# SUMMARY
-# --------------
-# This dockerfile is used as an input for a second stage to make things run faster.
-#
-
-
 # Stage 1: Build the application
 # docker build -t ohif/viewer:latest .
-# Copy Files
-FROM node:20.18.1-slim as builder
-
-RUN apt-get update && apt-get install -y build-essential python3
-
+FROM node:18.16.1-slim as json-copier

 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
-RUN npm install -g bun
-# RUN npm install -g lerna@7.4.2
-ENV PATH=/usr/src/app/node_modules/.bin:$PATH

-# Do an initial install and then a final install
-COPY package.json yarn.lock preinstall.js lerna.json ./
-COPY --parents ./addOns/package.json ./addOns/*/*/package.json ./extensions/*/package.json ./modes/*/package.json ./platform/*/package.json ./
+COPY ["package.json", "yarn.lock", "preinstall.js", "./"]
+COPY extensions /usr/src/app/extensions
+COPY modes /usr/src/app/modes
+COPY platform /usr/src/app/platform
+
+# Find and remove non-package.json files
+#RUN find extensions \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
+#RUN find modes \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
+#RUN find platform \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
+
+# Copy Files
+FROM node:18.16.1-slim as builder
+RUN apt-get update && apt-get install -y build-essential python3
+RUN mkdir /usr/src/app
+WORKDIR /usr/src/app
+
+COPY --from=json-copier /usr/src/app .
+
 # Run the install before copying the rest of the files
+RUN yarn config set workspaces-experimental true
+RUN yarn install --frozen-lockfile --verbose

-RUN bun pm cache rm
-RUN bun install
-# Copy the local directory
-COPY --link --exclude=yarn.lock --exclude=package.json --exclude=Dockerfile . .
-# Do a second install to finalize things after the copy
-RUN bun run show:config
-RUN bun install
+COPY . .

-# Build here
-# After install it should hopefully be stable until the local directory changes
+# To restore workspaces symlinks
+RUN yarn install --frozen-lockfile --verbose
+
+ENV PATH /usr/src/app/node_modules/.bin:$PATH
 ENV QUICK_BUILD true
 # ENV GENERATE_SOURCEMAP=false
-ARG APP_CONFIG=config/default.js
-ARG PUBLIC_URL=/
+# ENV REACT_APP_CONFIG=config/default.js

-RUN bun run show:config
-RUN bun run build
-
-# Precompress files
-RUN chmod u+x .docker/compressDist.sh
-RUN ./.docker/compressDist.sh
+RUN yarn run build

 # Stage 3: Bundle the built application into a Docker container
 # which runs Nginx using Alpine Linux
-FROM nginxinc/nginx-unprivileged:1.27-alpine as final
+FROM nginxinc/nginx-unprivileged:1.25-alpine as final
 #RUN apk add --no-cache bash
-ARG PORT=80
-ENV PORT=${PORT}
-ARG PUBLIC_URL=/
-ENV PUBLIC_URL=${PUBLIC_URL}
+ENV PORT=80
 RUN rm /etc/nginx/conf.d/default.conf
 USER nginx
 COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src
 RUN chmod 777 /usr/src/entrypoint.sh
-COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html${PUBLIC_URL}
-COPY --from=builder /usr/src/app/platform/app/dist/index.html /usr/share/nginx/html
+COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html
 # In entrypoint.sh, app-config.js might be overwritten, so chmod it to be writeable.
 # The nginx user cannot chmod it, so change to root.
 USER root
-RUN chown -R nginx:nginx /usr/share/nginx/html
+RUN chmod 666 /usr/share/nginx/html/app-config.js
 USER nginx
 ENTRYPOINT ["/usr/src/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
@@ -135,20 +135,18 @@ Here is a schematic representation of our development workflow:

 ### Requirements

- [Yarn 1.20.0+](https://yarnpkg.com/en/docs/install)
+- [Yarn 1.17.3+](https://yarnpkg.com/en/docs/install)
 - [Node 18+](https://nodejs.org/en/)
 - Yarn Workspaces should be enabled on your machine:
  - `yarn config set workspaces-experimental true`

 ### Getting Started

-1. [Fork this repository][how-to-fork]
-2. [Clone your forked repository][how-to-clone]
-   - `git clone https://github.com/YOUR-USERNAME/Viewers.git`
-3. Navigate to the cloned project's directory
-4. Add this repo as a `remote` named `upstream`
-   - `git remote add upstream https://github.com/OHIF/Viewers.git`
-5. `yarn install` to restore dependencies and link projects
+1. Clone the repository
+   - `git clone https://github.com/OHIF/Viewers.git`
+2. Navigate to the cloned project's directory
+3. `yarn install` to restore dependencies and link projects
+4. `yarn dev` to start the development server

 #### To Develop

@@ -168,16 +166,15 @@ These commands are available from the root directory. Each project directory
 also supports a number of commands that can be found in their respective
 `README.md` and `package.json` files.

-| Yarn Commands                | Description                                                   |
+| Commands                | Description                                                   |
 | ---------------------------- | ------------------------------------------------------------- |
 | **Develop**                  |                                                               |
-| `dev`              | Default development experience for Viewer                     |
-| `dev:fast`             | Our experimental fast dev mode that uses rsbuild instead of webpack                     |
+| `dev` or `start`             | Default development experience for Viewer                     |
 | `test:unit`                  | Jest multi-project test runner; overall coverage              |
 | **Deploy**                   |                                                               |
 | `build`\*                    | Builds production output for our PWA Viewer                   |  |

-\* - For more information on different builds, check out our [Deploy
+\* - For more information on our different builds, check out our [Deploy
 Docs][deployment-docs]

 ## Project
@@ -1,7 +1,7 @@
 {
  "name": "@externals/devDependencies",
  "description": "External dev dependencies - put dev build dependencies here",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "license": "MIT",
  "private": true,
  "engines": {
@@ -10,7 +10,7 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@kitware/vtk.js": "32.12.0",
+    "@kitware/vtk.js": "32.1.1",
    "clsx": "^2.1.1",
    "core-js": "^3.2.1",
    "moment": "^2.9.4"
@@ -21,11 +21,7 @@
  },
  "devDependencies": {
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@rsbuild/core": "^1.1.13",
-    "@rsbuild/plugin-node-polyfill": "1.2.0",
-    "@rsbuild/plugin-react": "^1.1.0",
    "@svgr/webpack": "^8.1.0",
-    "@swc/helpers": "^0.5.15",
    "@types/jest": "^27.5.0",
    "@typescript-eslint/eslint-plugin": "^6.3.0",
    "@typescript-eslint/parser": "^6.3.0",
@@ -72,7 +68,7 @@
    "prettier-plugin-tailwindcss": "^0.5.4",
    "react-refresh": "^0.14.2",
    "semver": "^7.5.1",
-    "serve": "^14.2.4",
+    "serve": "^14.2.0",
    "shader-loader": "^1.3.1",
    "shx": "^0.3.3",
    "source-map-loader": "^4.0.1",
@@ -1,7 +1,7 @@
 {
  "name": "@externals/dicom-microscopy-viewer",
  "description": "External reference to dicom-microscopy-viewer",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "license": "MIT",
  "dependencies": {
    "dicom-microscopy-viewer": "^0.46.1"
@@ -38,7 +38,7 @@
  "resolutions": {
    "**/@babel/runtime": "^7.20.13",
    "commander": "8.3.0",
-    "dcmjs": "0.38.0",
+    "dcmjs": ">=0.33.0",
    "dicomweb-client": ">=0.10.4",
    "nth-check": "^2.1.1",
    "trim-newlines": "^5.0.0",
@@ -1,4 +1,6 @@
 // https://babeljs.io/docs/en/options#babelrcroots
+const { extendDefaultPlugins } = require('svgo');
+
 module.exports = {
  babelrcRoots: ['./platform/*', './extensions/*', './modes/*'],
  presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
@@ -49,6 +51,7 @@ module.exports = {
        '@babel/preset-react',
        '@babel/preset-typescript',
      ],
+      plugins: ['react-refresh/babel'],
      ignore: ['**/*.test.jsx', '**/*.test.js', '__snapshots__', '__tests__'],
    },
  },
@@ -1 +1 @@
-4dd485bd2d927381bbc2910a2ec545c7d4c03868
+e5286d9fc2449da50b738e7e6208d489cce1633e
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-pmap",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "description": "DICOM Parametric Map read workflow",
  "author": "OHIF",
  "license": "MIT",
@@ -33,10 +33,10 @@
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.136",
-    "@ohif/extension-cornerstone": "3.10.0-beta.136",
-    "@ohif/extension-default": "3.10.0-beta.136",
-    "@ohif/i18n": "3.10.0-beta.136",
+    "@ohif/core": "3.9.2",
+    "@ohif/extension-cornerstone": "3.9.2",
+    "@ohif/extension-default": "3.9.2",
+    "@ohif/i18n": "3.9.2",
    "prop-types": "^15.6.2",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
@@ -46,9 +46,9 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.7.8",
-    "@cornerstonejs/core": "^3.7.8",
-    "@kitware/vtk.js": "32.12.0",
+    "@cornerstonejs/adapters": "^2.2.20",
+    "@cornerstonejs/core": "^2.2.20",
+    "@kitware/vtk.js": "32.1.1",
    "react-color": "^2.19.3"
  }
 }
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { useViewportGrid } from '@ohif/ui-next';
+import { useViewportGrid, LoadingIndicatorTotalPercent } from '@ohif/ui';

 function OHIFCornerstonePMAPViewport(props: withAppTypes) {
  const {
@@ -12,7 +12,7 @@ function OHIFCornerstonePMAPViewport(props: withAppTypes) {
    extensionManager,
  } = props;
  const viewportId = viewportOptions.viewportId;
-  const { displaySetService, segmentationService, uiNotificationService, customizationService } =
+  const { displaySetService, segmentationService, uiNotificationService } =
    servicesManager.services;

  // PMAP viewport will always have a single display set
@@ -20,10 +20,6 @@ function OHIFCornerstonePMAPViewport(props: withAppTypes) {
    throw new Error('PMAP viewport must have a single display set');
  }

-  const LoadingIndicatorTotalPercent = customizationService.getCustomization(
-    'ui.loadingIndicatorTotalPercent'
-  );
-
  const pmapDisplaySet = displaySets[0];
  const [viewportGrid, viewportGridService] = useViewportGrid();
  const referencedDisplaySetRef = useRef(null);
@@ -101,7 +97,6 @@ function OHIFCornerstonePMAPViewport(props: withAppTypes) {
          viewportType: 'volume',
          orientation: viewportOptions.orientation,
          viewportId: viewportOptions.viewportId,
-          presentationIds: viewportOptions.presentationIds,
        }}
        displaySetOptions={[{}, pmapDisplaySetOptions]}
      ></Component>
@@ -37,6 +37,7 @@ module.exports = {
        '@babel/preset-react',
        '@babel/preset-typescript',
      ],
+      plugins: ['react-refresh/babel'],
      ignore: ['**/*.test.jsx', '**/*.test.js', '__snapshots__', '__tests__'],
    },
  },
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-rt",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "description": "DICOM RT read workflow",
  "author": "OHIF",
  "license": "MIT",
@@ -33,10 +33,10 @@
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.136",
-    "@ohif/extension-cornerstone": "3.10.0-beta.136",
-    "@ohif/extension-default": "3.10.0-beta.136",
-    "@ohif/i18n": "3.10.0-beta.136",
+    "@ohif/core": "3.9.2",
+    "@ohif/extension-cornerstone": "3.9.2",
+    "@ohif/extension-default": "3.9.2",
+    "@ohif/i18n": "3.9.2",
    "prop-types": "^15.6.2",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
@@ -126,7 +126,6 @@ export default async function loadRTStruct(extensionManager, rtStructDisplaySet,
    SeriesInstanceUID: instance.SeriesInstanceUID,
    ROIContours: [],
    visible: true,
-    ReferencedSOPInstanceUIDsSet: new Set(),
  };

  for (let i = 0; i < ROIContourSequence.length; i++) {
@@ -143,8 +142,7 @@ export default async function loadRTStruct(extensionManager, rtStructDisplaySet,

    const contourPoints = [];
    for (let c = 0; c < ContourSequenceArray.length; c++) {
-      const { ContourData, NumberOfContourPoints, ContourGeometricType, ContourImageSequence } =
-        ContourSequenceArray[c];
+      const { ContourData, NumberOfContourPoints, ContourGeometricType } = ContourSequenceArray[c];

      let isSupported = false;

@@ -174,12 +172,6 @@ export default async function loadRTStruct(extensionManager, rtStructDisplaySet,
        type: ContourGeometricType,
        isSupported,
      });
-
-      if (ContourImageSequence?.ReferencedSOPInstanceUID) {
-        structureSet.ReferencedSOPInstanceUIDsSet.add(
-          ContourImageSequence?.ReferencedSOPInstanceUID
-        );
-      }
    }

    _setROIContourMetadata(
@@ -1,5 +1,5 @@
 function createRTToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
-  const tools = customizationService.getCustomization('cornerstone.overlayViewportTools');
+  const { tools } = customizationService.get('cornerstone.overlayViewportTools') ?? {};

  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
@@ -1,14 +1,12 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { ViewportActionArrows } from '@ohif/ui';
-import { useViewportGrid } from '@ohif/ui-next';
-import { utils } from '@ohif/extension-cornerstone';
+import { useViewportGrid, LoadingIndicatorTotalPercent, ViewportActionArrows } from '@ohif/ui';

 import promptHydrateRT from '../utils/promptHydrateRT';
 import _getStatusComponent from './_getStatusComponent';

 import createRTToolGroupAndAddTools from '../utils/initRTToolGroup';
-import { usePositionPresentationStore } from '@ohif/extension-cornerstone';
+import { SegmentationRepresentations } from '@cornerstonejs/tools/enums';

 const RT_TOOLGROUP_BASE_NAME = 'RTToolGroup';

@@ -40,17 +38,13 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
    throw new Error('RT viewport should only have a single display set');
  }

-  const LoadingIndicatorTotalPercent = customizationService.getCustomization(
-    'ui.loadingIndicatorTotalPercent'
-  );
-
  const rtDisplaySet = displaySets[0];

  const [viewportGrid, viewportGridService] = useViewportGrid();

  // States
-  const selectedSegmentObjectIndex: number = 0;
-  const { setPositionPresentation } = usePositionPresentationStore();
+  const [isToolGroupCreated, setToolGroupCreated] = useState(false);
+  const [selectedSegment, setSelectedSegment] = useState(1);

  // Hydration means that the RT is opened and segments are loaded into the
  // segmentation panel, and RT is also rendered on any viewport that is in the
@@ -129,7 +123,6 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
          toolGroupId: toolGroupId,
          orientation: viewportOptions.orientation,
          viewportId: viewportOptions.viewportId,
-          presentationIds: viewportOptions.presentationIds,
        }}
        onElementEnabled={evt => {
          props.onElementEnabled?.(evt);
@@ -142,15 +135,26 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {

  const onSegmentChange = useCallback(
    direction => {
-      utils.handleSegmentChange({
-        direction,
-        segDisplaySet: rtDisplaySet,
-        viewportId,
-        selectedSegmentObjectIndex,
-        segmentationService,
-      });
+      const segmentationId = rtDisplaySet.displaySetInstanceUID;
+      const segmentation = segmentationService.getSegmentation(segmentationId);
+
+      const { segments } = segmentation;
+
+      const numberOfSegments = Object.keys(segments).length;
+
+      let newSelectedSegmentIndex = selectedSegment + direction;
+
+      // Segment 0 is always background
+      if (newSelectedSegmentIndex >= numberOfSegments - 1) {
+        newSelectedSegmentIndex = 1;
+      } else if (newSelectedSegmentIndex === 0) {
+        newSelectedSegmentIndex = numberOfSegments - 1;
+      }
+
+      segmentationService.jumpToSegmentCenter(segmentationId, newSelectedSegmentIndex, viewportId);
+      setSelectedSegment(newSelectedSegmentIndex);
    },
-    [selectedSegmentObjectIndex]
+    [selectedSegment, segmentationService]
  );

  useEffect(() => {
@@ -181,19 +185,6 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
          setRtIsLoading(false);
        }

-        if (rtDisplaySet?.firstSegmentedSliceImageId && viewportOptions?.presentationIds) {
-          const { firstSegmentedSliceImageId } = rtDisplaySet;
-          const { presentationIds } = viewportOptions;
-
-          setPositionPresentation(presentationIds.positionPresentationId, {
-            viewportType: 'stack',
-            viewReference: {
-              referencedImageId: firstSegmentedSliceImageId,
-            },
-            viewPresentation: {},
-          });
-        }
-
        if (evt.overlappingSegments) {
          uiNotificationService.show({
            title: 'Overlapping Segments',
@@ -256,6 +247,8 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {

    toolGroup = createRTToolGroupAndAddTools(toolGroupService, customizationService, toolGroupId);

+    setToolGroupCreated(true);
+
    return () => {
      // remove the segmentation representations if seg displayset changed
      segmentationService.removeSegmentationRepresentations(viewportId);
@@ -1,7 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ViewportActionButton } from '@ohif/ui';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent } from '@ohif/ui-next';
+import { Icon, Tooltip } from '@ohif/ui';

 export default function _getStatusComponent({ isHydrated, onStatusClick }) {
  let ToolTipMessage = null;
@@ -9,16 +8,18 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {

  switch (isHydrated) {
    case true:
-      StatusIcon = () => <Icons.ByName name="status-alert" />;
+      StatusIcon = () => <Icon name="status-alert" />;
+
      ToolTipMessage = () => <div>This Segmentation is loaded in the segmentation panel</div>;
      break;
    case false:
      StatusIcon = () => (
-        <Icons.ByName
+        <Icon
          className="text-aqua-pale"
          name="status-untracked"
        />
      );
+
      ToolTipMessage = () => <div>Click LOAD to load RTSTRUCT.</div>;
  }

@@ -33,7 +34,13 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {
          <span className="ml-1">RTSTRUCT</span>
        </div>
        {!isHydrated && (
-          <ViewportActionButton onInteraction={onStatusClick}>{loadStr}</ViewportActionButton>
+          <div
+            className="bg-primary-main hover:bg-primary-light ml-1 cursor-pointer rounded px-1.5 hover:text-black"
+            // Using onMouseUp here because onClick is not working when the viewport is not active and is styled with pointer-events:none
+            onMouseUp={onStatusClick}
+          >
+            {loadStr}
+          </div>
        )}
      </div>
    );
@@ -42,18 +49,14 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {
  return (
    <>
      {ToolTipMessage && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>
-              <StatusArea />
-            </span>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">
-            <ToolTipMessage />
-          </TooltipContent>
+        <Tooltip
+          content={<ToolTipMessage />}
+          position="bottom-left"
+        >
+          <StatusArea />
        </Tooltip>
      )}
      {!ToolTipMessage && <StatusArea />}
    </>
  );
-}
+}
@@ -37,6 +37,7 @@ module.exports = {
        '@babel/preset-react',
        '@babel/preset-typescript',
      ],
+      plugins: ['react-refresh/babel'],
      ignore: ['**/*.test.jsx', '**/*.test.js', '__snapshots__', '__tests__'],
    },
  },
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-seg",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "description": "DICOM SEG read workflow",
  "author": "OHIF",
  "license": "MIT",
@@ -33,10 +33,10 @@
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.136",
-    "@ohif/extension-cornerstone": "3.10.0-beta.136",
-    "@ohif/extension-default": "3.10.0-beta.136",
-    "@ohif/i18n": "3.10.0-beta.136",
+    "@ohif/core": "3.9.2",
+    "@ohif/extension-cornerstone": "3.9.2",
+    "@ohif/extension-default": "3.9.2",
+    "@ohif/i18n": "3.9.2",
    "prop-types": "^15.6.2",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
@@ -46,9 +46,9 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.7.8",
-    "@cornerstonejs/core": "^3.7.8",
-    "@kitware/vtk.js": "32.12.0",
+    "@cornerstonejs/adapters": "^2.2.20",
+    "@cornerstonejs/core": "^2.2.20",
+    "@kitware/vtk.js": "32.1.1",
    "react-color": "^2.19.3"
  }
 }
@@ -1,4 +1,5 @@
 import dcmjs from 'dcmjs';
+import { createReportDialogPrompt } from '@ohif/extension-default';
 import { Types } from '@ohif/core';
 import { cache, metaData } from '@cornerstonejs/core';
 import {
@@ -7,13 +8,11 @@ import {
  utilities,
 } from '@cornerstonejs/tools';
 import { adaptersRT, helpers, adaptersSEG } from '@cornerstonejs/adapters';
-import { createReportDialogPrompt } from '@ohif/extension-default';
 import { classes, DicomMetadataStore } from '@ohif/core';

 import vtkImageMarchingSquares from '@kitware/vtk.js/Filters/General/ImageMarchingSquares';
 import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
 import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
-import PROMPT_RESPONSES from '../../default/src/utils/_shared/PROMPT_RESPONSES';

 const { segmentation: segmentationUtils } = utilities;

@@ -52,7 +51,6 @@ const commandsModule = ({
    displaySetService,
    viewportGridService,
    toolGroupService,
-    customizationService,
  } = servicesManager.services as AppTypes.Services;

  const actions = {
@@ -228,6 +226,14 @@ const commandsModule = ({
     * otherwise throws an error.
     */
    storeSegmentation: async ({ segmentationId, dataSource }) => {
+      const promptResult = await createReportDialogPrompt(uiDialogService, {
+        extensionManager,
+      });
+
+      if (promptResult.action !== 1 && !promptResult.value) {
+        return;
+      }
+
      const segmentation = segmentationService.getSegmentation(segmentationId);

      if (!segmentation) {
@@ -235,50 +241,33 @@ const commandsModule = ({
      }

      const { label } = segmentation;
-      const defaultDataSource = dataSource ?? extensionManager.getActiveDataSource();
+      const SeriesDescription = promptResult.value || label || 'Research Derived Series';

-      const {
-        value: reportName,
-        dataSourceName: selectedDataSource,
-        action,
-      } = await createReportDialogPrompt({
-        servicesManager,
-        extensionManager,
-        title: 'Store Segmentation',
+      const generatedData = actions.generateSegmentation({
+        segmentationId,
+        options: {
+          SeriesDescription,
+        },
      });

-      if (action === PROMPT_RESPONSES.CREATE_REPORT) {
-        try {
-          const selectedDataSourceConfig = selectedDataSource
-            ? extensionManager.getDataSources(selectedDataSource)[0]
-            : defaultDataSource;
-
-          const generatedData = actions.generateSegmentation({
-            segmentationId,
-            options: {
-              SeriesDescription: reportName || label || 'Research Derived Series',
-            },
-          });
-
-          if (!generatedData || !generatedData.dataset) {
-            throw new Error('Error during segmentation generation');
-          }
-
-          const { dataset: naturalizedReport } = generatedData;
-
-          await selectedDataSourceConfig.store.dicom(naturalizedReport);
-
-          // add the information for where we stored it to the instance as well
-          naturalizedReport.wadoRoot = selectedDataSourceConfig.getConfig().wadoRoot;
-
-          DicomMetadataStore.addInstances([naturalizedReport], true);
-
-          return naturalizedReport;
-        } catch (error) {
-          console.debug('Error storing segmentation:', error);
-          throw error;
-        }
+      if (!generatedData || !generatedData.dataset) {
+        throw new Error('Error during segmentation generation');
      }
+
+      const { dataset: naturalizedReport } = generatedData;
+
+      await dataSource.store.dicom(naturalizedReport);
+
+      // The "Mode" route listens for DicomMetadataStore changes
+      // When a new instance is added, it listens and
+      // automatically calls makeDisplaySets
+
+      // add the information for where we stored it to the instance as well
+      naturalizedReport.wadoRoot = dataSource.getConfig().wadoRoot;
+
+      DicomMetadataStore.addInstances([naturalizedReport], true);
+
+      return naturalizedReport;
    },
    /**
     * Converts segmentations into RTSS for download.
@@ -329,28 +318,20 @@ const commandsModule = ({
    },
    setThresholdRange: ({
      value,
-      toolNames = [
-        'ThresholdCircularBrush',
-        'ThresholdSphereBrush',
-        'ThresholdCircularBrushDynamic',
-        'ThresholdSphereBrushDynamic',
-      ],
+      toolNames = ['ThresholdCircularBrush', 'ThresholdSphereBrush'],
    }) => {
-      const toolGroupIds = toolGroupService.getToolGroupIds();
-      if (!toolGroupIds?.length) {
-        return;
-      }
-
-      for (const toolGroupId of toolGroupIds) {
+      toolGroupService.getToolGroupIds()?.forEach(toolGroupId => {
        const toolGroup = toolGroupService.getToolGroup(toolGroupId);
        toolNames?.forEach(toolName => {
          toolGroup.setToolConfiguration(toolName, {
-            threshold: {
-              range: value,
+            strategySpecificConfiguration: {
+              THRESHOLD: {
+                threshold: value,
+              },
            },
          });
        });
-      }
+      });
    },
  };

@@ -182,6 +182,7 @@ async function _loadSegments({

  // Todo: what should be defaults here
  const tolerance = 0.001;
+  const skipOverlapping = true;
  eventTarget.addEventListener(Enums.Events.SEGMENTATION_LOAD_PROGRESS, evt => {
    const { percentComplete } = evt.detail;
    segmentationService._broadcastEvent(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, {
@@ -189,10 +190,11 @@ async function _loadSegments({
    });
  });

-  const results = await adaptersSEG.Cornerstone3D.Segmentation.createFromDICOMSegBuffer(
+  const results = await adaptersSEG.Cornerstone3D.Segmentation.generateToolState(
    imageIds,
    arrayBuffer,
-    { metadataProvider: metaData, tolerance }
+    metaData,
+    { skipOverlapping, tolerance, eventTarget, triggerEvent }
  );

  let usedRecommendedDisplayCIELabValue = true;
@@ -209,6 +211,15 @@ async function _loadSegments({
    }
  });

+  if (results.overlappingSegments) {
+    uiNotificationService.show({
+      title: 'Overlapping Segments',
+      message:
+        'Unsupported overlapping segments detected, segmentation rendering results may be incorrect.',
+      type: 'warning',
+    });
+  }
+
  if (!usedRecommendedDisplayCIELabValue) {
    // Display a notification about the non-utilization of RecommendedDisplayCIELabValue
    uiNotificationService.show({
@@ -1,15 +1,6 @@
 export function getToolbarModule({ servicesManager }: withAppTypes) {
  const { segmentationService, toolbarService, toolGroupService } = servicesManager.services;
  return [
-    {
-      name: 'evaluate.cornerstone.hasSegmentation',
-      evaluate: ({ viewportId }) => {
-        const segmentations = segmentationService.getSegmentationRepresentations(viewportId);
-        return {
-          disabled: !segmentations?.length,
-        };
-      },
-    },
    {
      name: 'evaluate.cornerstone.segmentation',
      evaluate: ({ viewportId, button, toolNames, disabledText }) => {
@@ -21,39 +12,27 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
        if (!segmentations?.length) {
          return {
            disabled: true,
+            className: '!text-common-bright !bg-black opacity-50',
            disabledText: disabledText ?? 'No segmentations available',
          };
        }

-        const activeSegmentation = segmentationService.getActiveSegmentation(viewportId);
-        if (!Object.keys(activeSegmentation.segments).length) {
-          return {
-            disabled: true,
-            disabledText: 'Add segment to enable this tool',
-          };
-        }
-
        const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);

        if (!toolGroup) {
          return {
            disabled: true,
+            className: '!text-common-bright ohif-disabled',
            disabledText: disabledText ?? 'Not available on the current viewport',
          };
        }

-        if (!toolNames) {
-          return {
-            disabled: false,
-            // isActive: true,
-          };
-        }
-
        const toolName = toolbarService.getToolNameForButton(button);

        if (!toolGroup.hasTool(toolName) && !toolNames) {
          return {
            disabled: true,
+            className: '!text-common-bright ohif-disabled',
            disabledText: disabledText ?? 'Not available on the current viewport',
          };
        }
@@ -64,6 +43,12 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {

        return {
          disabled: false,
+          className: isPrimaryActive
+            ? '!text-black !bg-primary-light hover:bg-primary-light hover-text-black hover:cursor-pointer'
+            : '!text-common-bright !bg-black hover:bg-primary-light hover:cursor-pointer hover:text-black',
+          // Todo: isActive right now is used for nested buttons where the primary
+          // button needs to be fully rounded (vs partial rounded) when active
+          // otherwise it does not have any other use
          isActive: isPrimaryActive,
        };
      },
@@ -1,5 +1,5 @@
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
-  const tools = customizationService.getCustomization('cornerstone.overlayViewportTools');
+  const { tools } = customizationService.get('cornerstone.overlayViewportTools') ?? {};

  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
@@ -1,13 +1,10 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ViewportActionArrows } from '@ohif/ui';
-import { useViewportGrid } from '@ohif/ui-next';
+import { LoadingIndicatorTotalPercent, useViewportGrid, ViewportActionArrows } from '@ohif/ui';
 import createSEGToolGroupAndAddTools from '../utils/initSEGToolGroup';
 import promptHydrateSEG from '../utils/promptHydrateSEG';
 import _getStatusComponent from './_getStatusComponent';
-import { usePositionPresentationStore } from '@ohif/extension-cornerstone';
 import { SegmentationRepresentations } from '@cornerstonejs/tools/enums';
-import { utils } from '@ohif/extension-cornerstone';

 const SEG_TOOLGROUP_BASE_NAME = 'SEGToolGroup';

@@ -32,10 +29,6 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
    viewportActionCornersService,
  } = servicesManager.services;

-  const LoadingIndicatorTotalPercent = customizationService.getCustomization(
-    'ui.loadingIndicatorTotalPercent'
-  );
-
  const toolGroupId = `${SEG_TOOLGROUP_BASE_NAME}-${viewportId}`;

  // SEG viewport will always have a single display set
@@ -47,8 +40,7 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
  const [viewportGrid, viewportGridService] = useViewportGrid();

  // States
-  let selectedSegmentObjectIndex: number = 0;
-  const { setPositionPresentation } = usePositionPresentationStore();
+  const [selectedSegment, setSelectedSegment] = useState(1);

  // Hydration means that the SEG is opened and segments are loaded into the
  // segmentation panel, and SEG is also rendered on any viewport that is in the
@@ -132,15 +124,27 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {

  const onSegmentChange = useCallback(
    direction => {
-      utils.handleSegmentChange({
-        direction,
-        segDisplaySet: segDisplaySet,
-        viewportId,
-        selectedSegmentObjectIndex,
-        segmentationService,
-      });
+      const segmentationId = segDisplaySet.displaySetInstanceUID;
+      const segmentation = segmentationService.getSegmentation(segmentationId);
+
+      const { segments } = segmentation;
+
+      const numberOfSegments = Object.keys(segments).length;
+
+      let newSelectedSegmentIndex = selectedSegment + direction;
+
+      // Segment 0 is always background
+
+      if (newSelectedSegmentIndex > numberOfSegments - 1) {
+        newSelectedSegmentIndex = 1;
+      } else if (newSelectedSegmentIndex === 0) {
+        newSelectedSegmentIndex = numberOfSegments - 1;
+      }
+
+      segmentationService.jumpToSegmentCenter(segmentationId, newSelectedSegmentIndex, viewportId);
+      setSelectedSegment(newSelectedSegmentIndex);
    },
-    [selectedSegmentObjectIndex]
+    [selectedSegment]
  );

  const hydrateSEG = useCallback(() => {
@@ -194,17 +198,6 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
        if (evt.segDisplaySet.displaySetInstanceUID === segDisplaySet.displaySetInstanceUID) {
          setSegIsLoading(false);
        }
-
-        if (segDisplaySet?.firstSegmentedSliceImageId && viewportOptions?.presentationIds) {
-          const { firstSegmentedSliceImageId } = segDisplaySet;
-          const { presentationIds } = viewportOptions;
-
-          setPositionPresentation(presentationIds.positionPresentationId, {
-            viewReference: {
-              referencedImageId: firstSegmentedSliceImageId,
-            },
-          });
-        }
      }
    );

@@ -1,7 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ViewportActionButton } from '@ohif/ui';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent } from '@ohif/ui-next';
+import { Icon, Tooltip } from '@ohif/ui';

 export default function _getStatusComponent({ isHydrated, onStatusClick }) {
  let ToolTipMessage = null;
@@ -9,16 +8,18 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {

  switch (isHydrated) {
    case true:
-      StatusIcon = () => <Icons.ByName name="status-alert" />;
+      StatusIcon = () => <Icon name="status-alert" />;
+
      ToolTipMessage = () => <div>This Segmentation is loaded in the segmentation panel</div>;
      break;
    case false:
      StatusIcon = () => (
-        <Icons.ByName
+        <Icon
          className="text-aqua-pale"
          name="status-untracked"
        />
      );
+
      ToolTipMessage = () => <div>Click LOAD to load segmentation.</div>;
  }

@@ -33,7 +34,13 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {
          <span className="ml-1">SEG</span>
        </div>
        {!isHydrated && (
-          <ViewportActionButton onInteraction={onStatusClick}>{loadStr}</ViewportActionButton>
+          <div
+            className="bg-primary-main hover:bg-primary-light ml-1 cursor-pointer rounded px-1.5 hover:text-black"
+            // Using onMouseUp here because onClick is not working when the viewport is not active and is styled with pointer-events:none
+            onMouseUp={onStatusClick}
+          >
+            {loadStr}
+          </div>
        )}
      </div>
    );
@@ -42,18 +49,14 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {
  return (
    <>
      {ToolTipMessage && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>
-              <StatusArea />
-            </span>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">
-            <ToolTipMessage />
-          </TooltipContent>
+        <Tooltip
+          content={<ToolTipMessage />}
+          position="bottom-left"
+        >
+          <StatusArea />
        </Tooltip>
      )}
      {!ToolTipMessage && <StatusArea />}
    </>
  );
-}
+}
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-sr",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "description": "OHIF extension for an SR Cornerstone Viewport",
  "author": "OHIF",
  "license": "MIT",
@@ -34,10 +34,10 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.136",
-    "@ohif/extension-cornerstone": "3.10.0-beta.136",
-    "@ohif/extension-measurement-tracking": "3.10.0-beta.136",
-    "@ohif/ui": "3.10.0-beta.136",
+    "@ohif/core": "3.9.2",
+    "@ohif/extension-cornerstone": "3.9.2",
+    "@ohif/extension-measurement-tracking": "3.9.2",
+    "@ohif/ui": "3.9.2",
    "dcmjs": "*",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
@@ -46,9 +46,9 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.7.8",
-    "@cornerstonejs/core": "^3.7.8",
-    "@cornerstonejs/tools": "^3.7.8",
+    "@cornerstonejs/adapters": "^2.2.20",
+    "@cornerstonejs/core": "^2.2.20",
+    "@cornerstonejs/tools": "^2.2.20",
    "classnames": "^2.3.2"
  }
 }
@@ -5,12 +5,12 @@ import dcmjs from 'dcmjs';
 import { adaptersSR } from '@cornerstonejs/adapters';

 import getFilteredCornerstoneToolState from './utils/getFilteredCornerstoneToolState';
-import hydrateStructuredReport from './utils/hydrateStructuredReport';

 const { MeasurementReport } = adaptersSR.Cornerstone3D;
 const { log } = OHIF;

 /**
+ *
 * @param measurementData An array of measurements from the measurements service
 * that you wish to serialize.
 * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
@@ -41,30 +41,9 @@ const _generateReport = (measurementData, additionalFindingTypes, options = {})
 };

 const commandsModule = (props: withAppTypes) => {
-  const { servicesManager, extensionManager } = props;
-  const { customizationService, viewportGridService, displaySetService } = servicesManager.services;
-
+  const { servicesManager } = props;
+  const { customizationService } = servicesManager.services;
  const actions = {
-    changeColorMeasurement: ({ uid }) => {
-      // When this gets supported, it probably belongs in cornerstone, not sr
-      throw new Error('Unsupported operation: changeColorMeasurement');
-      // const { color } = measurementService.getMeasurement(uid);
-      // const rgbaColor = {
-      //   r: color[0],
-      //   g: color[1],
-      //   b: color[2],
-      //   a: color[3] / 255.0,
-      // };
-      // colorPickerDialog(uiDialogService, rgbaColor, (newRgbaColor, actionId) => {
-      //   if (actionId === 'cancel') {
-      //     return;
-      //   }
-
-      //   const color = [newRgbaColor.r, newRgbaColor.g, newRgbaColor.b, newRgbaColor.a * 255.0];
-      // segmentationService.setSegmentColor(viewportId, segmentationId, segmentIndex, color);
-      // });
-    },
-
    /**
     *
     * @param measurementData An array of measurements from the measurements service
@@ -74,7 +53,7 @@ const commandsModule = (props: withAppTypes) => {
     * that you wish to serialize.
     */
    downloadReport: ({ measurementData, additionalFindingTypes, options = {} }) => {
-      const srDataset = _generateReport(measurementData, additionalFindingTypes, options);
+      const srDataset = actions.generateReport(measurementData, additionalFindingTypes, options);
      const reportBlob = dcmjs.data.datasetToBlob(srDataset);

      //Create a URL for the binary.
@@ -118,11 +97,12 @@ const commandsModule = (props: withAppTypes) => {
          throw new Error('Invalid report, no content');
        }

-        const onBeforeDicomStore = customizationService.getCustomization('onBeforeDicomStore');
+        const onBeforeDicomStore =
+          customizationService.getModeCustomization('onBeforeDicomStore')?.value;

        let dicomDict;
        if (typeof onBeforeDicomStore === 'function') {
-          dicomDict = onBeforeDicomStore({ dicomDict, measurementData, naturalizedReport });
+          dicomDict = onBeforeDicomStore({ measurementData, naturalizedReport });
        }

        await dataSource.store.dicom(naturalizedReport, null, dicomDict);
@@ -143,27 +123,6 @@ const commandsModule = (props: withAppTypes) => {
        throw new Error(error.message || 'Error while saving the measurements.');
      }
    },
-
-    /**
-     * Loads measurements by hydrating and loading the SR for the given display set instance UID
-     * and displays it in the active viewport.
-     */
-    loadSRMeasurements: ({ displaySetInstanceUID }) => {
-      const { SeriesInstanceUIDs } = hydrateStructuredReport(
-        { servicesManager, extensionManager, commandsManager },
-        displaySetInstanceUID
-      );
-
-      const displaySets = displaySetService.getDisplaySetsForSeries(SeriesInstanceUIDs[0]);
-      if (displaySets.length) {
-        viewportGridService.setDisplaySetsForViewports([
-          {
-            viewportId: viewportGridService.getActiveViewportId(),
-            displaySetInstanceUIDs: [displaySets[0].displaySetInstanceUID],
-          },
-        ]);
-      }
-    },
  };

  const definitions = {
@@ -173,9 +132,6 @@ const commandsModule = (props: withAppTypes) => {
    storeMeasurements: {
      commandFn: actions.storeMeasurements,
    },
-    loadSRMeasurements: {
-      commandFn: actions.loadSRMeasurements,
-    },
  };

  return {
@@ -1,25 +1,38 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ExtensionManager, useToolbar } from '@ohif/core';
+import { ExtensionManager } from '@ohif/core';

 import { setTrackingUniqueIdentifiersForElement } from '../tools/modules/dicomSRModule';

-import { ViewportActionArrows } from '@ohif/ui';
+import { Icon, Tooltip, useViewportGrid, ViewportActionArrows } from '@ohif/ui';
+import hydrateStructuredReport from '../utils/hydrateStructuredReport';
+import { useAppConfig } from '@state';
 import createReferencedImageDisplaySet from '../utils/createReferencedImageDisplaySet';
-import { usePositionPresentationStore } from '@ohif/extension-cornerstone';
-import { useViewportGrid } from '@ohif/ui-next';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent } from '@ohif/ui-next';

 const MEASUREMENT_TRACKING_EXTENSION_ID = '@ohif/extension-measurement-tracking';

 const SR_TOOLGROUP_BASE_NAME = 'SRToolGroup';

 function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
-  const { children, dataSource, displaySets, viewportOptions, servicesManager, extensionManager } =
-    props;
+  const {
+    commandsManager,
+    children,
+    dataSource,
+    displaySets,
+    viewportOptions,
+    servicesManager,
+    extensionManager,
+  } = props;

-  const { displaySetService, viewportActionCornersService } = servicesManager.services;
+  const [appConfig] = useAppConfig();
+
+  const {
+    displaySetService,
+    cornerstoneViewportService,
+    measurementService,
+    viewportActionCornersService,
+  } = servicesManager.services;

  const viewportId = viewportOptions.viewportId;

@@ -30,8 +43,6 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {

  const srDisplaySet = displaySets[0];

-  const { setPositionPresentation } = usePositionPresentationStore();
-
  const [viewportGrid, viewportGridService] = useViewportGrid();
  const [measurementSelected, setMeasurementSelected] = useState(0);
  const [measurementCount, setMeasurementCount] = useState(1);
@@ -44,6 +55,7 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {

  // Optional hook into tracking extension, if present.
  let trackedMeasurements;
+  let sendTrackedMeasurementsEvent;

  const hasMeasurementTrackingExtension = extensionManager.registeredExtensionIds.includes(
    MEASUREMENT_TRACKING_EXTENSION_ID
@@ -56,6 +68,29 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {

    const tracked = useContext(contextModule.context);
    trackedMeasurements = tracked?.[0];
+    sendTrackedMeasurementsEvent = tracked?.[1];
+  }
+
+  if (!sendTrackedMeasurementsEvent) {
+    // if no panels from measurement-tracking extension is used, this code will run
+    trackedMeasurements = null;
+    sendTrackedMeasurementsEvent = (eventName, { displaySetInstanceUID }) => {
+      measurementService.clearMeasurements();
+      const { SeriesInstanceUIDs } = hydrateStructuredReport(
+        { servicesManager, extensionManager, appConfig },
+        displaySetInstanceUID
+      );
+
+      const displaySets = displaySetService.getDisplaySetsForSeries(SeriesInstanceUIDs[0]);
+      if (displaySets.length) {
+        viewportGridService.setDisplaySetsForViewports([
+          {
+            viewportId: activeViewportId,
+            displaySetInstanceUIDs: [displaySets[0].displaySetInstanceUID],
+          },
+        ]);
+      }
+    };
  }

  /**
@@ -119,17 +154,33 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
        }

        setMeasurementSelected(newMeasurementSelected);
-
        setActiveImageDisplaySetData(referencedDisplaySet);
        setReferencedDisplaySetMetadata(referencedDisplaySetMetadata);

-        const { presentationIds } = viewportOptions;
-        const measurement = srDisplaySet.measurements[newMeasurementSelected];
-        setPositionPresentation(presentationIds.positionPresentationId, {
-          viewReference: {
-            referencedImageId: measurement.imageId,
-          },
-        });
+        if (
+          referencedDisplaySet.displaySetInstanceUID ===
+          activeImageDisplaySetData?.displaySetInstanceUID
+        ) {
+          const { measurements } = srDisplaySet;
+
+          // it means that we have a new referenced display set, and the
+          // imageIdIndex will handle it by updating the viewport, but if they
+          // are the same we just need to use measurementService to jump to the
+          // new measurement
+          const csViewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+
+          if (!csViewport) {
+            return;
+          }
+
+          const imageIds = csViewport.getImageIds();
+
+          const imageIdIndex = imageIds.indexOf(measurements[newMeasurementSelected].imageId);
+
+          if (imageIdIndex !== -1) {
+            csViewport.setImageIdIndex(imageIdIndex);
+          }
+        }
      });
    },
    [dataSource, srDisplaySet, activeImageDisplaySetData, viewportId]
@@ -151,6 +202,10 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
      return null;
    }

+    const initialImageIndex = activeImageDisplaySetData.images.findIndex(
+      image => image.imageId === measurement.imageId
+    );
+
    return (
      <Component
        {...props}
@@ -175,6 +230,7 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
          props.onElementEnabled?.(evt);
          onElementEnabled(evt);
        }}
+        initialImageIndex={initialImageIndex}
        isJumpToMeasurementDisabled={true}
      ></Component>
    );
@@ -269,8 +325,8 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
          viewportId,
          isRehydratable: srDisplaySet.isRehydratable,
          isLocked,
+          sendTrackedMeasurementsEvent,
          t,
-          servicesManager,
        }),
        indexPriority: -100,
        location: viewportActionCornersService.LOCATIONS.topLeft,
@@ -289,7 +345,15 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
        location: viewportActionCornersService.LOCATIONS.topRight,
      },
    ]);
-  }, [isLocked, onMeasurementChange, srDisplaySet, t, viewportActionCornersService, viewportId]);
+  }, [
+    isLocked,
+    onMeasurementChange,
+    sendTrackedMeasurementsEvent,
+    srDisplaySet,
+    t,
+    viewportActionCornersService,
+    viewportId,
+  ]);

  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  let childrenWithProps = null;
@@ -377,9 +441,16 @@ function _getStatusComponent({
  viewportId,
  isRehydratable,
  isLocked,
+  sendTrackedMeasurementsEvent,
  t,
-  servicesManager,
 }) {
+  const handleMouseUp = () => {
+    sendTrackedMeasurementsEvent('HYDRATE_SR', {
+      displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
+      viewportId,
+    });
+  };
+
  const loadStr = t('LOAD');

  // 1 - Incompatible
@@ -391,12 +462,7 @@ function _getStatusComponent({

  switch (state) {
    case 1:
-      StatusIcon = () => (
-        <Icons.ByName
-          name="status-alert"
-          className="h-4 w-4"
-        />
-      );
+      StatusIcon = () => <Icon name="status-alert" />;

      ToolTipMessage = () => (
        <div>
@@ -407,12 +473,7 @@ function _getStatusComponent({
      );
      break;
    case 2:
-      StatusIcon = () => (
-        <Icons.ByName
-          name="status-locked"
-          className="h-4 w-4"
-        />
-      );
+      StatusIcon = () => <Icon name="status-locked" />;

      ToolTipMessage = () => (
        <div>
@@ -426,8 +487,8 @@ function _getStatusComponent({
      break;
    case 3:
      StatusIcon = () => (
-        <Icons.ByName
-          className="text-aqua-pale h-4 w-4"
+        <Icon
+          className="text-aqua-pale"
          name="status-untracked"
        />
      );
@@ -435,62 +496,32 @@ function _getStatusComponent({
      ToolTipMessage = () => <div>{`Click ${loadStr} to restore measurements.`}</div>;
  }

-  const StatusArea = () => {
-    const { toolbarButtons: loadSRMeasurementsButtons, onInteraction } = useToolbar({
-      servicesManager,
-      buttonSection: 'loadSRMeasurements',
-    });
-
-    const commandOptions = {
-      displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
-      viewportId,
-    };
-
-    return (
-      <div className="flex h-6 cursor-default text-sm leading-6 text-white">
-        <div className="bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1">
-          <StatusIcon className="h-4 w-4" />
-          <span className="ml-1">SR</span>
-        </div>
-        {state === 3 && (
-          <>
-            {loadSRMeasurementsButtons.map(toolDef => {
-              if (!toolDef) {
-                return null;
-              }
-              const { id, Component, componentProps } = toolDef;
-              const tool = (
-                <Component
-                  key={id}
-                  id={id}
-                  onInteraction={args => onInteraction({ ...args, ...commandOptions })}
-                  {...componentProps}
-                />
-              );
-
-              return <div key={id}>{tool}</div>;
-            })}
-          </>
-        )}
+  const StatusArea = () => (
+    <div className="flex h-6 cursor-default text-sm leading-6 text-white">
+      <div className="bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1">
+        <StatusIcon />
+        <span className="ml-1">SR</span>
      </div>
-    );
-  };
+      {state === 3 && (
+        <div
+          className="bg-primary-main hover:bg-primary-light ml-1 cursor-pointer rounded px-1.5 hover:text-black"
+          // Using onMouseUp here because onClick is not working when the viewport is not active and is styled with pointer-events:none
+          onMouseUp={handleMouseUp}
+        >
+          {loadStr}
+        </div>
+      )}
+    </div>
+  );

  return (
    <>
      {ToolTipMessage && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>
-              <StatusArea />
-            </span>
-          </TooltipTrigger>
-          <TooltipContent
-            side="bottom"
-            align="start"
-          >
-            <ToolTipMessage />
-          </TooltipContent>
+        <Tooltip
+          content={<ToolTipMessage />}
+          position="bottom-left"
+        >
+          <StatusArea />
        </Tooltip>
      )}
      {!ToolTipMessage && <StatusArea />}
@@ -263,9 +263,9 @@ function _checkIfCanAddMeasurementsToDisplaySet(
  for (let j = unloadedMeasurements.length - 1; j >= 0; j--) {
    let measurement = unloadedMeasurements[j];

-    const onBeforeSRAddMeasurement = customizationService.getCustomization(
+    const onBeforeSRAddMeasurement = customizationService.getModeCustomization(
      'onBeforeSRAddMeasurement'
-    );
+    )?.value;

    if (typeof onBeforeSRAddMeasurement === 'function') {
      measurement = onBeforeSRAddMeasurement({
@@ -30,7 +30,6 @@ const dicomSRExtension = {
   * Only required property. Should be a unique value across all extensions.
   */
  id,
-
  onModeEnter,

  preRegistration,
@@ -0,0 +1,15 @@
+import { SOPClassHandlerId, SOPClassHandlerId3D } from './id';
+
+export default function onModeEnter({ servicesManager }) {
+  const { displaySetService } = servicesManager.services;
+  const displaySetCache = displaySetService.getDisplaySetCache();
+
+  const srDisplaySets = [...displaySetCache.values()].filter(
+    ds => ds.SOPClassHandlerId === SOPClassHandlerId || ds.SOPClassHandlerId === SOPClassHandlerId3D
+  );
+
+  srDisplaySets.forEach(ds => {
+    // New mode route, allow SRs to be hydrated again
+    ds.isHydrated = false;
+  });
+}
@@ -1,39 +0,0 @@
-import React from 'react';
-
-import { SOPClassHandlerId, SOPClassHandlerId3D } from './id';
-import { ViewportActionButton } from '@ohif/ui';
-import i18n from '@ohif/i18n';
-
-export default function onModeEnter({ servicesManager }) {
-  const { displaySetService, toolbarService } = servicesManager.services;
-  const displaySetCache = displaySetService.getDisplaySetCache();
-
-  const srDisplaySets = [...displaySetCache.values()].filter(
-    ds => ds.SOPClassHandlerId === SOPClassHandlerId || ds.SOPClassHandlerId === SOPClassHandlerId3D
-  );
-
-  srDisplaySets.forEach(ds => {
-    // New mode route, allow SRs to be hydrated again
-    ds.isHydrated = false;
-  });
-
-  toolbarService.addButtons([
-    {
-      // A base/default button for loading measurements. It is added to the toolbar below.
-      // Customizations to this button can be made in the mode or by another extension.
-      // For example, the button label can be changed and/or the command to clear
-      // the measurements can be dropped.
-      id: 'loadSRMeasurements',
-      component: props => (
-        <ViewportActionButton {...props}>{i18n.t('Common:LOAD')}</ViewportActionButton>
-      ),
-      props: {
-        commands: ['clearMeasurements', 'loadSRMeasurements'],
-      },
-    },
-  ]);
-
-  // The toolbar used in the viewport's status bar. Modes and extensions can further customize
-  // it to optionally add other buttons.
-  toolbarService.createButtonSection('loadSRMeasurements', ['loadSRMeasurements']);
-}
@@ -25,7 +25,7 @@ const contentItemFormatters = {
    return `${NumericValue} ${CodeValue}`;
  },
  PNAME: contentItem => {
-    const personName = contentItem.PersonName?.[0];
+    const personName = contentItem.PersonName?.[0]?.Alphabetic;
    return personName ? utils.formatPN(personName) : undefined;
  },
  DATE: contentItem => {
@@ -41,14 +41,22 @@ const convertSites = (codingValues, sites) => {
 *
 */
 export default function hydrateStructuredReport(
-  { servicesManager, extensionManager, commandsManager }: withAppTypes,
+  { servicesManager, extensionManager, appConfig }: withAppTypes,
  displaySetInstanceUID
 ) {
+  const annotationManager = CsAnnotation.state.getAnnotationManager();
  const dataSource = extensionManager.getActiveDataSource()[0];
  const { measurementService, displaySetService, customizationService } = servicesManager.services;

-  const codingValues = customizationService.getCustomization('codingValues');
-  const disableEditing = customizationService.getCustomization('panelMeasurement.disableEditing');
+  const codingValues = customizationService.getCustomization('codingValues', {});
+
+  const { disableEditing } = customizationService.getCustomization(
+    'PanelMeasurement.disableEditing',
+    {
+      id: 'default.disableEditing',
+      disableEditing: false,
+    }
+  );

  const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);

@@ -85,8 +93,7 @@ export default function hydrateStructuredReport(
    }
  });

-  // Mapping of legacy datasets is now directly handled by adapters module
-  const datasetToUse = instance;
+  const datasetToUse = _mapLegacyDataSet(instance);

  // Use dcmjs to generate toolState.
  let storedMeasurementByAnnotationType = MeasurementReport.generateToolState(
@@ -100,7 +107,8 @@ export default function hydrateStructuredReport(
    metaData
  );

-  const onBeforeSRHydration = customizationService.getCustomization('onBeforeSRHydration')?.value;
+  const onBeforeSRHydration =
+    customizationService.getModeCustomization('onBeforeSRHydration')?.value;

  if (typeof onBeforeSRHydration === 'function') {
    storedMeasurementByAnnotationType = onBeforeSRHydration({
@@ -200,11 +208,7 @@ export default function hydrateStructuredReport(
      annotation.data.label = getLabelFromDCMJSImportedToolData(toolData);
      annotation.data.finding = convertCode(codingValues, toolData.finding?.[0]);
      annotation.data.findingSites = convertSites(codingValues, toolData.findingSites);
-      annotation.data.findingSites?.forEach(site => {
-        if (site.type) {
-          annotation.data[site.type] = site;
-        }
-      });
+      annotation.data.site = annotation.data.findingSites?.[0];

      const matchingMapping = mappings.find(m => m.annotationType === annotationType);

@@ -216,13 +220,9 @@ export default function hydrateStructuredReport(
        dataSource
      );

-      commandsManager.runCommand('updateMeasurement', {
-        uid: newAnnotationUID,
-        code: annotation.data.finding,
-      });
-
      if (disableEditing) {
-        locking.setAnnotationLocked(newAnnotationUID, true);
+        const addedAnnotation = annotationManager.getAnnotation(newAnnotationUID);
+        locking.setAnnotationLocked(addedAnnotation, true);
      }

      if (!imageIds.includes(imageId)) {
@@ -238,3 +238,62 @@ export default function hydrateStructuredReport(
    SeriesInstanceUIDs,
  };
 }
+
+function _mapLegacyDataSet(dataset) {
+  const REPORT = 'Imaging Measurements';
+  const GROUP = 'Measurement Group';
+  const TRACKING_IDENTIFIER = 'Tracking Identifier';
+
+  // Identify the Imaging Measurements
+  const imagingMeasurementContent = toArray(dataset.ContentSequence).find(
+    codeMeaningEquals(REPORT)
+  );
+
+  // Retrieve the Measurements themselves
+  const measurementGroups = toArray(imagingMeasurementContent.ContentSequence).filter(
+    codeMeaningEquals(GROUP)
+  );
+
+  // For each of the supported measurement types, compute the measurement data
+  const measurementData = {};
+
+  const cornerstoneToolClasses = MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
+
+  const registeredToolClasses = [];
+
+  Object.keys(cornerstoneToolClasses).forEach(key => {
+    registeredToolClasses.push(cornerstoneToolClasses[key]);
+    measurementData[key] = [];
+  });
+
+  measurementGroups.forEach((measurementGroup, index) => {
+    const measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
+
+    const TrackingIdentifierGroup = measurementGroupContentSequence.find(
+      contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER
+    );
+
+    const TrackingIdentifier = TrackingIdentifierGroup.TextValue;
+
+    let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
+    if (supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
+      cornerstoneTag = CORNERSTONE_3D_TAG;
+    }
+
+    const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
+
+    TrackingIdentifierGroup.TextValue = mappedTrackingIdentifier;
+  });
+
+  return dataset;
+}
+
+const toArray = function (x) {
+  return Array.isArray(x) ? x : [x];
+};
+
+const codeMeaningEquals = codeMeaningName => {
+  return contentItem => {
+    return contentItem.ConceptNameCodeSequence.CodeMeaning === codeMeaningName;
+  };
+};
@@ -0,0 +1,60 @@
+import { adaptersSR } from '@cornerstonejs/adapters';
+
+const cornerstoneAdapters =
+  adaptersSR.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
+
+const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
+const CORNERSTONE_3D_TAG = adaptersSR.Cornerstone3D.CORNERSTONE_3D_TAG;
+
+/**
+ * Checks if the given `displaySet`can be rehydrated into the `measurementService`.
+ *
+ * @param {object} displaySet The SR `displaySet` to check.
+ * @param {object[]} mappings The CornerstoneTools 4 mappings to the `measurementService`.
+ * @returns {boolean} True if the SR can be rehydrated into the `measurementService`.
+ */
+export default function isRehydratable(displaySet, mappings) {
+  if (!mappings || !mappings.length) {
+    return false;
+  }
+
+  const mappingDefinitions = mappings.map(m => m.annotationType);
+  const { measurements } = displaySet;
+
+  const adapterKeys = Object.keys(cornerstoneAdapters).filter(
+    adapterKey =>
+      typeof cornerstoneAdapters[adapterKey].isValidCornerstoneTrackingIdentifier === 'function'
+  );
+
+  const adapters = [];
+
+  adapterKeys.forEach(key => {
+    if (mappingDefinitions.includes(key)) {
+      // Must have both a dcmjs adapter and a measurementService
+      // Definition in order to be a candidate for import.
+      adapters.push(cornerstoneAdapters[key]);
+    }
+  });
+
+  for (let i = 0; i < measurements.length; i++) {
+    const { TrackingIdentifier } = measurements[i] || {};
+    const hydratable = adapters.some(adapter => {
+      let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
+      if (supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
+        cornerstoneTag = CORNERSTONE_3D_TAG;
+      }
+
+      const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
+
+      return adapter.isValidCornerstoneTrackingIdentifier(mappedTrackingIdentifier);
+    });
+
+    if (hydratable) {
+      return true;
+    }
+    console.log('Measurement is not rehydratable', TrackingIdentifier, measurements[i]);
+  }
+
+  console.log('No measurements found which were rehydratable');
+  return false;
+}
@@ -1,41 +0,0 @@
-import { adaptersSR } from '@cornerstonejs/adapters';
-
-const { MeasurementReport } = adaptersSR.Cornerstone3D;
-
-/**
- * Checks if the given `displaySet`can be rehydrated into the `measurementService`.
- *
- * @param {object} displaySet The SR `displaySet` to check.
- * @param {object[]} mappings The CornerstoneTools 4 mappings to the `measurementService`.
- * @returns {boolean} True if the SR can be rehydrated into the `measurementService`.
- */
-export default function isRehydratable(displaySet, mappings) {
-  if (!mappings || !mappings.length) {
-    return false;
-  }
-
-  const mappingDefinitions = new Set<string>();
-  for (const m of mappings) {
-    mappingDefinitions.add(m.annotationType);
-  }
-
-  const { measurements } = displaySet;
-
-  for (let i = 0; i < measurements.length; i++) {
-    const { TrackingIdentifier } = measurements[i] || {};
-    if (!TrackingIdentifier) {
-      console.warn('No tracking identifier for measurement ', measurements[i]);
-      continue;
-    }
-    const adapter = MeasurementReport.getAdapterForTrackingIdentifier(TrackingIdentifier);
-    const hydratable = adapter && mappingDefinitions.has(adapter.toolType);
-
-    if (hydratable) {
-      return true;
-    }
-    console.log('Measurement is not rehydratable', TrackingIdentifier, measurements[i]);
-  }
-
-  console.log('No measurements found which were rehydratable');
-  return false;
-}
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone-dynamic-volume",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "description": "OHIF extension for 4D volumes data",
  "author": "OHIF",
  "license": "MIT",
@@ -29,11 +29,11 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.136",
-    "@ohif/extension-cornerstone": "3.10.0-beta.136",
-    "@ohif/extension-default": "3.10.0-beta.136",
-    "@ohif/i18n": "3.10.0-beta.136",
-    "@ohif/ui": "3.10.0-beta.136",
+    "@ohif/core": "3.9.2",
+    "@ohif/extension-cornerstone": "3.9.2",
+    "@ohif/extension-default": "3.9.2",
+    "@ohif/i18n": "3.9.2",
+    "@ohif/ui": "3.9.2",
    "dcmjs": "*",
    "dicom-parser": "^1.8.21",
    "hammerjs": "^2.0.8",
@@ -42,8 +42,8 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/core": "^3.7.8",
-    "@cornerstonejs/tools": "^3.7.8",
+    "@cornerstonejs/core": "^2.2.20",
+    "@cornerstonejs/tools": "^2.2.20",
    "classnames": "^2.3.2"
  }
 }
@@ -262,6 +262,7 @@ function _getInstanceFromSegmentations(segmentations, { servicesManager }) {
 }

 function updateSegmentationsChartDisplaySet({ servicesManager }: withAppTypes): void {
+  debugger;
  const { segmentationService } = servicesManager.services;
  const segmentations = segmentationService.getSegmentations();
  const { seriesMetadata, instance } =
@@ -1,6 +1,6 @@
 import React from 'react';
 import { DynamicDataPanel } from './panels';
-import { Toolbox } from '@ohif/extension-default';
+import { Toolbox } from '@ohif/ui-next';
 import { PanelSegmentation } from '@ohif/extension-cornerstone';
 import DynamicExport from './panels/DynamicExport';

@@ -19,6 +19,9 @@ function getPanelModule({ commandsManager, extensionManager, servicesManager, co
    return (
      <>
        <Toolbox
+          commandsManager={commandsManager}
+          servicesManager={servicesManager}
+          extensionManager={extensionManager}
          buttonSectionId="dynamic-toolbox"
          title="Threshold Tools"
        />
@@ -1,6 +1,16 @@
-import React, { useState } from 'react';
-import { Button, PanelSection, ButtonGroup, IconButton, InputNumber } from '@ohif/ui';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent, Numeric } from '@ohif/ui-next';
+import React, { useEffect, useState } from 'react';
+import {
+  Button,
+  PanelSection,
+  ButtonGroup,
+  IconButton,
+  InputNumber,
+  Icon,
+  Tooltip,
+} from '@ohif/ui';
+
+import { DoubleSlider } from '@ohif/ui-next';
+
 import { Enums } from '@cornerstonejs/core';

 const controlClassNames = {
@@ -11,21 +21,16 @@ const controlClassNames = {

 const Header = ({ title, tooltip }) => (
  <div className="flex items-center space-x-1">
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <span>
-          <Icons.ByName
-            name="info-link"
-            className="text-primary-active h-[14px] w-[14px]"
-          />
-        </span>
-      </TooltipTrigger>
-      <TooltipContent
-        sideOffset={4}
-        className="bg-primary-dark max-w-xs p-2 text-white"
-      >
-        <div>{tooltip}</div>
-      </TooltipContent>
+    <Tooltip
+      content={<div className="text-white">{tooltip}</div>}
+      position="bottom-left"
+      tight={true}
+      tooltipBoxClassName="max-w-xs p-2"
+    >
+      <Icon
+        name="info-link"
+        className="text-primary-active h-[14px] w-[14px]"
+      />
    </Tooltip>
    <span className="text-aqua-pale text-[11px] uppercase">{title}</span>
  </div>
@@ -40,17 +45,26 @@ const DynamicVolumeControls = ({
  minFps,
  maxFps,
  // Frames
-  currentDimensionGroupNumber,
-  onDimensionGroupChange,
-  numDimensionGroups,
+  currentFrameIndex,
+  onFrameChange,
+  framesLength,
  onGenerate,
  onDoubleRangeChange,
-  rangeValues,
  onDynamicClick,
 }) => {
  const [computedView, setComputedView] = useState(false);
+
  const [computeViewMode, setComputeViewMode] = useState(Enums.DynamicOperatorType.SUM);

+  const [sliderRangeValues, setSliderRangeValues] = useState([0, framesLength - 1]);
+
+  const handleSliderChange = newValues => {
+    onDoubleRangeChange(newValues);
+    setSliderRangeValues(newValues);
+  };
+
+  const formatLabel = value => Math.round(value);
+
  return (
    <div className="flex select-none flex-col">
      <PanelSection
@@ -85,7 +99,7 @@ const DynamicVolumeControls = ({
          </ButtonGroup>
        </div>
        <div>
-          <DimensionGroupControls
+          <FrameControls
            onPlayPauseChange={onPlayPauseChange}
            isPlaying={isPlaying}
            computedView={computedView}
@@ -95,9 +109,9 @@ const DynamicVolumeControls = ({
            minFps={minFps}
            maxFps={maxFps}
            //
-            numDimensionGroups={numDimensionGroups}
-            onDimensionGroupChange={onDimensionGroupChange}
-            currentDimensionGroupNumber={currentDimensionGroupNumber}
+            framesLength={framesLength}
+            onFrameChange={onFrameChange}
+            currentFrameIndex={currentFrameIndex}
          />
        </div>
        <div className={`mt-6 flex flex-col ${computedView ? '' : 'ohif-disabled'}`}>
@@ -107,15 +121,15 @@ const DynamicVolumeControls = ({
              <div>
                Operation Buttons (SUM, AVERAGE, SUBTRACT): Select the mathematical operation to be
                applied to the data set.
-                <br /> Range Slider: Choose the numeric range of dimension groups within which the
-                operation will be performed.
-                <br />
-                Generate Button: Execute the chosen operation on the specified range of data.
+                <br></br> Range Slider: Choose the numeric range within which the operation will be
+                performed.
+                <br></br>Generate Button: Execute the chosen operation on the specified range of
+                data.{' '}
              </div>
            }
          />
          <ButtonGroup
-            className="mt-2 w-full"
+            className={`mt-2 w-full`}
            separated={true}
          >
            <button
@@ -138,15 +152,15 @@ const DynamicVolumeControls = ({
            </button>
          </ButtonGroup>
          <div className="mt-2 w-full">
-            <Numeric.Container
-              mode="doubleRange"
-              min={1}
-              max={numDimensionGroups}
-              values={rangeValues}
-              onChange={onDoubleRangeChange}
-            >
-              <Numeric.DoubleRange showNumberInputs />
-            </Numeric.Container>
+            <DoubleSlider
+              min={0}
+              max={framesLength - 1}
+              step={1}
+              defaultValue={sliderRangeValues}
+              onValueChange={handleSliderChange}
+              formatLabel={formatLabel}
+              className="w-full"
+            />
          </div>
          <Button
            className="mt-2 !h-[26px] !w-[115px] self-start !p-0"
@@ -164,16 +178,16 @@ const DynamicVolumeControls = ({

 export default DynamicVolumeControls;

-function DimensionGroupControls({
+function FrameControls({
  isPlaying,
  onPlayPauseChange,
  fps,
  minFps,
  maxFps,
  onFpsChange,
-  numDimensionGroups,
-  onDimensionGroupChange,
-  currentDimensionGroupNumber,
+  framesLength,
+  onFrameChange,
+  currentFrameIndex,
  computedView,
 }) {
  const getPlayPauseIconName = () => (isPlaying ? 'icon-pause' : 'icon-play');
@@ -184,30 +198,28 @@ function DimensionGroupControls({
        title="4D Controls"
        tooltip={
          <div>
-            Play/Pause Button: Begin or pause the animation of the 4D visualization. <br />
-            Dimension Group Selector: Navigate through individual dimension groups of the 4D data.{' '}
-            <br />
-            FPS (Frames Per Second) Selector: Adjust the playback speed of the animation.
+            Play/Pause Button: Begin or pause the animation of the 4D visualization. <br></br> Frame
+            Selector: Navigate through individual frames of the 4D data. <br></br> FPS (Frames Per
+            Second) Selector: Adjust the playback speed of the animation.
          </div>
        }
      />
      <div className="mt-3 flex justify-between">
        <IconButton
-          id="play-pause-button"
          className="bg-customblue-30 h-[26px] w-[58px] rounded-[4px]"
          onClick={() => onPlayPauseChange(!isPlaying)}
        >
-          <Icons.ByName
+          <Icon
            name={getPlayPauseIconName()}
            className="active:text-primary-light hover:bg-customblue-300 h-[24px] w-[24px] cursor-pointer text-white"
          />
        </IconButton>
        <InputNumber
-          value={currentDimensionGroupNumber}
-          onChange={onDimensionGroupChange}
-          minValue={1}
-          maxValue={numDimensionGroups}
-          label="Group"
+          value={currentFrameIndex}
+          onChange={onFrameChange}
+          minValue={0}
+          maxValue={framesLength - 1}
+          label="Frame"
          {...controlClassNames}
        />
        <InputNumber
@@ -1,6 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { useCine } from '@ohif/ui';
-import { useViewportGrid } from '@ohif/ui-next';
+import { useCine, useViewportGrid } from '@ohif/ui';
 import { utilities as csUtils, volumeLoader, eventTarget, Enums, cache } from '@cornerstonejs/core';
 import { utilities as cstUtils } from '@cornerstonejs/tools';
 import DynamicVolumeControls from './DynamicVolumeControls';
@@ -15,12 +14,13 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
  const [{ activeViewportId }] = useViewportGrid();

  //
-  const [dimensionGroupRange, setDimensionGroupRange] = useState([1, 1]);
+  const [timePointsRange, setTimePointsRange] = useState([0, 0]);
+  const [timePointsRangeToUseForGenerate, setTimePointsRangeToUseForGenerate] = useState([0, 0]);
  const [computedDisplaySet, setComputedDisplaySet] = useState(null);
  const [dynamicVolume, setDynamicVolume] = useState(null);
  const [frameRate, setFrameRate] = useState(20);
  const [isPlaying, setIsPlaying] = useState(isCineEnabled);
-  const [dimensionGroupNumberRendered, setDimensionGroupNumberRendered] = useState(null);
+  const [timePointRendered, setTimePointRendered] = useState(null);
  const [displayingComputed, setDisplayingComputed] = useState(false);

  //
@@ -37,8 +37,9 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
        if (volumeData.volume?.isDynamicVolume()) {
          setDynamicVolume(volumeData.volume);
          uuidDynamicVolume.current = volumeData.displaySetInstanceUID;
-          const newRange = [1, volumeData.volume.numDimensionGroups];
-          setDimensionGroupRange(newRange);
+          const newRange = [1, volumeData.volume.numTimePoints];
+          setTimePointsRange(newRange);
+          setTimePointsRangeToUseForGenerate(newRange);
        }
      });
    };
@@ -63,10 +64,10 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
  }, [cornerstoneViewportService, cineService, servicesManager.services.cineService]);

  useEffect(() => {
-    const evt = Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED;
+    const evt = Enums.Events.DYNAMIC_VOLUME_TIME_POINT_INDEX_CHANGED;

    const callback = evt => {
-      setDimensionGroupNumberRendered(evt.detail.dimensionGroupNumber);
+      setTimePointRendered(evt.detail.timePointIndex);
    };

    eventTarget.addEventListener(evt, callback);
@@ -74,7 +75,7 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
    return () => {
      eventTarget.removeEventListener(evt, callback);
    };
-  }, []);
+  }, [cornerstoneViewportService]);

  useEffect(() => {
    const displaySetUIDs = viewportGridService.getDisplaySetsUIDsForViewport(activeViewportId);
@@ -100,7 +101,9 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:

    setDynamicVolume(dynamicVolume);
    uuidDynamicVolume.current = dynamicVolumeDisplaySet.displaySetInstanceUID;
-    setDimensionGroupRange([1, dynamicVolume.numDimensionGroups]);
+    const newRange = [1, dynamicVolume.numTimePoints];
+    setTimePointsRange(newRange);
+    setTimePointsRangeToUseForGenerate(newRange);
  }, [
    activeViewportId,
    viewportGridService,
@@ -137,12 +140,11 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
        volumeId: computedVolumeId,
      });
    }
-    const [start, end] = dimensionGroupRange;
-    // from start to end, with steps of 1
-    const frameNumbers = Array.from({ length: end - start + 1 }, (_, i) => start + i);
+    const [start, end] = timePointsRangeToUseForGenerate;
+    const frameNumbers = Array.from({ length: end - start + 1 }, (_, i) => i + start - 1);

    const options = {
-      dimensionGroupNumbers: operationName === 'SUBTRACT' ? [start, end] : frameNumbers,
+      frameNumbers: operationName === 'SUBTRACT' ? [start, end - 1] : frameNumbers,
      targetVolume: computedVolume,
    };

@@ -204,6 +206,21 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
    handlePlay();
  };

+  function handleSliderChange(newValues) {
+    if (
+      newValues[0] === timePointsRangeToUseForGenerate[0] &&
+      newValues[1] === timePointsRangeToUseForGenerate[1]
+    ) {
+      return;
+    }
+
+    setTimePointsRangeToUseForGenerate(newValues);
+  }
+
+  if (!dynamicVolume || timePointsRange.length === 0) {
+    return null;
+  }
+
  return (
    <DynamicVolumeControls
      fps={frameRate}
@@ -211,16 +228,16 @@ export default function PanelGenerateImage({ servicesManager, commandsManager }:
      onPlayPauseChange={onPlayPauseChange}
      minFps={1}
      maxFps={50}
+      currentFrameIndex={timePointRendered}
      onFpsChange={handleSetFrameRate}
-      currentDimensionGroupNumber={dimensionGroupNumberRendered}
-      numDimensionGroups={dynamicVolume?.numDimensionGroups || 1}
-      onDimensionGroupChange={dimensionGroupNumber => {
-        dynamicVolume.dimensionGroupNumber = dimensionGroupNumber;
+      framesLength={timePointsRange[1]}
+      onFrameChange={timePointIndex => {
+        dynamicVolume.timePointIndex = timePointIndex;
      }}
      onGenerate={onGenerateImage}
      onDynamicClick={displayingComputed ? () => renderDynamicImage(computedDisplaySet) : null}
-      onDoubleRangeChange={setDimensionGroupRange}
-      rangeValues={dimensionGroupRange}
+      onDoubleRangeChange={handleSliderChange}
+      initialRangeValues={timePointsRangeToUseForGenerate}
    />
  );
 }
@@ -5,7 +5,7 @@ function WorkflowPanel({ servicesManager }: { servicesManager: ServicesManager }
  const ProgressDropdownWithService =
    servicesManager.services.customizationService.getCustomization(
      'progressDropdownWithServiceComponent'
-    );
+    ).component;

  return (
    <div
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "3.10.0-beta.136",
+  "version": "3.9.2",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -38,9 +38,10 @@
    "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
    "@cornerstonejs/codec-openjpeg": "^1.2.4",
    "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/dicom-image-loader": "^3.7.8",
-    "@ohif/core": "3.10.0-beta.136",
-    "@ohif/ui": "3.10.0-beta.136",
+    "@cornerstonejs/dicom-image-loader": "^2.2.20",
+    "@icr/polyseg-wasm": "^0.4.0",
+    "@ohif/core": "3.9.2",
+    "@ohif/ui": "3.9.2",
    "dcmjs": "*",
    "dicom-parser": "^1.8.21",
    "hammerjs": "^2.0.8",
@@ -49,21 +50,19 @@
    "react-dom": "^18.3.1",
    "react-resize-detector": "^10.0.1"
  },
+  "devDependencies": {
+    "lodash": "^4.17.21"
+  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.7.8",
-    "@cornerstonejs/core": "^3.7.8",
-    "@cornerstonejs/labelmap-interpolation": "^3.7.8",
-    "@cornerstonejs/polymorphic-segmentation": "^3.7.8",
-    "@cornerstonejs/tools": "^3.7.8",
-    "@itk-wasm/morphological-contour-interpolation": "1.1.0",
-    "@kitware/vtk.js": "32.12.0",
+    "@cornerstonejs/adapters": "^2.2.20",
+    "@cornerstonejs/core": "^2.2.20",
+    "@cornerstonejs/tools": "^2.2.20",
+    "@icr/polyseg-wasm": "^0.4.0",
+    "@kitware/vtk.js": "32.1.1",
    "html2canvas": "^1.4.1",
-    "lodash.compact": "^3.0.1",
    "lodash.debounce": "^4.0.8",
-    "lodash.flatten": "^4.4.0",
    "lodash.merge": "^4.6.2",
-    "lodash.zip": "^4.2.0",
    "shader-loader": "^1.3.1",
    "worker-loader": "^3.0.8"
  }
@@ -3,7 +3,7 @@ import { useResizeDetector } from 'react-resize-detector';
 import * as cs3DTools from '@cornerstonejs/tools';
 import { Enums, eventTarget, getEnabledElement } from '@cornerstonejs/core';
 import { MeasurementService } from '@ohif/core';
-import { AllInOneMenu, useViewportDialog } from '@ohif/ui';
+import { AllInOneMenu, Notification, useViewportDialog } from '@ohif/ui';
 import type { Types as csTypes } from '@cornerstonejs/core';

 import { setEnabledElement } from '../state';
@@ -15,11 +15,11 @@ import type { Types } from '@ohif/core';

 import OHIFViewportActionCorners from '../components/OHIFViewportActionCorners';
 import { getWindowLevelActionMenu } from '../components/WindowLevelActionMenu/getWindowLevelActionMenu';
+import { useAppConfig } from '@state';
 import { getViewportDataOverlaySettingsMenu } from '../components/ViewportDataOverlaySettingMenu';
 import { getViewportPresentations } from '../utils/presentations/getViewportPresentations';
 import { useSynchronizersStore } from '../stores/useSynchronizersStore';
 import ActiveViewportBehavior from '../utils/ActiveViewportBehavior';
-import { WITH_NAVIGATION } from '../services/ViewportService/CornerstoneViewportService';

 const STACK = 'stack';

@@ -88,6 +88,7 @@ const OHIFCornerstoneViewport = React.memo(
    const [scrollbarHeight, setScrollbarHeight] = useState('100px');
    const [enabledVPElement, setEnabledVPElement] = useState(null);
    const elementRef = useRef() as React.MutableRefObject<HTMLDivElement>;
+    const [appConfig] = useAppConfig();

    const {
      displaySetService,
@@ -98,7 +99,6 @@ const OHIFCornerstoneViewport = React.memo(
      segmentationService,
      cornerstoneCacheService,
      viewportActionCornersService,
-      customizationService,
    } = servicesManager.services;

    const [viewportDialogState] = useViewportDialog();
@@ -146,11 +146,6 @@ const OHIFCornerstoneViewport = React.memo(

        const { viewportId, element } = evt.detail;
        const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
-
-        if (!viewportInfo) {
-          return;
-        }
-
        setEnabledElement(viewportId, element);
        setEnabledVPElement(element);

@@ -327,54 +322,57 @@ const OHIFCornerstoneViewport = React.memo(

    // Set up the window level action menu in the viewport action corners.
    useEffect(() => {
-      const windowLevelActionMenu = customizationService.getCustomization(
-        'viewportActionMenu.windowLevelActionMenu'
-      );
-      const segmentationOverlay = customizationService.getCustomization(
-        'viewportActionMenu.segmentationOverlay'
-      );
-
-      if (windowLevelActionMenu?.enabled) {
-        viewportActionCornersService.addComponent({
-          viewportId,
-          id: 'windowLevelActionMenu',
-          component: getWindowLevelActionMenu({
-            viewportId,
-            element: elementRef.current,
-            displaySets,
-            servicesManager,
-            commandsManager,
-            location: windowLevelActionMenu.location,
-            verticalDirection: AllInOneMenu.VerticalDirection.TopToBottom,
-            horizontalDirection: AllInOneMenu.HorizontalDirection.RightToLeft,
-          }),
-          location: windowLevelActionMenu.location,
-        });
+      // Doing an === check here because the default config value when not set is true
+      if (appConfig.addWindowLevelActionMenu === false) {
+        return;
      }

-      if (segmentationOverlay?.enabled) {
-        viewportActionCornersService.addComponent({
+      const location = viewportActionCornersService.LOCATIONS.topRight;
+
+      // TODO: In the future we should consider using the customization service
+      // to determine if and in which corner various action components should go.
+      viewportActionCornersService.addComponent({
+        viewportId,
+        id: 'windowLevelActionMenu',
+        component: getWindowLevelActionMenu({
          viewportId,
-          id: 'segmentation',
-          component: getViewportDataOverlaySettingsMenu({
-            viewportId,
-            element: elementRef.current,
-            displaySets,
-            servicesManager,
-            commandsManager,
-            location: segmentationOverlay.location,
-          }),
-          location: segmentationOverlay.location,
-        });
-      }
-    }, [displaySets, viewportId, viewportActionCornersService, servicesManager, commandsManager]);
+          element: elementRef.current,
+          displaySets,
+          servicesManager,
+          commandsManager,
+          location,
+          verticalDirection: AllInOneMenu.VerticalDirection.TopToBottom,
+          horizontalDirection: AllInOneMenu.HorizontalDirection.RightToLeft,
+        }),
+        location,
+      });
+
+      viewportActionCornersService.addComponent({
+        viewportId,
+        id: 'segmentation',
+        component: getViewportDataOverlaySettingsMenu({
+          viewportId,
+          element: elementRef.current,
+          displaySets,
+          servicesManager,
+          commandsManager,
+          location,
+        }),
+        location,
+      });
+    }, [
+      displaySets,
+      viewportId,
+      viewportActionCornersService,
+      servicesManager,
+      commandsManager,
+      appConfig,
+    ]);

    const { ref: resizeRef } = useResizeDetector({
      onResize,
    });

-    const Notification = customizationService.getCustomization('ui.notificationComponent');
-
    return (
      <React.Fragment>
        <div className="viewport-wrapper">
@@ -504,16 +502,12 @@ function _jumpToMeasurement(measurement, targetElementRef, viewportId, servicesM
    const viewport = enabledElement.viewport as csTypes.IStackViewport | csTypes.IVolumeViewport;

    const { metadata } = measurement;
-    if (!viewport.isReferenceViewable(metadata, WITH_NAVIGATION)) {
+    if (!viewport.isReferenceViewable(metadata, { withNavigation: true, withOrientation: true })) {
      console.log("Reference isn't viewable, postponing until updated");
      return;
    }

-    try {
-      viewport.setViewReference(metadata);
-    } catch (e) {
-      console.warn('Unable to apply', metadata, e);
-    }
+    viewport.setViewReference(metadata);

    cs3DTools.annotation.selection.setAnnotationSelected(measurement.uid);
    // Jump to measurement consumed, remove.
@@ -5,14 +5,12 @@ import { metaData, Enums, utilities } from '@cornerstonejs/core';
 import type { ImageSliceData } from '@cornerstonejs/core/types';
 import { ViewportOverlay } from '@ohif/ui';
 import type { InstanceMetadata } from '@ohif/core/src/types';
-import { formatDICOMDate, formatDICOMTime, formatNumberPrecision } from './utils';
-import { utils } from '@ohif/core';
+import { formatPN, formatDICOMDate, formatDICOMTime, formatNumberPrecision } from './utils';
 import { StackViewportData, VolumeViewportData } from '../../types/CornerstoneCacheService';

 import './CustomizableViewportOverlay.css';

 const EPSILON = 1e-4;
-const { formatPN } = utils;

 type ViewportData = StackViewportData | VolumeViewportData;

@@ -47,6 +45,80 @@ const OverlayItemComponents = {
  'ohif.overlayItem.instanceNumber': InstanceNumberOverlayItem,
 };

+const studyDateItem = {
+  id: 'StudyDate',
+  customizationType: 'ohif.overlayItem',
+  label: '',
+  title: 'Study date',
+  condition: ({ referenceInstance }) => referenceInstance?.StudyDate,
+  contentF: ({ referenceInstance, formatters: { formatDate } }) =>
+    formatDate(referenceInstance.StudyDate),
+};
+
+const seriesDescriptionItem = {
+  id: 'SeriesDescription',
+  customizationType: 'ohif.overlayItem',
+  label: '',
+  title: 'Series description',
+  condition: ({ referenceInstance }) => {
+    return referenceInstance && referenceInstance.SeriesDescription;
+  },
+  contentF: ({ referenceInstance }) => referenceInstance.SeriesDescription,
+};
+
+const topLeftItems = {
+  id: 'cornerstoneOverlayTopLeft',
+  items: [studyDateItem, seriesDescriptionItem],
+};
+
+const topRightItems = { id: 'cornerstoneOverlayTopRight', items: [] };
+
+const bottomLeftItems = {
+  id: 'cornerstoneOverlayBottomLeft',
+  items: [
+    {
+      id: 'WindowLevel',
+      customizationType: 'ohif.overlayItem.windowLevel',
+    },
+    {
+      id: 'ZoomLevel',
+      customizationType: 'ohif.overlayItem.zoomLevel',
+      condition: props => {
+        const activeToolName = props.toolGroupService.getActiveToolForViewport(props.viewportId);
+        return activeToolName === 'Zoom';
+      },
+    },
+  ],
+};
+
+const bottomRightItems = {
+  id: 'cornerstoneOverlayBottomRight',
+  items: [
+    {
+      id: 'InstanceNumber',
+      customizationType: 'ohif.overlayItem.instanceNumber',
+    },
+  ],
+};
+
+/**
+ * The @ohif/cornerstoneOverlay is a default value for a customization
+ * for the cornerstone overlays.  The intent is to allow it to be extended
+ * without needing to re-write the individual overlays by using the append
+ * mechanism.  Individual attributes can be modified individually without
+ * affecting the other items by using the append as well, with position
+ * based replacement.
+ * This is used as a default in the getCustomizationModule so that it
+ * is available early for additional customization extensions.
+ */
+const CornerstoneOverlay = {
+  id: '@ohif/cornerstoneOverlay',
+  topLeftItems,
+  topRightItems,
+  bottomLeftItems,
+  bottomRightItems,
+};
+
 /**
 * Customizable Viewport Overlay
 */
@@ -69,18 +141,26 @@ function CustomizableViewportOverlay({
  const [scale, setScale] = useState(1);
  const { imageIndex } = imageSliceData;

+  // The new customization is 'cornerstoneOverlay', with an append or replace
+  // on the individual items rather than defining individual items.
+  const cornerstoneOverlay = customizationService.getCustomization('@ohif/cornerstoneOverlay');
+
  // Historical usage defined the overlays as separate items due to lack of
  // append functionality.  This code enables the historical usage, but
  // the recommended functionality is to append to the default values in
  // cornerstoneOverlay rather than defining individual items.
-  const topLeftCustomization = customizationService.getCustomization('viewportOverlay.topLeft');
-  const topRightCustomization = customizationService.getCustomization('viewportOverlay.topRight');
-  const bottomLeftCustomization = customizationService.getCustomization(
-    'viewportOverlay.bottomLeft'
-  );
-  const bottomRightCustomization = customizationService.getCustomization(
-    'viewportOverlay.bottomRight'
-  );
+  const topLeftCustomization =
+    customizationService.getCustomization('cornerstoneOverlayTopLeft') ||
+    cornerstoneOverlay?.topLeftItems;
+  const topRightCustomization =
+    customizationService.getCustomization('cornerstoneOverlayTopRight') ||
+    cornerstoneOverlay?.topRightItems;
+  const bottomLeftCustomization =
+    customizationService.getCustomization('cornerstoneOverlayBottomLeft') ||
+    cornerstoneOverlay?.bottomLeftItems;
+  const bottomRightCustomization =
+    customizationService.getCustomization('cornerstoneOverlayBottomRight') ||
+    cornerstoneOverlay?.bottomRightItems;

  const instanceNumber = useMemo(
    () =>
@@ -182,8 +262,8 @@ function CustomizableViewportOverlay({
        return null;
      }

-      const { inheritsFrom } = item;
-      const OverlayItemComponent = OverlayItemComponents[inheritsFrom];
+      const { customizationType } = item;
+      const OverlayItemComponent = OverlayItemComponents[customizationType];

      if (OverlayItemComponent) {
        return <OverlayItemComponent {...overlayItemProps} />;
@@ -211,6 +291,10 @@ function CustomizableViewportOverlay({

  const getContent = useCallback(
    (customization, keyPrefix) => {
+      if (!customization?.items) {
+        return null;
+      }
+      const { items } = customization;
      const props = {
        ...displaySetProps,
        formatters: { formatDate: formatDICOMDate },
@@ -223,7 +307,7 @@ function CustomizableViewportOverlay({

      return (
        <>
-          {customization.map((item, index) => (
+          {items.map((item, index) => (
            <div key={`${keyPrefix}_${index}`}>
              {((!item?.condition || item.condition(props)) && _renderOverlayItem(item, props)) ||
                null}
@@ -447,4 +531,4 @@ CustomizableViewportOverlay.propTypes = {

 export default CustomizableViewportOverlay;

-export { CustomizableViewportOverlay };
+export { CustomizableViewportOverlay, CornerstoneOverlay };
@@ -44,17 +44,13 @@ function CornerstoneImageScrollbar({
      return;
    }

-    try {
-      const imageIndex = viewport.getCurrentImageIdIndex();
-      const numberOfSlices = viewport.getNumberOfSlices();
+    const imageIndex = viewport.getCurrentImageIdIndex();
+    const numberOfSlices = viewport.getNumberOfSlices();

-      setImageSliceData({
-        imageIndex: imageIndex,
-        numberOfSlices,
-      });
-    } catch (error) {
-      console.warn(error);
-    }
+    setImageSliceData({
+      imageIndex: imageIndex,
+      numberOfSlices,
+    });
  }, [viewportId, viewportData]);

  useEffect(() => {
@@ -52,6 +52,31 @@ export function formatDICOMTime(time, strFormat = 'HH:mm:ss') {
  return moment(time, 'HH:mm:ss').format(strFormat);
 }

+/**
+ * Formats a patient name for display purposes
+ *
+ * @param {string} name
+ * @returns {string} formatted name.
+ */
+export function formatPN(name) {
+  if (!name) {
+    return '';
+  }
+  if (typeof name === 'object') {
+    name = name.Alphabetic;
+    if (!name) {
+      return '';
+    }
+  }
+
+  const cleaned = name
+    .split('^')
+    .filter(s => !!s)
+    .join(', ')
+    .trim();
+  return cleaned === ',' || cleaned === '' ? '' : cleaned;
+}
+
 /**
 * Gets compression type
 *
@@ -4,66 +4,40 @@ import {
  VolumeViewport,
  utilities as csUtils,
  Types as CoreTypes,
-  cache,
  BaseVolumeViewport,
-  triggerEvent,
-  eventTarget,
 } from '@cornerstonejs/core';
 import {
  ToolGroupManager,
  Enums,
  utilities as cstUtils,
  ReferenceLinesTool,
-  annotation,
-  Types as ToolTypes,
 } from '@cornerstonejs/tools';
-import * as cornerstoneTools from '@cornerstonejs/tools';
-import * as labelmapInterpolation from '@cornerstonejs/labelmap-interpolation';

-import { Types as OhifTypes, utils } from '@ohif/core';
-import i18n from '@ohif/i18n';
+import { Types as OhifTypes } from '@ohif/core';
 import {
-  callInputDialogAutoComplete,
+  callLabelAutocompleteDialog,
+  showLabelAnnotationPopup,
  createReportAsync,
-  colorPickerDialog,
  callInputDialog,
+  colorPickerDialog,
 } from '@ohif/extension-default';
 import { vec3, mat4 } from 'gl-matrix';
+
+import CornerstoneViewportDownloadForm from './utils/CornerstoneViewportDownloadForm';
 import toggleImageSliceSync from './utils/imageSliceSync/toggleImageSliceSync';
 import { getFirstAnnotationSelected } from './utils/measurementServiceMappings/utils/selection';
 import getActiveViewportEnabledElement from './utils/getActiveViewportEnabledElement';
 import toggleVOISliceSync from './utils/toggleVOISliceSync';
 import { usePositionPresentationStore, useSegmentationPresentationStore } from './stores';
-import { toolNames } from './initCornerstoneTools';
-import CornerstoneViewportDownloadForm from './utils/CornerstoneViewportDownloadForm';
-import { updateSegmentBidirectionalStats } from './utils/updateSegmentationStats';
-import { generateSegmentationCSVReport } from './utils/generateSegmentationCSVReport';

-const { DefaultHistoryMemo } = csUtils.HistoryMemo;
 const toggleSyncFunctions = {
  imageSlice: toggleImageSliceSync,
  voi: toggleVOISliceSync,
 };

-const getLabelmapTools = ({ toolGroupService }) => {
-  const labelmapTools = [];
-  const toolGroupIds = toolGroupService.getToolGroupIds();
-  toolGroupIds.forEach(toolGroupId => {
-    const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId);
-    const tools = toolGroup.getToolInstances();
-    // tools is an object with toolName as the key and tool as the value
-    Object.keys(tools).forEach(toolName => {
-      const tool = tools[toolName];
-      if (tool instanceof cornerstoneTools.LabelmapBaseTool) {
-        labelmapTools.push(tool);
-      }
-    });
-  });
-  return labelmapTools;
-};
-
 function commandsModule({
  servicesManager,
+  extensionManager,
  commandsManager,
 }: OhifTypes.Extensions.ExtensionParams): OhifTypes.Extensions.CommandsModule {
  const {
@@ -78,10 +52,7 @@ function commandsModule({
    colorbarService,
    hangingProtocolService,
    syncGroupService,
-    toolbarService,
-    segmentationService,
-    displaySetService,
-  } = servicesManager.services as AppTypes.Services;
+  } = servicesManager.services;

  const { measurementServiceSource } = this;

@@ -94,75 +65,7 @@ function commandsModule({
    return toolGroupService.getToolGroupForViewport(viewport.id);
  }

-  function _getActiveSegmentationInfo() {
-    const viewportId = viewportGridService.getActiveViewportId();
-    const activeSegmentation = segmentationService.getActiveSegmentation(viewportId);
-    const segmentationId = activeSegmentation?.segmentationId;
-    const activeSegmentIndex = segmentationService.getActiveSegment(viewportId).segmentIndex;
-
-    return {
-      segmentationId,
-      segmentIndex: activeSegmentIndex,
-    };
-  }
-
  const actions = {
-    runSegmentBidirectional: async ({ segmentationId, segmentIndex } = {}) => {
-      // Get active segmentation if not specified
-      const targetSegmentation =
-        segmentationId && segmentIndex
-          ? { segmentationId, segmentIndex }
-          : _getActiveSegmentationInfo();
-
-      const { segmentationId: targetId, segmentIndex: targetIndex } = targetSegmentation;
-
-      // Get bidirectional measurement data
-      const bidirectionalData = await cstUtils.segmentation.getSegmentLargestBidirectional({
-        segmentationId: targetId,
-        segmentIndices: [targetIndex],
-      });
-
-      const activeViewportId = viewportGridService.getActiveViewportId();
-
-      // Process each bidirectional measurement
-      bidirectionalData.forEach(measurement => {
-        const { segmentIndex, majorAxis, minorAxis } = measurement;
-
-        // Create annotation
-        const annotation = cornerstoneTools.SegmentBidirectionalTool.hydrate(
-          activeViewportId,
-          [majorAxis, minorAxis],
-          {
-            segmentIndex,
-            segmentationId: targetId,
-          }
-        );
-
-        // Update segmentation stats
-        const updatedSegmentation = updateSegmentBidirectionalStats({
-          segmentationId: targetId,
-          segmentIndex: targetIndex,
-          bidirectionalData: measurement,
-          segmentationService,
-          annotation,
-        });
-
-        // Save changes if needed
-        if (updatedSegmentation) {
-          segmentationService.addOrUpdateSegmentation({
-            segmentationId: targetId,
-            segments: updatedSegmentation.segments,
-          });
-        }
-      });
-    },
-    interpolateLabelmap: () => {
-      const { segmentationId, segmentIndex } = _getActiveSegmentationInfo();
-      labelmapInterpolation.interpolate({
-        segmentationId,
-        segmentIndex,
-      });
-    },
    /**
     * Generates the selector props for the context menu, specific to
     * the cornerstone viewport, and then runs the context menu.
@@ -217,11 +120,7 @@ function commandsModule({
        type,
      });
    },
-    updateStoredPositionPresentation: ({
-      viewportId,
-      displaySetInstanceUID,
-      referencedImageId,
-    }) => {
+    updateStoredPositionPresentation: ({ viewportId, displaySetInstanceUID }) => {
      const presentations = cornerstoneViewportService.getPresentations(viewportId);
      const { positionPresentationStore, setPositionPresentation, getPositionPresentationId } =
        usePositionPresentationStore.getState();
@@ -233,16 +132,11 @@ function commandsModule({
      )?.[0];

      if (previousReferencedDisplaySetStoreKey) {
-        const presentationData = referencedImageId
-          ? {
-              ...presentations.positionPresentation,
-              viewReference: {
-                referencedImageId,
-              },
-            }
-          : presentations.positionPresentation;
+        setPositionPresentation(
+          previousReferencedDisplaySetStoreKey,
+          presentations.positionPresentation
+        );

-        setPositionPresentation(previousReferencedDisplaySetStoreKey, presentationData);
        return;
      }

@@ -292,56 +186,26 @@ function commandsModule({
        measurementServiceSource.remove(uid);
      }
    },
-    /**
-     * Common logic for handling measurement label updates through dialog
-     * @param uid - measurement uid
-     * @returns Promise that resolves when the label is updated
-     */
-    _handleMeasurementLabelDialog: async uid => {
-      const labelConfig = customizationService.getCustomization('measurementLabels');
-      const renderContent = customizationService.getCustomization('ui.labellingComponent');
-      const measurement = measurementService.getMeasurement(uid);
-
-      if (!measurement) {
-        console.debug('No measurement found for label editing');
-        return;
-      }
-
-      if (!labelConfig) {
-        const label = await callInputDialog({
-          uiDialogService,
-          title: 'Edit Measurement Label',
-          placeholder: measurement.label || 'Enter new label',
-          defaultValue: measurement.label,
-        });
-
-        if (label !== undefined && label !== null) {
-          measurementService.update(uid, { ...measurement, label }, true);
-        }
-        return;
-      }
-
-      const val = await callInputDialogAutoComplete({
-        measurement,
-        uiDialogService,
-        labelConfig,
-        renderContent,
-      });
-
-      if (val !== undefined && val !== null) {
-        measurementService.update(uid, { ...val }, true);
-      }
-    },
    /**
     * Show the measurement labelling input dialog and update the label
     * on the measurement with a response if not cancelled.
     */
-    setMeasurementLabel: async ({ uid }) => {
-      await actions._handleMeasurementLabelDialog(uid);
-    },
-    renameMeasurement: async ({ uid }) => {
-      await actions._handleMeasurementLabelDialog(uid);
+    setMeasurementLabel: ({ uid }) => {
+      const labelConfig = customizationService.get('measurementLabels');
+      const measurement = measurementService.getMeasurement(uid);
+      showLabelAnnotationPopup(measurement, uiDialogService, labelConfig).then(
+        (val: Map<any, any>) => {
+          measurementService.update(
+            uid,
+            {
+              ...val,
+            },
+            true
+          );
+        }
+      );
    },
+
    /**
     *
     * @param props - containing the updates to apply
@@ -353,8 +217,6 @@ function commandsModule({
     *       * CodingSchemeDesignator - the issue of the code value
     *       * CodeMeaning - the text value shown to the user
     *       * ref - a string reference in the form `<designator>:<codeValue>`
-     *       * type - defaulting to 'finding'.  Will replace other codes of same type
-     *       * style - a styling object to use
     *       * Other fields
     *     Note it is a valid option to remove the finding or site values by
     *     supplying null for the code.
@@ -370,12 +232,7 @@ function commandsModule({
     */
    updateMeasurement: props => {
      const { code, uid, textLabel, label } = props;
-      let { style } = props;
      const measurement = measurementService.getMeasurement(uid);
-      if (!measurement) {
-        console.warn('No measurement found to update', uid);
-        return;
-      }
      const updatedMeasurement = {
        ...measurement,
      };
@@ -394,6 +251,7 @@ function commandsModule({
          code.CodingSchemeDesignator = code.ref.substring(0, split);
        }
        updatedMeasurement[measurementKey] = code;
+        // TODO - remove this line once the measurements table customizations are in
        if (measurementKey !== 'finding') {
          if (updatedMeasurement.findingSites) {
            updatedMeasurement.findingSites = updatedMeasurement.findingSites.filter(
@@ -405,108 +263,9 @@ function commandsModule({
          }
        }
      }
-
-      style ||= updatedMeasurement.finding?.style;
-      style ||= updatedMeasurement.findingSites?.find(site => site?.style)?.style;
-
-      if (style) {
-        // Reset the selected values to preserve appearance on selection
-        style.lineDashSelected ||= style.lineDash;
-        annotation.config.style.setAnnotationStyles(measurement.uid, style);
-
-        // this is a bit ugly, but given the underlying behavior, this is how it needs to work.
-        switch (measurement.toolName) {
-          case toolNames.PlanarFreehandROI: {
-            const targetAnnotation = annotation.state.getAnnotation(measurement.uid);
-            targetAnnotation.data.isOpenUShapeContour = !!style.isOpenUShapeContour;
-            break;
-          }
-          default:
-            break;
-        }
-      }
      measurementService.update(updatedMeasurement.uid, updatedMeasurement, true);
    },

-    /**
-     * Jumps to the specified (by uid) measurement in the active viewport.
-     * Also marks any provided display measurements isActive value
-     */
-    jumpToMeasurement: ({ uid, displayMeasurements = [] }) => {
-      measurementService.jumpToMeasurement(viewportGridService.getActiveViewportId(), uid);
-      for (const measurement of displayMeasurements) {
-        measurement.isActive = measurement.uid === uid;
-      }
-    },
-
-    removeMeasurement: ({ uid }) => {
-      if (Array.isArray(uid)) {
-        measurementService.removeMany(uid);
-      } else {
-        measurementService.remove(uid);
-      }
-    },
-
-    toggleLockMeasurement: ({ uid }) => {
-      measurementService.toggleLockMeasurement(uid);
-    },
-
-    toggleVisibilityMeasurement: ({ uid, items, visibility }) => {
-      if (visibility === undefined && items?.length) {
-        visibility = !items[0].isVisible;
-      }
-      if (Array.isArray(uid)) {
-        measurementService.toggleVisibilityMeasurementMany(uid, visibility);
-      } else {
-        measurementService.toggleVisibilityMeasurement(uid, visibility);
-      }
-    },
-
-    /**
-     * Download the CSV report for the measurements.
-     */
-    downloadCSVMeasurementsReport: ({ measurementFilter }) => {
-      utils.downloadCSVReport(measurementService.getMeasurements(measurementFilter));
-    },
-
-    downloadCSVSegmentationReport: ({ segmentationId }) => {
-      const segmentation = segmentationService.getSegmentation(segmentationId);
-      const cachedStats = segmentation.cachedStats;
-
-      const { representationData } = segmentation;
-      const { Labelmap } = representationData;
-      const { referencedImageIds } = Labelmap;
-
-      const firstImageId = referencedImageIds[0];
-
-      // find displaySet for firstImageId
-      const displaySet = displaySetService
-        .getActiveDisplaySets()
-        .find(ds => ds.imageIds?.some(i => i === firstImageId));
-
-      const {
-        SeriesNumber,
-        SeriesInstanceUID,
-        StudyInstanceUID,
-        SeriesDate,
-        SeriesTime,
-        SeriesDescription,
-      } = displaySet;
-
-      const additionalInfo = {
-        reference: {
-          SeriesNumber,
-          SeriesInstanceUID,
-          StudyInstanceUID,
-          SeriesDate,
-          SeriesTime,
-          SeriesDescription,
-        },
-      };
-
-      generateSegmentationCSVReport(segmentation, additionalInfo);
-    },
-
    // Retrieve value commands
    getActiveViewportEnabledElement: _getActiveViewportEnabledElement,

@@ -519,18 +278,10 @@ function commandsModule({

      viewportGridService.setActiveViewportId(viewportId);
    },
-    arrowTextCallback: async ({ callback }) => {
-      const labelConfig = customizationService.getCustomization('measurementLabels');
-      const renderContent = customizationService.getCustomization('ui.labellingComponent');
-
-      const value = await callInputDialogAutoComplete({
-        uiDialogService,
-        labelConfig,
-        renderContent,
-      });
-      callback?.(value);
+    arrowTextCallback: ({ callback, data, uid }) => {
+      const labelConfig = customizationService.get('measurementLabels');
+      callLabelAutocompleteDialog(uiDialogService, callback, {}, labelConfig);
    },
-
    toggleCine: () => {
      const { viewports } = viewportGridService.getState();
      const { isCineEnabled } = cineService.getState();
@@ -578,37 +329,6 @@ function commandsModule({

      actions.setViewportWindowLevel({ ...props, viewportId });
    },
-    setWindowLevelPreset: ({ presetName, presetIndex }) => {
-      const windowLevelPresets = customizationService.getCustomization(
-        'cornerstone.windowLevelPresets'
-      );
-
-      const activeViewport = viewportGridService.getActiveViewportId();
-      const viewport = cornerstoneViewportService.getCornerstoneViewport(activeViewport);
-      const metadata = viewport.getImageData().metadata;
-
-      const modality = metadata.Modality;
-
-      if (!modality) {
-        return;
-      }
-
-      const windowLevelPresetForModality = windowLevelPresets[modality];
-
-      if (!windowLevelPresetForModality) {
-        return;
-      }
-
-      const windowLevelPreset =
-        windowLevelPresetForModality[presetName] ??
-        Object.values(windowLevelPresetForModality)[presetIndex];
-
-      actions.setViewportWindowLevel({
-        viewportId: activeViewport,
-        window: windowLevelPreset.window,
-        level: windowLevelPreset.level,
-      });
-    },
    setToolEnabled: ({ toolName, toggle, toolGroupId }) => {
      const { viewports } = viewportGridService.getState();

@@ -719,7 +439,6 @@ function commandsModule({
        ],
      });
    },
-    // capture viewport
    showDownloadViewportModal: () => {
      const { activeViewportId } = viewportGridService.getState();

@@ -741,9 +460,10 @@ function commandsModule({
          title: 'Download High Quality Image',
          contentProps: {
            activeViewportId,
+            onClose: uiModalService.hide,
            cornerstoneViewportService,
          },
-          containerClassName: 'max-w-4xl p-4',
+          containerDimensions: 'w-[70%] max-w-[900px]',
        });
      }
    },
@@ -766,7 +486,7 @@ function commandsModule({
      } else if (viewport.getRotation !== undefined) {
        const presentation = viewport.getViewPresentation();
        const { rotation: currentRotation } = presentation;
-        const newRotation = (currentRotation + rotation + 360) % 360;
+        const newRotation = (currentRotation + rotation) % 360;
        viewport.setViewPresentation({ rotation: newRotation });
        viewport.render();
      }
@@ -886,17 +606,15 @@ function commandsModule({
      const options = { imageIndex: jumpIndex };
      csUtils.jumpToSlice(viewport.element, options);
    },
-    scroll: (options: ToolTypes.ScrollOptions) => {
+    scroll: ({ direction }) => {
      const enabledElement = _getActiveViewportEnabledElement();
-      // Allow either or direction for consistency in scroll implementation
-      options.delta ??= options.direction || 1;
-      options.direction ??= options.delta;

      if (!enabledElement) {
        return;
      }

      const { viewport } = enabledElement;
+      const options = { delta: direction };

      csUtils.scroll(viewport, options);
    },
@@ -937,12 +655,7 @@ function commandsModule({
          displaySetInstanceUID = viewports.get(viewportId)?.displaySetInstanceUIDs[0];
        }

-        // ToDo: Find a better way of obtaining the volumeId that corresponds to the displaySetInstanceUID
-        const volumeId =
-          viewport
-            .getAllVolumeIds()
-            .find((_volumeId: string) => _volumeId.includes(displaySetInstanceUID)) ??
-          viewport.getVolumeId();
+        const volumeId = viewport.getVolumeId();
        viewport.setProperties({ colormap }, volumeId);
      }

@@ -1189,7 +902,7 @@ function commandsModule({
          segments: options.createInitialSegment
            ? {
                1: {
-                  label: `${i18n.t('Segment')} 1`,
+                  label: 'Segment 1',
                  active: true,
                },
              }
@@ -1232,12 +945,7 @@ function commandsModule({
     * @param props.segmentIndex - The index of the segment to activate
     */
    setActiveSegmentAndCenterCommand: ({ segmentationId, segmentIndex }) => {
-      const { segmentationService, viewportGridService } = servicesManager.services;
-      // set both active segmentation and active segment
-      segmentationService.setActiveSegmentation(
-        viewportGridService.getActiveViewportId(),
-        segmentationId
-      );
+      const { segmentationService } = servicesManager.services;
      segmentationService.setActiveSegment(segmentationId, segmentIndex);
      segmentationService.jumpToSegmentCenter(segmentationId, segmentIndex);
    },
@@ -1296,12 +1004,14 @@ function commandsModule({
     */
    storeSegmentationCommand: async ({ segmentationId }) => {
      const { segmentationService, viewportGridService } = servicesManager.services;
+      const datasources = extensionManager.getActiveDataSource();

      const displaySetInstanceUIDs = await createReportAsync({
        servicesManager,
        getReport: () =>
          commandsManager.runCommand('storeSegmentation', {
            segmentationId,
+            dataSource: datasources[0],
          }),
        reportType: 'Segmentation',
      });
@@ -1427,7 +1137,7 @@ function commandsModule({
      segmentationService.setStyle({ type }, { fillAlphaInactive: value });
    },

-    editSegmentLabel: async ({ segmentationId, segmentIndex }) => {
+    editSegmentLabel: ({ segmentationId, segmentIndex }) => {
      const { segmentationService, uiDialogService } = servicesManager.services;
      const segmentation = segmentationService.getSegmentation(segmentationId);

@@ -1436,14 +1146,19 @@ function commandsModule({
      }

      const segment = segmentation.segments[segmentIndex];
+      const { label } = segment;
+
+      const callback = (label, actionId) => {
+        if (label === '') {
+          return;
+        }

-      callInputDialog({
-        uiDialogService,
-        title: 'Edit Segment Label',
-        placeholder: 'Enter new label',
-        defaultValue: segment.label,
-      }).then(label => {
        segmentationService.setSegmentLabel(segmentationId, segmentIndex, label);
+      };
+
+      callInputDialog(uiDialogService, label, callback, false, {
+        dialogTitle: 'Edit Segment Label',
+        inputLabel: 'Enter new label',
      });
    },

@@ -1457,13 +1172,17 @@ function commandsModule({

      const { label } = segmentation;

-      callInputDialog({
-        uiDialogService,
-        title: 'Edit Segmentation Label',
-        placeholder: 'Enter new label',
-        defaultValue: label,
-      }).then(label => {
+      const callback = (label, actionId) => {
+        if (label === '') {
+          return;
+        }
+
        segmentationService.addOrUpdateSegmentation({ segmentationId, label });
+      };
+
+      callInputDialog(uiDialogService, label, callback, false, {
+        dialogTitle: 'Edit Segmentation Label',
+        inputLabel: 'Enter new label',
      });
    },

@@ -1480,16 +1199,13 @@ function commandsModule({
        a: color[3] / 255.0,
      };

-      uiDialogService.show({
-        content: colorPickerDialog,
-        title: 'Segment Color',
-        contentProps: {
-          value: rgbaColor,
-          onSave: newRgbaColor => {
-            const color = [newRgbaColor.r, newRgbaColor.g, newRgbaColor.b, newRgbaColor.a * 255.0];
-            segmentationService.setSegmentColor(viewportId, segmentationId, segmentIndex, color);
-          },
-        },
+      colorPickerDialog(uiDialogService, rgbaColor, (newRgbaColor, actionId) => {
+        if (actionId === 'cancel') {
+          return;
+        }
+
+        const color = [newRgbaColor.r, newRgbaColor.g, newRgbaColor.b, newRgbaColor.a * 255.0];
+        segmentationService.setSegmentColor(viewportId, segmentationId, segmentIndex, color);
      });
    },

@@ -1499,54 +1215,6 @@ function commandsModule({
        viewportGridService.getActiveViewportId()
      );
    },
-
-    deleteActiveAnnotation: () => {
-      const activeAnnotationsUID = cornerstoneTools.annotation.selection.getAnnotationsSelected();
-      activeAnnotationsUID.forEach(activeAnnotationUID => {
-        measurementService.remove(activeAnnotationUID);
-      });
-    },
-    undo: () => {
-      DefaultHistoryMemo.undo();
-    },
-    redo: () => {
-      DefaultHistoryMemo.redo();
-    },
-    toggleSegmentPreviewEdit: ({ toggle }) => {
-      const labelmapTools = getLabelmapTools({ toolGroupService });
-      labelmapTools.forEach(tool => {
-        tool.configuration = {
-          ...tool.configuration,
-          preview: {
-            ...tool.configuration.preview,
-            enabled: toggle,
-          },
-        };
-      });
-    },
-    toggleSegmentSelect: ({ toggle }) => {
-      const toolGroupIds = toolGroupService.getToolGroupIds();
-      toolGroupIds.forEach(toolGroupId => {
-        const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId);
-        if (toggle) {
-          toolGroup.setToolActive(cornerstoneTools.SegmentSelectTool.toolName);
-        } else {
-          toolGroup.setToolDisabled(cornerstoneTools.SegmentSelectTool.toolName);
-        }
-      });
-    },
-    acceptPreview: () => {
-      const labelmapTools = getLabelmapTools({ toolGroupService });
-      labelmapTools.forEach(tool => {
-        tool.acceptPreview();
-      });
-    },
-    rejectPreview: () => {
-      const labelmapTools = getLabelmapTools({ toolGroupService });
-      labelmapTools.forEach(tool => {
-        tool.rejectPreview();
-      });
-    },
  };

  const definitions = {
@@ -1581,36 +1249,15 @@ function commandsModule({
    setMeasurementLabel: {
      commandFn: actions.setMeasurementLabel,
    },
-    renameMeasurement: {
-      commandFn: actions.renameMeasurement,
-    },
    updateMeasurement: {
      commandFn: actions.updateMeasurement,
    },
-    jumpToMeasurement: {
-      commandFn: actions.jumpToMeasurement,
-    },
-    removeMeasurement: {
-      commandFn: actions.removeMeasurement,
-    },
-    toggleLockMeasurement: {
-      commandFn: actions.toggleLockMeasurement,
-    },
-    toggleVisibilityMeasurement: {
-      commandFn: actions.toggleVisibilityMeasurement,
-    },
-    downloadCSVMeasurementsReport: {
-      commandFn: actions.downloadCSVMeasurementsReport,
-    },
    setViewportWindowLevel: {
      commandFn: actions.setViewportWindowLevel,
    },
    setWindowLevel: {
      commandFn: actions.setWindowLevel,
    },
-    setWindowLevelPreset: {
-      commandFn: actions.setWindowLevelPreset,
-    },
    setToolActive: {
      commandFn: actions.setToolActive,
    },
@@ -1807,18 +1454,6 @@ function commandsModule({
    getRenderInactiveSegmentations: {
      commandFn: actions.getRenderInactiveSegmentations,
    },
-    deleteActiveAnnotation: {
-      commandFn: actions.deleteActiveAnnotation,
-    },
-    undo: actions.undo,
-    redo: actions.redo,
-    interpolateLabelmap: actions.interpolateLabelmap,
-    runSegmentBidirectional: actions.runSegmentBidirectional,
-    downloadCSVSegmentationReport: actions.downloadCSVSegmentationReport,
-    toggleSegmentPreviewEdit: actions.toggleSegmentPreviewEdit,
-    toggleSegmentSelect: actions.toggleSegmentSelect,
-    acceptPreview: actions.acceptPreview,
-    rejectPreview: actions.rejectPreview,
  };

  return {
@@ -1,192 +0,0 @@
-import React from 'react';
-import { useSystem } from '@ohif/core';
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next';
-import { ChevronDownIcon } from '@radix-ui/react-icons';
-
-export type AccordionGrouping = {
-  [name: string]: unknown;
-};
-
-export type AccordionGroupProps = {
-  grouping: AccordionGrouping;
-};
-
-/**
- * Searches for the required type from the provided allChildren list and
- * renders them.
- */
-export const CloneChildren = props => {
-  const { group, allChildren, children, childType, defaultTypes } = props;
-
-  const subType = group?.subType;
-
-  for (const child of allChildren) {
-    if (subType && child.props?.subType !== subType) {
-      continue;
-    }
-    if (childType && child.type === childType) {
-      return React.cloneElement(child, { ...props, children: child.props.children });
-    }
-    if (defaultTypes?.indexOf(child.type) === -1) {
-      return childType({ ...props, children: child });
-    }
-  }
-
-  if (!children) {
-    throw new Error(`No children defined for ${props.name} CloneChildren in group ${group?.name}`);
-  }
-  return React.cloneElement(children, props);
-};
-
-/** Used to exclude defaults */
-const DEFAULT_TYPES = [GroupAccordion, Content, Trigger];
-
-/**
- * An AccordionGroup is a component that splits a set of items into different
- * groups according to a set of grouping rules.  It then puts the groups
- * into a set of accordion folds selected from the body of the accordion group,
- * looking for matching trigger/content sections according to the type definition
- * in the group with first one found being used.
- *
- * This design allows for easy customization of the component by declaring grouping
- * functions with default grouping setups and then only overriding the specific
- * children needing to be changed.  See the PanelMeasurement for some example
- * possibilities of how to modify the default grouping, or the test-extension
- * measurements panel for a practical, working example.
- */
-export function AccordionGroup(props) {
-  const { grouping, items, children, sourceChildren, type } = props;
-  const childProps = useSystem();
-  let defaultValue = props.defaultValue;
-  const groups = grouping.groupingFunction(items, grouping, childProps);
-
-  if (!defaultValue) {
-    const defaultGroup = groups.values().find(group => group.isSelected);
-    defaultValue = defaultGroup?.key || defaultGroup?.title;
-  }
-
-  const valueArr =
-    (Array.isArray(defaultValue) && defaultValue) || (defaultValue && [defaultValue]) || [];
-  const sourceChildrenArr = sourceChildren ? React.Children.toArray(sourceChildren) : [];
-  const childrenArr = children ? React.Children.toArray(children) : [];
-  const allChildren = sourceChildrenArr.concat(childrenArr);
-
-  return (
-    <CloneChildren
-      allChildren={allChildren}
-      groups={groups}
-      childType={GroupAccordion}
-      grouping={grouping}
-      defaultValue={valueArr}
-      name={'grouping ' + grouping.name}
-    >
-      <DefaultAccordion name="DefaultAccordion" />
-    </CloneChildren>
-  );
-}
-
-function DefaultAccordion(props) {
-  const { groups, defaultValue, grouping, allChildren, asChild } = props;
-  if (!allChildren || !groups) {
-    return null;
-  }
-
-  if (Boolean(asChild)) {
-    return React.cloneElement(props.children, props);
-  }
-
-  return (
-    <Accordion
-      type={grouping.type || 'multiple'}
-      className="text-white"
-      defaultValue={defaultValue}
-    >
-      {[...groups.entries()].map(([key, group]) => {
-        return (
-          <AccordionItem
-            key={group.key + '-i'}
-            value={group.key}
-          >
-            <CloneChildren
-              allChildren={allChildren}
-              group={group}
-              childType={Trigger}
-              name="AccordionGroup.Trigger"
-            />
-            <CloneChildren
-              allChildren={allChildren}
-              group={group}
-              childType={Content}
-              defaultTypes={DEFAULT_TYPES}
-              name="AccordionGroup.Content"
-            />
-          </AccordionItem>
-        );
-      })}
-    </Accordion>
-  );
-}
-
-function GroupAccordion(props) {
-  const { groups, children } = props;
-  if (!groups) {
-    return null;
-  }
-  return [...groups.values()].map(group =>
-    React.cloneElement(children, {
-      ...props,
-      children: children.props.children,
-      group,
-      ...group,
-      key: group.title,
-    })
-  );
-}
-
-function Content(props) {
-  const { children, asChild, ...childProps } = props;
-  const { group } = props;
-  Object.assign(childProps, group);
-
-  if (!group) {
-    return null;
-  }
-  if (asChild) {
-    return React.cloneElement(children, { ...group, ...props, children: children.props.children });
-  }
-  return (
-    <AccordionContent>
-      {React.cloneElement(children, { ...group, ...props, children: children.props.children })}
-    </AccordionContent>
-  );
-}
-
-function Trigger(props) {
-  const { children, asChild, ...childProps } = props;
-  const { group } = props;
-  Object.assign(childProps, group);
-
-  if (!group) {
-    return null;
-  }
-  if (asChild) {
-    return React.cloneElement(children, childProps);
-  }
-  return (
-    <AccordionTrigger
-      value={group.value}
-      asChild={true}
-    >
-      <div>
-        {React.cloneElement(children, childProps)}
-        <ChevronDownIcon key="chevronDown" className="text-primary h-4 w-4 shrink-0 transition-transform duration-200" />
-      </div>
-    </AccordionTrigger>
-  );
-}
-
-AccordionGroup.Content = Content;
-AccordionGroup.Trigger = Trigger;
-AccordionGroup.Accordion = GroupAccordion;
-
-export default AccordionGroup;
@@ -1,4 +0,0 @@
-export * from './AccordionGroup';
-import AccordionGroup from './AccordionGroup';
-
-export default AccordionGroup;
@@ -1,6 +1,6 @@
 import React, { ReactElement } from 'react';
 import PropTypes from 'prop-types';
-import { useViewportGrid } from '@ohif/ui-next';
+import { useViewportGrid } from '@ohif/ui';
 import ViewportWindowLevel from '../ViewportWindowLevel/ViewportWindowLevel';

 const ActiveViewportWindowLevel = ({ servicesManager }: withAppTypes): ReactElement => {
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState, useRef } from 'react';
-import { useCine } from '@ohif/ui';
+import { CinePlayer, useCine } from '@ohif/ui';
 import { Enums, eventTarget, cache } from '@cornerstonejs/core';
 import { useAppConfig } from '@state';

@@ -53,13 +53,13 @@ function WrappedCinePlayer({
      // check if the displaySet is dynamic and set the dynamic info
      if (displaySet.isDynamicVolume) {
        const { dynamicVolumeInfo } = displaySet;
-        const numDimensionGroups = dynamicVolumeInfo.timePoints.length;
+        const numTimePoints = dynamicVolumeInfo.timePoints.length;
        const label = dynamicVolumeInfo.splittingTag;
-        const dimensionGroupNumber = dynamicVolumeInfo.dimensionGroupNumber || 1;
+        const timePointIndex = dynamicVolumeInfo.timePointIndex || 0;
        setDynamicInfo({
          volumeId: displaySet.displaySetInstanceUID,
-          dimensionGroupNumber,
-          numDimensionGroups,
+          timePointIndex,
+          numTimePoints,
          label,
        });
      } else {
@@ -160,7 +160,8 @@ function RenderCinePlayer({
  dynamicInfo: dynamicInfoProp,
  customizationService,
 }) {
-  const CinePlayerComponent = customizationService.getCustomization('cinePlayer');
+  const { component: CinePlayerComponent = CinePlayer } =
+    customizationService.get('cinePlayer') ?? {};

  const [dynamicInfo, setDynamicInfo] = useState(dynamicInfoProp);

@@ -176,20 +177,20 @@ function RenderCinePlayer({
      return;
    }

-    const handleDimensionGroupChange = evt => {
-      const { volumeId, dimensionGroupNumber, numDimensionGroups, splittingTag } = evt.detail;
-      setDynamicInfo({ volumeId, dimensionGroupNumber, numDimensionGroups, label: splittingTag });
+    const handleTimePointIndexChange = evt => {
+      const { volumeId, timePointIndex, numTimePoints, splittingTag } = evt.detail;
+      setDynamicInfo({ volumeId, timePointIndex, numTimePoints, label: splittingTag });
    };

    eventTarget.addEventListener(
-      Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED,
-      handleDimensionGroupChange
+      Enums.Events.DYNAMIC_VOLUME_TIME_POINT_INDEX_CHANGED,
+      handleTimePointIndexChange
    );

    return () => {
      eventTarget.removeEventListener(
-        Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED,
-        handleDimensionGroupChange
+        Enums.Events.DYNAMIC_VOLUME_TIME_POINT_INDEX_CHANGED,
+        handleTimePointIndexChange
      );
    };
  }, [dynamicInfo]);
@@ -199,17 +200,17 @@ function RenderCinePlayer({
      return;
    }

-    const { volumeId, dimensionGroupNumber, numDimensionGroups, splittingTag } = dynamicInfo || {};
+    const { volumeId, timePointIndex, numTimePoints, splittingTag } = dynamicInfo || {};
    const volume = cache.getVolume(volumeId, true);
-    volume.dimensionGroupNumber = dimensionGroupNumber;
+    volume.timePointIndex = timePointIndex;

-    setDynamicInfo({ volumeId, dimensionGroupNumber, numDimensionGroups, label: splittingTag });
+    setDynamicInfo({ volumeId, timePointIndex, numTimePoints, label: splittingTag });
  }, []);

  const updateDynamicInfo = useCallback(props => {
-    const { volumeId, dimensionGroupNumber } = props;
+    const { volumeId, timePointIndex } = props;
    const volume = cache.getVolume(volumeId, true);
-    volume.dimensionGroupNumber = dimensionGroupNumber;
+    volume.timePointIndex = timePointIndex;
  }, []);

  return (
@@ -1,8 +1,6 @@
 import React, { useCallback, useEffect, useRef, useState, ReactElement } from 'react';
 import PropTypes from 'prop-types';
-import { useSystem } from '@ohif/core';
-import { Button } from '@ohif/ui';
-import { Icons } from '@ohif/ui-next';
+import { Button, Icon, ProgressLoadingBar } from '@ohif/ui';
 import DicomFileUploader, {
  EVENTS,
  UploadStatus,
@@ -41,11 +39,6 @@ function DicomUploadProgress({
  dicomFileUploaderArr,
  onComplete,
 }: DicomUploadProgressProps): ReactElement {
-  const { servicesManager } = useSystem();
-
-  const ProgressLoadingBar =
-    servicesManager.services.customizationService.getCustomization('ui.progressLoadingBar');
-
  const [totalUploadSize] = useState(
    dicomFileUploaderArr.reduce((acc, fileUploader) => acc + fileUploader.getFileSize(), 0)
  );
@@ -320,10 +313,10 @@ function DicomUploadProgress({
      <div className="ml-auto flex w-6 justify-center">
        {numFails > 0 && (
          <div onClick={() => setShowFailedOnly(currentShowFailedOnly => !currentShowFailedOnly)}>
-            <Icons.ByName
+            <Icon
              className="cursor-pointer"
              name="icon-status-alert"
-            ></Icons.ByName>
+            ></Icon>
          </div>
        )}
      </div>
@@ -6,7 +6,7 @@ import DicomFileUploader, {
  UploadRejection,
  UploadStatus,
 } from '../../utils/DicomFileUploader';
-import { Icons } from '@ohif/ui-next';
+import { Icon } from '@ohif/ui';

 type DicomUploadProgressItemProps = {
  dicomFileUploader: DicomFileUploader;
@@ -54,17 +54,17 @@ const DicomUploadProgressItem = memo(
      switch (dicomFileUploader.getStatus()) {
        case UploadStatus.Success:
          return (
-            <Icons.ByName
+            <Icon
              name="status-tracked"
              className="text-primary-light"
-            />
+            ></Icon>
          );
        case UploadStatus.InProgress:
-          return <Icons.ByName name="icon-transferring" />;
+          return <Icon name="icon-transferring"></Icon>;
        case UploadStatus.Failed:
-          return <Icons.ByName name="icon-alert-small" />;
+          return <Icon name="icon-alert-small"></Icon>;
        case UploadStatus.Cancelled:
-          return <Icons.ByName name="icon-alert-outline" />;
+          return <Icon name="icon-alert-outline"></Icon>;
        default:
          return <></>;
      }
@@ -88,8 +88,9 @@ const DicomUploadProgressItem = memo(
                <div className="w-10 text-right">{percentComplete}%</div>
              )}
              <div className="ml-auto flex cursor-pointer">
-                <Icons.Close
+                <Icon
                  className="text-primary-active self-center"
+                  name="close"
                  onClick={cancelUpload}
                />
              </div>
@@ -1,70 +0,0 @@
-import React from 'react';
-import { Accordion, AccordionContent, AccordionItem } from '@ohif/ui-next';
-
-import PanelAccordionTrigger from './PanelAccordionTrigger';
-import MeasurementsMenu from './MeasurementsMenu';
-import { useSystem } from '@ohif/core';
-
-export function MeasurementItem(props) {
-  const { index, item } = props;
-  return (
-    <PanelAccordionTrigger
-      count={index + 1}
-      text={item.toolName || item.label || item.title}
-      colorHex="#f00"
-      isActive={item.isSelected}
-      menu={MeasurementsMenu}
-      group={{ items: [item], onClick: props.onClick }}
-    />
-  );
-}
-
-export default function MeasurementAccordion(props) {
-  const { items } = props;
-  const system = useSystem();
-
-  const onClick = (e, group) => {
-    const { items } = group;
-    // Just jump to the first measurement in the set, and mark that one as active
-    // with the set of items.
-    system.commandsManager.run('jumpToMeasurement', {
-      uid: items[0].uid,
-      displayMeasurements: items,
-      group,
-    });
-  };
-
-  return (
-    <Accordion
-      type="multiple"
-      className="flex-shrink-0 overflow-hidden"
-    >
-      {items.map((item, index) => {
-        const { displayText: details = {} } = item;
-        return (
-          <AccordionItem
-            key={`measurementAccordion:${item.uid}`}
-            value={item.uid}
-          >
-            <MeasurementItem
-              item={item}
-              key={`measurementItem:${item.uid}`}
-              index={index}
-              onClick={onClick}
-            />
-            <AccordionContent key={`measurementContent:${item.uid}`}>
-              <div className="ml-7 px-2 py-2">
-                <div className="text-secondary-foreground flex items-center gap-1 text-base leading-normal">
-                  {details.primary?.length > 0 &&
-                    details.primary.map((detail, index) => (
-                      <span key={`details:${item.uid}:${index}`}>{detail}</span>
-                    ))}
-                </div>
-              </div>
-            </AccordionContent>
-          </AccordionItem>
-        );
-      })}
-    </Accordion>
-  );
-}
@@ -1,30 +0,0 @@
-import React from 'react';
-import { MeasurementTable } from '@ohif/ui-next';
-import { useSystem } from '@ohif/core';
-
-/**
- * This is a measurement table that is designed to be nested inside
- * the accordion groups.
- */
-export default function MeasurementTableNested(props) {
-  const { title, items, group, customHeader } = props;
-  const { commandsManager } = useSystem();
-  const onAction = (e, command, uid) => {
-    commandsManager.run(command, { uid, annotationUID: uid, displayMeasurements: items });
-  };
-
-  return (
-    <MeasurementTable
-      title={title ? title : `Measurements`}
-      data={items}
-      onAction={onAction}
-      {...group}
-      key={group.key}
-    >
-      <MeasurementTable.Header key="measurementTableHeader">
-        {customHeader && group.isFirst && customHeader({ ...props, items: props.allItems })}
-      </MeasurementTable.Header>
-      <MeasurementTable.Body key="measurementTableBody" />
-    </MeasurementTable>
-  );
-}
@@ -1,81 +0,0 @@
-import React, { useState } from 'react';
-import { useSystem } from '@ohif/core';
-import {
-  Button,
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  Icons,
-} from '@ohif/ui-next';
-
-export function MeasumentsMenu(props) {
-  const { group, classNames } = props;
-  if (!group.items?.length) {
-    console.log('No items to iterate', group.items);
-    return null;
-  }
-  const { items } = group;
-  const [item] = items;
-  const { isSelected, isVisible } = item;
-
-  const system = useSystem();
-
-  const onAction = (event, command, args?) => {
-    const uid = items.map(item => item.uid);
-    // Some commands use displayMeasurements and some use items
-    system.commandsManager.run(command, {
-      ...args,
-      uid,
-      displayMeasurements: items,
-      items,
-      event,
-    });
-  };
-
-  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-
-  return (
-    <div className={`relative ml-2 inline-flex items-center space-x-1 ${classNames}`}>
-      {/* Visibility Toggle Icon */}
-      <Button
-        size="icon"
-        variant="ghost"
-        className={`h-6 w-6 transition-opacity ${
-          isSelected || !isVisible ? 'opacity-100' : 'opacity-50 group-hover:opacity-100'
-        }`}
-        aria-label={isVisible ? 'Hide' : 'Show'}
-        onClick={e => {
-          e.stopPropagation();
-          onAction(e, ['jumpToMeasurement', 'toggleVisibilityMeasurement']);
-        }}
-      >
-        {isVisible ? <Icons.Hide className="h-6 w-6" /> : <Icons.Show className="h-6 w-6" />}
-      </Button>
-      {/* Actions Dropdown Menu */}
-      <DropdownMenu onOpenChange={open => setIsDropdownOpen(open)}>
-        <DropdownMenuTrigger asChild>
-          <Button
-            size="icon"
-            variant="ghost"
-            className={`h-6 w-6 transition-opacity ${
-              isSelected || isDropdownOpen ? 'opacity-100' : 'opacity-50 group-hover:opacity-100'
-            }`}
-            aria-label="Actions"
-            onClick={e => e.stopPropagation()} // Prevent row selection on button click
-          >
-            <Icons.More className="h-6 w-6" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end">
-          <DropdownMenuItem onClick={e => onAction(e, 'removeMeasurement')}>
-            <Icons.Delete className="text-foreground" />
-            <span className="pl-2">Delete</span>
-          </DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-  );
-}
-
-export default MeasumentsMenu;
@@ -1,81 +0,0 @@
-import React from 'react';
-import AccordionGroup from './AccordionGroup';
-import { utils } from '@ohif/core';
-import MeasurementTableNested from './MeasurementTableNested';
-
-const { filterNot, filterAdditionalFindings } = utils.MeasurementFilters;
-
-export const MeasurementOrAdditionalFindingSets = [
-  {
-    title: 'Measurements',
-    filter: filterNot(filterAdditionalFindings),
-  },
-  {
-    title: 'Additional Findings',
-    filter: filterAdditionalFindings,
-  },
-];
-
-/**
- * Groups measurements by study in order to allow display and saving by study
- * @param {Object} servicesManager
- */
-export const groupByNamedSets = (items, grouping) => {
-  const groups = new Map();
-  const { namedSets } = grouping;
-
-  for (const namedSet of namedSets) {
-    const name = namedSet.id || namedSet.title;
-    groups.set(name, {
-      ...grouping,
-      ...namedSet,
-      items: [],
-      isFirst: groups.size === 0,
-      title: name,
-      key: name,
-    });
-  }
-  items.forEach(item => {
-    for (const namedSet of namedSets) {
-      if (namedSet.filter(item)) {
-        const name = namedSet.id || namedSet.title;
-        groups.get(name).items.push(item);
-        return;
-      }
-    }
-  });
-  for (const namedSet of namedSets) {
-    const name = namedSet.id || namedSet.title;
-    if (!groups.get(name).items.length) {
-      groups.delete(name);
-    }
-  }
-  return groups;
-};
-
-export function MeasurementsOrAdditionalFindings(props): React.ReactNode {
-  const { items, children, grouping = {}, customHeader, group } = props;
-
-  return (
-    <AccordionGroup
-      grouping={{
-        groupingFunction: groupByNamedSets,
-        name: 'measurementsOrAdditional',
-        namedSets: MeasurementOrAdditionalFindingSets,
-        StudyInstanceUID: group?.StudyInstanceUID,
-        ...grouping,
-      }}
-      items={items}
-      sourceChildren={children}
-    >
-      <AccordionGroup.Accordion noWrapper="true">
-        <MeasurementTableNested
-          customHeader={customHeader}
-          allItems={items}
-        />
-      </AccordionGroup.Accordion>
-    </AccordionGroup>
-  );
-}
-
-export default MeasurementsOrAdditionalFindings;
@@ -1,16 +1,14 @@
 import React from 'react';
 import { useViewportActionCornersContext } from '../contextProviders/ViewportActionCornersProvider';
-import { useSystem } from '@ohif/core';
+import { ViewportActionCorners } from '@ohif/ui';

 export type OHIFViewportActionCornersProps = {
  viewportId: string;
 };

 function OHIFViewportActionCorners({ viewportId }: OHIFViewportActionCornersProps) {
-  const { servicesManager } = useSystem();
  const [viewportActionCornersState] = useViewportActionCornersContext();
-  const ViewportActionCorners =
-    servicesManager.services.customizationService.getCustomization('ui.viewportActionCorner');
+
  if (!viewportActionCornersState[viewportId]) {
    return null;
  }
@@ -1,48 +0,0 @@
-import React from 'react';
-import { AccordionTrigger, ColorCircle } from '@ohif/ui-next';
-import { ChevronDownIcon } from '@radix-ui/react-icons';
-
-function onClickDefault(e) {
-  const { group, onClick = group?.onClick } = this;
-  if (!onClick) {
-    console.log('No onClick function', group);
-    return;
-  }
-  console.log('onClickDefault');
-  e.preventDefault();
-  e.stopPropagation();
-
-  onClick(e, group);
-
-  return false;
-}
-
-export default function PanelAccordionTrigger(props) {
-  const { marginLeft = 8, isActive = false, colorHex, count, text, menu: Menu = null } = props;
-
-  return (
-    <AccordionTrigger
-      style={{ marginLeft: `${marginLeft}px`, padding: 0 }}
-      asChild={true}
-    >
-      <div className={`inline-flex text-base ${isActive ? 'bg-popover' : 'bg-muted'} flex-grow`}>
-        <button onClick={onClickDefault.bind(props)}>
-          <span
-            className={`inline-flex rounded-l border-r border-black ${isActive ? 'bg-highlight' : 'bg-muted'}`}
-          >
-            {count !== undefined ? <span className="px-2">{count}</span> : null}
-            {colorHex && <ColorCircle colorHex={colorHex} />}
-          </span>
-          <span>{text}</span>
-        </button>
-        {Menu && (
-          <Menu
-            {...props}
-            classNames="justify-end flex-grow"
-          />
-        )}
-        <ChevronDownIcon className="text-primary h-4 w-4 shrink-0 transition-transform duration-200" />
-      </div>
-    </AccordionTrigger>
-  );
-}
@@ -1,90 +0,0 @@
-import React from 'react';
-import { useActiveViewportDisplaySets, useSystem } from '@ohif/core';
-
-import AccordionGroup from './AccordionGroup';
-import PanelAccordionTrigger from './PanelAccordionTrigger';
-import MeasurementItems from './MeasurementItems';
-import MeasurementsMenu from './MeasurementsMenu';
-
-/**
- * Groups measurements by study in order to allow display and saving by study
- * @param {Object} servicesManager
- */
-export const groupByDisplaySet = (items, grouping, childProps) => {
-  const groups = new Map();
-  const { displaySetService } = childProps.servicesManager.services;
-  const { activeDisplaySetInstanceUID } = grouping;
-
-  items.forEach(item => {
-    const { displaySetInstanceUID } = item;
-
-    if (!groups.has(displaySetInstanceUID)) {
-      const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
-      groups.set(displaySetInstanceUID, {
-        header: null,
-        isSelected: displaySetInstanceUID == activeDisplaySetInstanceUID,
-        ...grouping,
-        items: [],
-        key: displaySetInstanceUID,
-        title: 'Series Measurements',
-        displaySet,
-      });
-    }
-    groups.get(displaySetInstanceUID).items.push(item);
-  });
-
-  return groups;
-};
-
-export function SeriesMeasurementTrigger(props) {
-  const { group, isSelected, displaySet, menu } = props;
-  const { SeriesNumber = 1, SeriesDescription } = displaySet;
-
-  return (
-    <PanelAccordionTrigger
-      text={`Series #${SeriesNumber} ${SeriesDescription}`}
-      count={group.items.length}
-      isActive={isSelected}
-      group={group}
-      menu={menu}
-      marginLeft="0"
-    />
-  );
-}
-
-export function SeriesMeasurements(props): React.ReactNode {
-  const { items, grouping = {}, children } = props;
-  const system = useSystem();
-  const activeDisplaySets = useActiveViewportDisplaySets(system);
-  const activeDisplaySetInstanceUID = activeDisplaySets?.[0]?.displaySetInstanceUID;
-  const onClick = (_e, group) => {
-    const { items } = group;
-    system.commandsManager.run('jumpToMeasurement', {
-      uid: items[0].uid,
-      displayMeasurements: items,
-      group,
-    });
-  };
-
-  // The content of the accordion group will default to the children of the
-  // parent declaration if present, otherwise to MeasurementItems
-  return (
-    <AccordionGroup
-      grouping={{
-        groupingFunction: groupByDisplaySet,
-        activeDisplaySetInstanceUID,
-        ...grouping,
-        onClick,
-      }}
-      items={items}
-      sourceChildren={children}
-    >
-      <AccordionGroup.Trigger asChild={true}>
-        <SeriesMeasurementTrigger menu={MeasurementsMenu} />
-      </AccordionGroup.Trigger>
-      <MeasurementItems />
-    </AccordionGroup>
-  );
-}
-
-export default SeriesMeasurements;
@@ -1,21 +0,0 @@
-import React from 'react';
-import { utils } from '@ohif/core';
-
-const { formatDate } = utils;
-
-export function SeriesSummaryFromDisplaySet({ displaySet }) {
-  if (!displaySet) {
-    return null;
-  }
-
-  const { SeriesDate, SeriesDescription, SeriesNumber = 1 } = displaySet;
-
-  return (
-    <div className="mx-2 my-0">
-      <div className="text-foreground pb-1 text-sm">
-        Series #{SeriesNumber} {SeriesDescription}
-      </div>
-      <div className="text-muted-foreground text-sm">{formatDate(SeriesDate)}</div>
-    </div>
-  );
-}
@@ -1,88 +0,0 @@
-import React from 'react';
-import { useActiveViewportDisplaySets, useSystem, utils } from '@ohif/core';
-// import { AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next';
-
-import { AccordionGroup } from './AccordionGroup';
-import MeasurementsOrAdditionalFindings from './MeasurementsOrAdditionalFindings';
-import StudySummaryWithActions from './StudySummaryWithActions';
-
-const { MeasurementFilters } = utils;
-
-/**
- * Groups measurements by study in order to allow display and saving by study
- * @param {Object} servicesManager
- */
-export const groupByStudy = (items, grouping, childProps) => {
-  const groups = new Map();
-  const { activeStudyUID } = grouping;
-  const { displaySetService } = childProps.servicesManager.services;
-
-  const getItemStudyInstanceUID = item => {
-    const displaySet = displaySetService.getDisplaySetByUID(item.displaySetInstanceUID);
-    return displaySet.instances[0].StudyInstanceUID;
-  };
-
-  let firstSelected, firstGroup;
-
-  items.forEach(item => {
-    const studyUID = getItemStudyInstanceUID(item);
-    if (!groups.has(studyUID)) {
-      const items = [];
-      const filter = MeasurementFilters.filterAnd(
-        MeasurementFilters.filterMeasurementsByStudyUID(activeStudyUID),
-        grouping.filter
-      );
-      const group = {
-        ...grouping,
-        items,
-        displayMeasurements: items,
-        key: studyUID,
-        isSelected: studyUID === activeStudyUID,
-        StudyInstanceUID: activeStudyUID,
-        filter,
-        measurementFilter: filter,
-      };
-      if (group.isSelected && !firstSelected) {
-        firstSelected = group;
-      }
-      firstGroup ||= group;
-      groups.set(studyUID, group);
-    }
-    if (!firstSelected && firstGroup) {
-      firstGroup.isSelected = true;
-    }
-    const group = groups.get(studyUID);
-    group.items.push(item);
-  });
-
-  return groups;
-};
-
-export function StudyMeasurements(props): React.ReactNode {
-  const { items, grouping = {}, children } = props;
-
-  const system = useSystem();
-  const activeDisplaySets = useActiveViewportDisplaySets(system);
-  const activeStudyUID = activeDisplaySets?.[0]?.StudyInstanceUID;
-
-  return (
-    <AccordionGroup
-      grouping={{
-        name: 'groupByStudy',
-        groupingFunction: groupByStudy,
-        activeStudyUID,
-        ...grouping,
-      }}
-      items={items}
-      value={[activeStudyUID]}
-      sourceChildren={children}
-    >
-      <AccordionGroup.Trigger>
-        <StudySummaryWithActions />
-      </AccordionGroup.Trigger>
-      <MeasurementsOrAdditionalFindings activeStudyUID={activeStudyUID} />
-    </AccordionGroup>
-  );
-}
-
-export default StudyMeasurements;
@@ -1,69 +0,0 @@
-import React from 'react';
-import { Button, Icons } from '@ohif/ui-next';
-import { useSystem } from '@ohif/core';
-
-export function StudyMeasurementsActions({ items, StudyInstanceUID, measurementFilter, actions }) {
-  const { commandsManager } = useSystem();
-  const disabled = !items?.length;
-
-  if (disabled) {
-    return null;
-  }
-
-  return (
-    <div className="bg-background flex h-9 w-full items-center rounded pr-0.5">
-      <div className="flex space-x-1">
-        <Button
-          size="sm"
-          variant="ghost"
-          className="pl-1.5"
-          onClick={() => {
-            commandsManager.runCommand('downloadCSVMeasurementsReport', {
-              StudyInstanceUID,
-              measurementFilter,
-            });
-          }}
-        >
-          <Icons.Download className="h-5 w-5" />
-          <span className="pl-1">CSV</span>
-        </Button>
-
-        <Button
-          size="sm"
-          variant="ghost"
-          className="pl-0.5"
-          onClick={e => {
-            e.stopPropagation();
-            if (actions?.createSR) {
-              actions.createSR({ StudyInstanceUID, measurementFilter });
-              return;
-            }
-            commandsManager.run('promptSaveReport', {
-              StudyInstanceUID,
-              measurementFilter,
-            });
-          }}
-        >
-          <Icons.Add />
-          Create SR
-        </Button>
-        <Button
-          size="sm"
-          variant="ghost"
-          className="pl-0.5"
-          onClick={e => {
-            e.stopPropagation();
-            commandsManager.runCommand('clearMeasurements', {
-              measurementFilter,
-            });
-          }}
-        >
-          <Icons.Delete />
-          Delete
-        </Button>
-      </div>
-    </div>
-  );
-}
-
-export default StudyMeasurementsActions;
@@ -1,26 +0,0 @@
-import React from 'react';
-import { DicomMetadataStore, utils } from '@ohif/core';
-import { StudySummary } from '@ohif/ui-next';
-
-const { formatDate } = utils;
-
-export function StudySummaryFromMetadata(props) {
-  const { StudyInstanceUID } = props;
-  if (!StudyInstanceUID) {
-    return null;
-  }
-  const studyMeta = DicomMetadataStore.getStudy(StudyInstanceUID);
-  if (!studyMeta?.series?.length) {
-    return null;
-  }
-
-  const instanceMeta = studyMeta.series[0].instances[0];
-  const { StudyDate, StudyDescription } = instanceMeta;
-
-  return (
-    <StudySummary
-      date={formatDate(StudyDate)}
-      description={StudyDescription}
-    />
-  );
-}
@@ -1,14 +0,0 @@
-import React from 'react';
-import { StudySummaryFromMetadata } from './StudySummaryFromMetadata';
-import StudyMeasurementsActions from './StudyMeasurementsActions';
-
-export function StudySummaryWithActions(props) {
-  return (
-    <div>
-      <StudySummaryFromMetadata {...props} />
-      <StudyMeasurementsActions {...props} />
-    </div>
-  );
-}
-
-export default StudySummaryWithActions;
@@ -110,7 +110,7 @@ function ViewportSegmentationMenu({
          <Separator className="bg-input mb-3" />
          <span className="text-muted-foreground mb-2 text-xs font-semibold">Available</span>
          <ul className="space-y-1">
-            {availableSegmentations.map(({ segmentationId, label }) => (
+            {availableSegmentations.map(({segmentationId, label}) => (
              <li
                key={segmentationId}
                className="flex items-center text-sm"
@@ -5,7 +5,6 @@ export function VolumeLighting({
  servicesManager,
  commandsManager,
  viewportId,
-  hasShade,
 }: VolumeLightingProps): ReactElement {
  const { cornerstoneViewportService } = servicesManager.services;
  const [ambient, setAmbient] = useState(null);
@@ -39,15 +38,11 @@ export function VolumeLighting({
    setDiffuse(diffuse);
    setSpecular(specular);
  }, [viewportId, cornerstoneViewportService]);
-  const disableOption = hasShade ? '' : 'ohif-disabled !opacity-40';
-  const disableSlider = !hasShade;
  return (
    <>
-      <div
-        className={`all-in-one-menu-item flex w-full flex-row !items-center justify-between gap-[10px] ${disableOption}`}
-      >
+      <div className="all-in-one-menu-item flex  w-full flex-row !items-center justify-between gap-[10px]">
        <label
-          className="block text-white"
+          className="block  text-white"
          htmlFor="ambient"
        >
          Ambient
@@ -61,7 +56,6 @@ export function VolumeLighting({
              onAmbientChange();
            }}
            id="ambient"
-            disabled={disableSlider}
            max={1}
            min={0}
            type="range"
@@ -74,11 +68,9 @@ export function VolumeLighting({
          />
        )}
      </div>
-      <div
-        className={`all-in-one-menu-item flex w-full flex-row !items-center justify-between gap-[10px] ${disableOption}`}
-      >
+      <div className="all-in-one-menu-item flex  w-full flex-row !items-center justify-between gap-[10px]">
        <label
-          className="block text-white"
+          className="block  text-white"
          htmlFor="diffuse"
        >
          Diffuse
@@ -91,7 +83,6 @@ export function VolumeLighting({
              setDiffuse(e.target.value);
              onDiffuseChange();
            }}
-            disabled={disableSlider}
            id="diffuse"
            max={1}
            min={0}
@@ -106,11 +97,9 @@ export function VolumeLighting({
        )}
      </div>

-      <div
-        className={`all-in-one-menu-item flex w-full flex-row !items-center justify-between gap-[10px] ${disableOption}`}
-      >
+      <div className="all-in-one-menu-item flex  w-full flex-row !items-center justify-between gap-[10px]">
        <label
-          className="block text-white"
+          className="block  text-white"
          htmlFor="specular"
        >
          Specular
@@ -119,7 +108,6 @@ export function VolumeLighting({
          <input
            className="bg-inputfield-main h-2 w-[120px] cursor-pointer appearance-none rounded-lg"
            value={specular}
-            disabled={disableSlider}
            onChange={e => {
              setSpecular(e.target.value);
              onSpecularChange();
@@ -1,4 +1,4 @@
-import React, { ReactElement, useState } from 'react';
+import React, { ReactElement } from 'react';
 import { AllInOneMenu } from '@ohif/ui';
 import { VolumeRenderingOptionsProps } from '../../types/ViewportPresets';
 import { VolumeRenderingQuality } from './VolumeRenderingQuality';
@@ -11,7 +11,6 @@ export function VolumeRenderingOptions({
  volumeRenderingQualityRange,
  servicesManager,
 }: VolumeRenderingOptionsProps): ReactElement {
-  const [hasShade, setShade] = useState(false);
  return (
    <AllInOneMenu.ItemPanel>
      <VolumeRenderingQuality
@@ -35,14 +34,12 @@ export function VolumeRenderingOptions({
          commandsManager={commandsManager}
          servicesManager={servicesManager}
          viewportId={viewportId}
-          onClickShade={setShade}
        />
      </div>
      <VolumeLighting
        viewportId={viewportId}
        commandsManager={commandsManager}
        servicesManager={servicesManager}
-        hasShade={hasShade}
      />
    </AllInOneMenu.ItemPanel>
  );
@@ -1,5 +1,4 @@
-import { AllInOneMenu } from '@ohif/ui';
-import { Icons } from '@ohif/ui-next';
+import { AllInOneMenu, Icon } from '@ohif/ui';
 import React, { ReactElement } from 'react';
 import { VolumeRenderingPresetsProps } from '../../types/ViewportPresets';
 import { VolumeRenderingPresetsContent } from './VolumeRenderingPresetsContent';
@@ -10,27 +9,29 @@ export function VolumeRenderingPresets({
  commandsManager,
  volumeRenderingPresets,
 }: VolumeRenderingPresetsProps): ReactElement {
-  const { uiDialogService } = servicesManager.services;
+  const { uiModalService } = servicesManager.services;

  const onClickPresets = () => {
-    uiDialogService.show({
-      id: 'volume-rendering-presets',
+    uiModalService.show({
      content: VolumeRenderingPresetsContent,
      title: 'Rendering Presets',
-      isDraggable: true,
+      movable: true,
      contentProps: {
+        onClose: uiModalService.hide,
        presets: volumeRenderingPresets,
        viewportId,
        commandsManager,
      },
+      containerDimensions: 'h-[543px] w-[460px]',
+      contentDimensions: 'h-[493px] w-[460px]  pl-[12px] pr-[12px]',
    });
  };

  return (
    <AllInOneMenu.Item
      label="Rendering Presets"
-      icon={<Icons.VolumeRendering />}
-      rightIcon={<Icons.ByName name="action-new-dialog" />}
+      icon={<Icon name="VolumeRendering" />}
+      rightIcon={<Icon name="action-new-dialog" />}
      onClick={onClickPresets}
    />
  );
@@ -1,24 +1,29 @@
-import { Icons, FooterAction } from '@ohif/ui-next';
+import { Icon } from '@ohif/ui';
+import { ButtonEnums } from '@ohif/ui';
 import React, { ReactElement, useState, useCallback } from 'react';
-import { PresetDialog } from '@ohif/ui-next';
+import { Button, InputFilterText } from '@ohif/ui';
 import { ViewportPreset, VolumeRenderingPresetsContentProps } from '../../types/ViewportPresets';

-interface Props extends VolumeRenderingPresetsContentProps {
-  hide: () => void;
-}
-
 export function VolumeRenderingPresetsContent({
  presets,
  viewportId,
  commandsManager,
-  hide,
-}: Props): ReactElement {
+  onClose,
+}: VolumeRenderingPresetsContentProps): ReactElement {
+  const [filteredPresets, setFilteredPresets] = useState(presets);
  const [searchValue, setSearchValue] = useState('');
  const [selectedPreset, setSelectedPreset] = useState<ViewportPreset | null>(null);

-  const handleSearchChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchValue(event.target.value);
-  }, []);
+  const handleSearchChange = useCallback(
+    (value: string) => {
+      setSearchValue(value);
+      const filtered = value
+        ? presets.filter(preset => preset.name.toLowerCase().includes(value.toLowerCase()))
+        : presets;
+      setFilteredPresets(filtered);
+    },
+    [presets]
+  );

  const handleApply = useCallback(
    props => {
@@ -29,54 +34,62 @@ export function VolumeRenderingPresetsContent({
    [commandsManager]
  );

-  const filteredPresets = searchValue
-    ? presets.filter(preset => preset.name.toLowerCase().includes(searchValue.toLowerCase()))
-    : presets;
-
  const formatLabel = (label: string, maxChars: number) => {
    return label.length > maxChars ? `${label.slice(0, maxChars)}...` : label;
  };

  return (
-    <PresetDialog className="h-[500px]">
-      <PresetDialog.PresetBody>
-        <PresetDialog.PresetFilter>
-          <PresetDialog.PresetSearch
-            value={searchValue}
-            onChange={handleSearchChange}
-            placeholder="Search all"
-          />
-        </PresetDialog.PresetFilter>
-        <PresetDialog.PresetGrid>
-          {filteredPresets.map((preset, index) => (
-            <div
-              key={index}
-              className="flex cursor-pointer flex-col items-start"
-              onClick={() => {
-                setSelectedPreset(preset);
-                handleApply({ preset: preset.name, viewportId });
-              }}
-            >
-              <Icons.ByName
-                name={preset.name}
-                className={
-                  selectedPreset?.name === preset.name
-                    ? 'border-highlight h-[75px] w-[95px] max-w-none rounded border-2'
-                    : 'hover:border-highlight h-[75px] w-[95px] max-w-none rounded border-2 border-black'
-                }
-              />
-              <label className="text-muted-foreground mt-1 text-left text-xs">
-                {formatLabel(preset.name, 11)}
-              </label>
-            </div>
-          ))}
-        </PresetDialog.PresetGrid>
-      </PresetDialog.PresetBody>
-      <FooterAction className="mt-4 flex-shrink-0">
-        <FooterAction.Right>
-          <FooterAction.Secondary onClick={hide}>Cancel</FooterAction.Secondary>
-        </FooterAction.Right>
-      </FooterAction>
-    </PresetDialog>
+    <div className="flex min-h-full w-full flex-col justify-between">
+      <div className="border-secondary-light h-[433px] w-full overflow-hidden rounded border bg-black px-2.5">
+        <div className="flex h-[46px] w-full items-center justify-start">
+          <div className="h-[26px] w-[200px]">
+            <InputFilterText
+              value={searchValue}
+              onDebounceChange={handleSearchChange}
+              placeholder={'Search all'}
+            />
+          </div>
+        </div>
+        <div className="ohif-scrollbar overflow h-[385px] w-full overflow-y-auto">
+          <div className="grid grid-cols-4 gap-3 pt-2 pr-3">
+            {filteredPresets.map((preset, index) => (
+              <div
+                key={index}
+                className="flex cursor-pointer flex-col items-start"
+                onClick={() => {
+                  setSelectedPreset(preset);
+                  handleApply({ preset: preset.name, viewportId });
+                }}
+              >
+                <Icon
+                  name={preset.name}
+                  className={
+                    selectedPreset?.name === preset.name
+                      ? 'border-primary-light h-[75px] w-[95px] max-w-none rounded border-2'
+                      : 'hover:border-primary-light h-[75px] w-[95px] max-w-none rounded border-2 border-black'
+                  }
+                />
+                <label className="text-aqua-pale mt-2 text-left text-xs">
+                  {formatLabel(preset.name, 11)}
+                </label>
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+      <footer className="flex h-[60px] w-full items-center justify-end">
+        <div className="flex">
+          <Button
+            name="Cancel"
+            size={ButtonEnums.size.medium}
+            type={ButtonEnums.type.secondary}
+            onClick={onClose}
+          >
+            {' '}
+            Cancel{' '}
+          </Button>
+        </div>
+      </footer>
+    </div>
  );
 }
@@ -6,7 +6,6 @@ export function VolumeShade({
  commandsManager,
  viewportId,
  servicesManager,
-  onClickShade = bool => {},
 }: VolumeShadeProps): ReactElement {
  const { cornerstoneViewportService } = servicesManager.services;
  const [shade, setShade] = useState(true);
@@ -23,7 +22,6 @@ export function VolumeShade({
    const { actor } = viewport.getActors()[0];
    const shade = actor.getProperty().getShade();
    setShade(shade);
-    onClickShade(shade);
    setKey(key + 1);
  }, [viewportId, cornerstoneViewportService]);

@@ -34,7 +32,6 @@ export function VolumeShade({
      checked={shade}
      onChange={() => {
        setShade(!shade);
-        onClickShade(!shade);
        onShadeChange(!shade);
      }}
    />
@@ -1,8 +1,7 @@
 import React, { ReactElement, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import classNames from 'classnames';
-import { AllInOneMenu } from '@ohif/ui';
-import { useViewportGrid } from '@ohif/ui-next';
+import { AllInOneMenu, useViewportGrid } from '@ohif/ui';
 import { Colormap } from './Colormap';
 import { Colorbar } from './Colorbar';
 import { setViewportColorbar } from './Colorbar';
@@ -51,7 +50,7 @@ export function WindowLevelActionMenu({
  const { colorbarService, cornerstoneViewportService } = servicesManager.services;
  const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
  const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-  const backgroundColor = viewportInfo?.getViewportOptions().background;
+  const backgroundColor = viewportInfo.getViewportOptions().background;
  const isLight = backgroundColor ? utilities.isEqual(backgroundColor, [1, 1, 1]) : false;

  const { t } = useTranslation('WindowLevelActionMenu');
@@ -2,21 +2,21 @@
 // configured via the customization service.
 const defaultWindowLevelPresets = {
  CT: [
-    { id: 'ct-soft-tissue', description: 'Soft tissue', window: '400', level: '40' },
-    { id: 'ct-lung', description: 'Lung', window: '1500', level: '-600' },
-    { id: 'ct-liver', description: 'Liver', window: '150', level: '90' },
-    { id: 'ct-bone', description: 'Bone', window: '2500', level: '480' },
-    { id: 'ct-brain', description: 'Brain', window: '80', level: '40' },
+    { description: 'Soft tissue', window: '400', level: '40' },
+    { description: 'Lung', window: '1500', level: '-600' },
+    { description: 'Liver', window: '150', level: '90' },
+    { description: 'Bone', window: '2500', level: '480' },
+    { description: 'Brain', window: '80', level: '40' },
  ],

  PT: [
-    { id: 'pt-default', description: 'Default', window: '5', level: '2.5' },
-    { id: 'pt-suv-3', description: 'SUV', window: '0', level: '3' },
-    { id: 'pt-suv-5', description: 'SUV', window: '0', level: '5' },
-    { id: 'pt-suv-7', description: 'SUV', window: '0', level: '7' },
-    { id: 'pt-suv-8', description: 'SUV', window: '0', level: '8' },
-    { id: 'pt-suv-10', description: 'SUV', window: '0', level: '10' },
-    { id: 'pt-suv-15', description: 'SUV', window: '0', level: '15' },
+    { description: 'Default', window: '5', level: '2.5' },
+    { description: 'SUV', window: '0', level: '3' },
+    { description: 'SUV', window: '0', level: '5' },
+    { description: 'SUV', window: '0', level: '7' },
+    { description: 'SUV', window: '0', level: '8' },
+    { description: 'SUV', window: '0', level: '10' },
+    { description: 'SUV', window: '0', level: '15' },
  ],
 };

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { nonWLModalities } from './WindowLevelActionMenu';
+import { nonWLModalities, WindowLevelActionMenu } from './WindowLevelActionMenu';

 export function getWindowLevelActionMenu({
  viewportId,
@@ -16,13 +16,12 @@ export function getWindowLevelActionMenu({
 }>): ReactNode {
  const { customizationService } = servicesManager.services;

-  const presets = customizationService.getCustomization('cornerstone.windowLevelPresets');
-  const colorbarProperties = customizationService.getCustomization('cornerstone.colorbar');
-  const { volumeRenderingPresets, volumeRenderingQualityRange } =
-    customizationService.getCustomization('cornerstone.3dVolumeRendering');
-  const WindowLevelActionMenu = customizationService.getCustomization(
-    'viewportActionMenu.windowLevelActionMenu'
+  const { presets } = customizationService.get('cornerstone.windowLevelPresets');
+  const colorbarProperties = customizationService.get('cornerstone.colorbar');
+  const { volumeRenderingPresets, volumeRenderingQualityRange } = customizationService.get(
+    'cornerstone.3dVolumeRendering'
  );
+
  const displaySetPresets = displaySets
    .filter(displaySet => presets[displaySet.Modality])
    .map(displaySet => {
@@ -37,10 +36,8 @@ export function getWindowLevelActionMenu({
    return null;
  }

-  const WindowLevelActionMenuComponent = WindowLevelActionMenu?.component;
-
  return (
-    <WindowLevelActionMenuComponent
+    <WindowLevelActionMenu
      viewportId={viewportId}
      element={element}
      presets={displaySetPresets}
@@ -1,10 +0,0 @@
-export * from './AccordionGroup';
-export * from './MeasurementTableNested';
-export * from './StudyMeasurements';
-export * from './MeasurementsMenu';
-export * from './SeriesMeasurements';
-export * from './StudyMeasurementsActions';
-export * from './MeasurementsOrAdditionalFindings';
-import DicomUpload from './DicomUpload/DicomUpload';
-
-export { DicomUpload };
@@ -1,127 +0,0 @@
-import React from 'react';
-import {
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuPortal,
-  DropdownMenuSeparator,
-  DropdownMenuSub,
-  DropdownMenuSubTrigger,
-  DropdownMenuSubContent,
-  Icons,
-  useSegmentationTableContext,
-  useSegmentationExpanded,
-} from '@ohif/ui-next';
-import { useTranslation } from 'react-i18next';
-import { useSystem } from '@ohif/core/src';
-
-/**
- * Custom dropdown menu component for segmentation panel that uses context for data
- */
-export const CustomDropdownMenuContent = () => {
-  const { commandsManager } = useSystem();
-  const { t } = useTranslation('SegmentationTable');
-  const {
-    onSegmentationAdd,
-    onSegmentationRemoveFromViewport,
-    onSegmentationEdit,
-    onSegmentationDelete,
-    exportOptions,
-    activeSegmentation,
-    activeSegmentationId,
-  } = useSegmentationTableContext('CustomDropdownMenu');
-
-  // Try to get segmentation data from expanded context first, fall back to table context
-  let segmentation;
-  let segmentationId;
-  let allowExport = false;
-
-  try {
-    // Try to get from expanded context
-    const context = useSegmentationExpanded();
-    segmentation = context.segmentation;
-    segmentationId = segmentation.segmentationId;
-  } catch (e) {
-    // If not in expanded context, fallback to active segmentation from table context
-    segmentation = activeSegmentation;
-    segmentationId = activeSegmentationId;
-  }
-
-  // Determine if export is allowed for this segmentation
-  if (exportOptions && segmentationId) {
-    const exportOption = exportOptions.find(opt => opt.segmentationId === segmentationId);
-    allowExport = exportOption?.isExportable || false;
-  }
-
-  if (!segmentation || !segmentationId) {
-    return null;
-  }
-
-  const actions = {
-    storeSegmentation: async segmentationId => {
-      commandsManager.run({
-        commandName: 'storeSegmentation',
-        commandOptions: { segmentationId },
-        context: 'CORNERSTONE',
-      });
-    },
-    onSegmentationDownloadRTSS: segmentationId => {
-      commandsManager.run('downloadRTSS', { segmentationId });
-    },
-    onSegmentationDownload: segmentationId => {
-      commandsManager.run('downloadSegmentation', { segmentationId });
-    },
-    downloadCSVSegmentationReport: segmentationId => {
-      commandsManager.run('downloadCSVSegmentationReport', { segmentationId });
-    },
-  };
-
-  return (
-    <DropdownMenuContent align="start">
-      <DropdownMenuItem onClick={() => onSegmentationAdd(segmentationId)}>
-        <Icons.Add className="text-foreground" />
-        <span className="pl-2">{t('Create New Segmentation')}</span>
-      </DropdownMenuItem>
-      <DropdownMenuSeparator />
-      <DropdownMenuLabel>{t('Manage Current Segmentation')}</DropdownMenuLabel>
-      <DropdownMenuItem onClick={() => onSegmentationRemoveFromViewport(segmentationId)}>
-        <Icons.Series className="text-foreground" />
-        <span className="pl-2">{t('Remove from Viewport')}</span>
-      </DropdownMenuItem>
-      <DropdownMenuItem onClick={() => onSegmentationEdit(segmentationId)}>
-        <Icons.Rename className="text-foreground" />
-        <span className="pl-2">{t('Rename')}</span>
-      </DropdownMenuItem>
-      <DropdownMenuSub>
-        <DropdownMenuSubTrigger className="pl-1">
-          <Icons.Export className="text-foreground" />
-          <span className="pl-2">{t('Export & Download')}</span>
-        </DropdownMenuSubTrigger>
-        <DropdownMenuPortal>
-          <DropdownMenuSubContent>
-            <DropdownMenuItem onClick={() => actions.downloadCSVSegmentationReport(segmentationId)}>
-              {t('Download CSV Report')}
-            </DropdownMenuItem>
-            <DropdownMenuItem
-              onClick={() => actions.storeSegmentation(segmentationId)}
-              disabled={!allowExport}
-            >
-              {t('Export DICOM SEG')}
-            </DropdownMenuItem>
-            <DropdownMenuItem
-              onClick={() => actions.onSegmentationDownload(segmentationId)}
-              disabled={!allowExport}
-            >
-              {t('Download DICOM SEG')}
-            </DropdownMenuItem>
-          </DropdownMenuSubContent>
-        </DropdownMenuPortal>
-      </DropdownMenuSub>
-      <DropdownMenuSeparator />
-      <DropdownMenuItem onClick={() => onSegmentationDelete(segmentationId)}>
-        <Icons.Delete className="text-red-600" />
-        <span className="pl-2 text-red-600">{t('Delete')}</span>
-      </DropdownMenuItem>
-    </DropdownMenuContent>
-  );
-};
@@ -1,138 +0,0 @@
-import * as cornerstoneTools from '@cornerstonejs/tools';
-import React from 'react';
-import { Separator, Button, Tooltip, TooltipTrigger, TooltipContent, Icons } from '@ohif/ui-next';
-import { useTranslation } from 'react-i18next';
-import { roundNumber } from '@ohif/core/src/utils';
-import { useSystem } from '@ohif/core/src';
-
-interface CustomSegmentStatisticsHeaderProps {
-  segmentationId: string;
-  segmentIndex: number;
-}
-
-/**
- * Custom header component for segment statistics
- */
-export const CustomSegmentStatisticsHeader = ({
-  segmentationId,
-  segmentIndex,
-}: CustomSegmentStatisticsHeaderProps) => {
-  const { servicesManager, commandsManager } = useSystem();
-  const { segmentationService } = servicesManager.services;
-  const { t } = useTranslation('SegmentationTable');
-
-  const segmentation = segmentationService.getSegmentation(segmentationId);
-  const segment = segmentation.segments[segmentIndex];
-  const cachedStats = segment.cachedStats;
-  const namedStats = cachedStats.namedStats;
-
-  if (!namedStats) {
-    return null;
-  }
-
-  const bidirectional = namedStats.bidirectional;
-
-  if (!bidirectional) {
-    return (
-      <div className="-mt-2 space-y-2">
-        <div className="flex">
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="sm"
-                className="text-primary flex items-center gap-2"
-                onClick={() => {
-                  commandsManager.run('runSegmentBidirectional', {
-                    segmentationId,
-                    segmentIndex,
-                  });
-                }}
-              >
-                <Icons.ToolBidirectionalSegment className="h-5 w-5" />
-                <span>{t('Compute Largest Bidirectional')}</span>
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom">{t('Add bidirectional measurement')}</TooltipContent>
-          </Tooltip>
-        </div>
-        <Separator className="bg-input" />
-      </div>
-    );
-  }
-
-  const { value, unit } = bidirectional;
-  const maxMajor = value.maxMajor;
-  const maxMinor = value.maxMinor;
-
-  const max = Math.max(maxMajor, maxMinor);
-  const min = Math.min(maxMajor, maxMinor);
-
-  const isVisible = cornerstoneTools.annotation.visibility.isAnnotationVisible(
-    bidirectional.annotationUID
-  );
-
-  return (
-    <div className="-mt-2 space-y-2">
-      <div className="flex items-center justify-between">
-        <div className="text-foreground">
-          <div>
-            L: {roundNumber(max)} {unit}
-          </div>
-          <div>
-            W: {roundNumber(min)} {unit}
-          </div>
-        </div>
-        <div className="flex gap-2">
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                size="icon"
-                variant="ghost"
-                className={`h-6 w-6 transition-opacity`}
-                onClick={e => {
-                  e.stopPropagation();
-                  cornerstoneTools.annotation.visibility.setAnnotationVisibility(
-                    bidirectional.annotationUID,
-                    !isVisible
-                  );
-
-                  segmentationService.addOrUpdateSegmentation({
-                    segmentationId,
-                    segmentIndex,
-                  });
-                }}
-              >
-                {isVisible ? (
-                  <Icons.Hide className="h-6 w-6" />
-                ) : (
-                  <Icons.Show className="h-6 w-6" />
-                )}
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom">{t('Toggle visibility')}</TooltipContent>
-          </Tooltip>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                onClick={() => {
-                  if (bidirectional.annotationUID) {
-                    commandsManager.run('jumpToMeasurement', {
-                      uid: bidirectional.annotationUID,
-                    });
-                  }
-                }}
-              >
-                <Icons.JumpToSlice />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom">{t('Jump to measurement')}</TooltipContent>
-          </Tooltip>
-        </div>
-      </div>
-      <Separator className="bg-input" />
-    </div>
-  );
-};
@@ -1,152 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { ImageModal, FooterAction } from '@ohif/ui-next';
-
-const MAX_TEXTURE_SIZE = 10000;
-const DEFAULT_FILENAME = 'image';
-
-interface ViewportDownloadFormNewProps {
-  onClose: () => void;
-  defaultSize: number;
-  fileTypeOptions: Array<{ value: string; label: string }>;
-  viewportId: string;
-  showAnnotations: boolean;
-  onAnnotationsChange: (show: boolean) => void;
-  dimensions: { width: number; height: number };
-  onDimensionsChange: (dimensions: { width: number; height: number }) => void;
-  onEnableViewport: (element: HTMLElement) => void;
-  onDisableViewport: () => void;
-  onDownload: (filename: string, fileType: string) => void;
-  warningState: { enabled: boolean; value: string };
-}
-
-function ViewportDownloadFormNew({
-  onClose,
-  defaultSize,
-  fileTypeOptions,
-  viewportId,
-  showAnnotations,
-  onAnnotationsChange,
-  dimensions,
-  warningState,
-  onDimensionsChange,
-  onEnableViewport,
-  onDisableViewport,
-  onDownload,
-}: ViewportDownloadFormNewProps) {
-  const [viewportElement, setViewportElement] = useState<HTMLElement | null>(null);
-  const [showWarningMessage, setShowWarningMessage] = useState(true);
-  const [filename, setFilename] = useState(DEFAULT_FILENAME);
-  const [fileType, setFileType] = useState('jpg');
-
-  useEffect(() => {
-    if (!viewportElement) {
-      return;
-    }
-
-    onEnableViewport(viewportElement);
-
-    return () => {
-      onDisableViewport();
-    };
-  }, [onDisableViewport, onEnableViewport, viewportElement]);
-
-  return (
-    <ImageModal>
-      <ImageModal.Body>
-        <ImageModal.ImageVisual>
-          <div
-            style={{
-              height: dimensions.height,
-              width: dimensions.width,
-              position: 'relative',
-            }}
-            data-viewport-uid={viewportId}
-            ref={setViewportElement}
-          >
-            {warningState.enabled && showWarningMessage && (
-              <div
-                className="text-foreground absolute left-1/2 bottom-[5px] z-[1000] -translate-x-1/2 whitespace-nowrap rounded bg-black p-3 text-xs font-bold"
-                style={{
-                  fontSize: '12px',
-                }}
-              >
-                {warningState.value}
-              </div>
-            )}
-          </div>
-        </ImageModal.ImageVisual>
-
-        <ImageModal.ImageOptions>
-          <div className="flex items-end space-x-2">
-            <ImageModal.Filename
-              value={filename}
-              onChange={e => setFilename(e.target.value)}
-            >
-              File name
-            </ImageModal.Filename>
-            <ImageModal.Filetype
-              selected={fileType}
-              onSelect={setFileType}
-              options={fileTypeOptions}
-            />
-          </div>
-
-          <ImageModal.ImageSize
-            width={dimensions.width.toString()}
-            height={dimensions.height.toString()}
-            onWidthChange={e => {
-              onDimensionsChange({
-                ...dimensions,
-                width: parseInt(e.target.value) || defaultSize,
-              });
-            }}
-            onHeightChange={e => {
-              onDimensionsChange({
-                ...dimensions,
-                height: parseInt(e.target.value) || defaultSize,
-              });
-            }}
-            maxWidth={MAX_TEXTURE_SIZE.toString()}
-            maxHeight={MAX_TEXTURE_SIZE.toString()}
-          >
-            Image size <span className="text-muted-foreground">px</span>
-          </ImageModal.ImageSize>
-
-          <ImageModal.SwitchOption
-            defaultChecked={showAnnotations}
-            checked={showAnnotations}
-            onCheckedChange={onAnnotationsChange}
-          >
-            Include annotations
-          </ImageModal.SwitchOption>
-          {warningState.enabled && (
-            <ImageModal.SwitchOption
-              defaultChecked={showWarningMessage}
-              checked={showWarningMessage}
-              onCheckedChange={setShowWarningMessage}
-            >
-              Include warning message
-            </ImageModal.SwitchOption>
-          )}
-          <FooterAction className="mt-2">
-            <FooterAction.Right>
-              <FooterAction.Secondary onClick={onClose}>Cancel</FooterAction.Secondary>
-              <FooterAction.Primary
-                onClick={() => {
-                  onDownload(filename || DEFAULT_FILENAME, fileType);
-                  onClose();
-                }}
-              >
-                Save
-              </FooterAction.Primary>
-            </FooterAction.Right>
-          </FooterAction>
-        </ImageModal.ImageOptions>
-      </ImageModal.Body>
-    </ImageModal>
-  );
-}
-
-export default {
-  'ohif.captureViewportModal': ViewportDownloadFormNew,
-};
@@ -1,13 +0,0 @@
-import { colormaps } from '../utils/colormaps';
-
-const DefaultColormap = 'Grayscale';
-
-export default {
-  'cornerstone.colorbar': {
-    width: '16px',
-    colorbarTickPosition: 'left',
-    colormaps,
-    colorbarContainerPosition: 'right',
-    colorbarInitialColormap: DefaultColormap,
-  },
-};
Author	SHA1	Message	Date
ohif-bot	65c3719d1b	chore(version): Update package versions [skip ci]	2024-12-03 14:33:02 +00:00
ohif-bot	f9fdaee3b2	chore(version): version.json [skip ci]	2024-12-03 14:32:54 +00:00
Alireza Ibrahim Ștefan Silviu-Alexandru	e5286d9fc2	fix(modes): don't attempt to retrieve a stage index if HPs (#4552 ) Co-authored-by: Ibrahim <93064150+IbrahimCSAE@users.noreply.github.com> Co-authored-by: Ștefan Silviu-Alexandru <silviu.stefan@atta.systems>	2024-12-03 09:14:41 -05:00
Alireza	71f06dcd3e	fix(multiframe): metadata handling of NM studies and loading order (#4540 )	2024-11-27 13:08:18 -05:00
ohif-bot	3b66867508	chore(version): Update package versions [skip ci]	2024-11-13 04:21:28 +00:00
ohif-bot	1d267e5576	chore(version): version.json [skip ci]	2024-11-13 04:21:19 +00:00
Alireza	610faa5a27	fix: video playback (#4497 )	2024-11-12 21:18:06 -05:00
Dan Rukas	4f8281b04a	fix(ui): Scrolling and display fixes for study panel (#4494 )	2024-11-12 17:21:05 -05:00
Alireza	2f7bb02387	fix: publish version 3.9 (#4491 )	2024-11-12 14:45:02 -05:00
ohif-bot	54d4eabf03	chore(version): Update package versions [skip ci]	2024-11-12 19:13:32 +00:00
ohif-bot	5c20bf0faf	chore(version): version.json [skip ci]	2024-11-12 19:13:25 +00:00
Alireza	b417063200	fix version json	2024-11-12 13:53:36 -05:00
Alireza	4bd343ab3e	fix version json	2024-11-12 13:46:15 -05:00
Alireza	a6de628132	publish version 3.9	2024-11-12 13:34:08 -05:00
@@ -1 +1 @@
 .9.0
 .16.1