fixed container copy panel opening issue

2026-03-27 02:23:32 +00:00 · 2025-12-22 21:21:59 +05:30
302 changed files with 15095 additions and 34068 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,8 +164,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
-        shardTotal: [20]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        shardTotal: [16]
    steps:
      - uses: actions/checkout@v4
      - name: Use Node.js 18.x
@@ -192,9 +192,6 @@ jobs:
            NOSQL_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql-readonly.documents.azure.com/.default" -o tsv --query accessToken)
            echo "::add-mask::$NOSQL_READONLY_TESTACCOUNT_TOKEN"
            echo NOSQL_READONLY_TESTACCOUNT_TOKEN=$NOSQL_READONLY_TESTACCOUNT_TOKEN >> $GITHUB_ENV
-            NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql-containercopyonly.documents.azure.com/.default" -o tsv --query accessToken)
-            echo "::add-mask::$NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN"
-            echo NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN=$NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN >> $GITHUB_ENV
            TABLE_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-tables.documents.azure.com/.default" -o tsv --query accessToken)
            echo "::add-mask::$TABLE_TESTACCOUNT_TOKEN"
            echo TABLE_TESTACCOUNT_TOKEN=$TABLE_TESTACCOUNT_TOKEN >> $GITHUB_ENV
@@ -213,8 +210,6 @@ jobs:
            MONGO_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-mongo-readonly.documents.azure.com/.default" -o tsv --query accessToken)
            echo "::add-mask::$MONGO_READONLY_TESTACCOUNT_TOKEN"
            echo MONGO_READONLY_TESTACCOUNT_TOKEN=$MONGO_READONLY_TESTACCOUNT_TOKEN >> $GITHUB_ENV
-      - name: List test files for shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}}
-        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --list
      - name: Run test shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}}
        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --workers=3
      - name: Upload blob report to GitHub Actions Artifacts
@@ -255,4 +250,4 @@ jobs:
        with:
          name: html-report--attempt-${{ github.run_attempt }}
          path: playwright-report
-          retention-days: 14
+          retention-days: 14
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -6,8 +6,8 @@ on:
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
  schedule:
-    # Once every day at 7 AM PST
-    - cron: "0 13 * * *"
+    # Once every hour
+    - cron: "0 15 * * *"

 permissions:
  id-token: write
@@ -36,4 +36,4 @@ jobs:
        with:
          node-version: 18.x
      - run: npm ci
-      - run: node utils/cleanupDBs.js
+      - run: node utils/cleanupDBs.js
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ Contracts/*
 failure.png
 screenshots/*
 GettingStarted-ignore*.ipynb
-src/Localization/Keys.generated.ts
 /test-results/
 /playwright-report/
 /blob-report/
--- a/images/Pin.svg
+++ b/images/Pin.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M9.25 1.5C9.25 1.22386 9.47386 1 9.75 1H10.25C10.5261 1 10.75 1.22386 10.75 1.5V5.5L13 7.5V9H8.75V14L8 15L7.25 14V9H3V7.5L5.25 5.5V1.5C5.25 1.22386 5.47386 1 5.75 1H6.25C6.52614 1 6.75 1.22386 6.75 1.5V5.25H9.25V1.5Z" fill="currentColor"/>
-</svg>
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -406,11 +406,7 @@ body {
  width: 440px;
  min-height: 565px;
 }
-.dataExplorerLoaderforcopyJobs{
-   width: 100%;
-   min-height: 565px;
-   right: 0;
-}
+
 .dataExplorerTabLoaderContainer {
  left: initial;
  top: initial;
--- a/less/documentDBFabric.less
+++ b/less/documentDBFabric.less
@@ -218,7 +218,6 @@ a:focus {

 .tabPanesContainer {
  overflow: auto !important;
-  display: flex;
 }

 .tabs-container {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "description": "Cosmos Explorer",
  "main": "index.js",
  "dependencies": {
-    "@azure/arm-cosmosdb": "16.4.0",
+    "@azure/arm-cosmosdb": "9.1.0",
    "@azure/cosmos": "4.7.0",
    "@azure/cosmos-language-service": "0.0.5",
    "@azure/identity": "4.5.0",
@@ -14,12 +14,12 @@
    "@fluentui/react": "8.119.0",
    "@fluentui/react-components": "9.54.2",
    "@jupyterlab/services": "6.0.2",
-    "@jupyterlab/terminal": "3.6.8",
+    "@jupyterlab/terminal": "3.0.3",
    "@microsoft/applicationinsights-web": "2.6.1",
    "@nteract/commutable": "7.5.1",
    "@nteract/connected-components": "6.8.2",
    "@nteract/core": "15.1.9",
-    "@nteract/data-explorer": "8.2.12",
+    "@nteract/data-explorer": "8.0.3",
    "@nteract/directory-listing": "2.0.6",
    "@nteract/dropdown-menu": "1.0.1",
    "@nteract/editor": "10.1.12",
@@ -31,7 +31,7 @@
    "@nteract/monaco-editor": "3.2.2",
    "@nteract/octicons": "2.0.0",
    "@nteract/outputs": "3.0.9",
-    "@nteract/presentational-components": "3.4.12",
+    "@nteract/presentational-components": "3.0.7",
    "@nteract/stateful-components": "1.7.0",
    "@nteract/styles": "2.0.2",
    "@nteract/transform-geojson": "5.1.8",
@@ -39,26 +39,25 @@
    "@nteract/transform-plotly": "6.1.6",
    "@nteract/transform-vdom": "4.0.11",
    "@nteract/transform-vega": "7.0.6",
-    "@octokit/request": "8.4.1",
    "@octokit/rest": "17.9.2",
    "@phosphor/widgets": "1.9.3",
    "@testing-library/jest-dom": "6.4.6",
    "@types/lodash": "4.14.171",
    "@types/mkdirp": "1.0.1",
-    "@types/node-fetch": "2.6.13",
+    "@types/node-fetch": "2.5.7",
    "@xmldom/xmldom": "0.7.13",
    "@xterm/addon-fit": "0.10.0",
    "@xterm/xterm": "5.5.0",
    "allotment": "1.20.2",
    "applicationinsights": "1.8.0",
    "bootstrap": "3.4.1",
-    "canvas": "3.2.1",
+    "canvas": "2.11.2",
    "clean-webpack-plugin": "4.0.0",
    "clipboard-copy": "4.0.1",
    "copy-webpack-plugin": "11.0.0",
    "crossroads": "0.12.2",
    "css-element-queries": "1.1.1",
-    "d3": "7.9.0",
+    "d3": "7.8.5",
    "datatables.net-colreorder-dt": "1.7.0",
    "datatables.net-dt": "1.13.8",
    "date-fns": "1.29.0",
@@ -71,8 +70,7 @@
    "html2canvas": "1.0.0-rc.5",
    "i18next": "23.11.5",
    "i18next-browser-languagedetector": "6.0.1",
-    "i18next-http-backend": "3.0.2",
-    "i18next-resources-to-backend": "1.2.1",
+    "i18next-http-backend": "1.0.23",
    "iframe-resizer-react": "1.1.0",
    "immer": "9.0.6",
    "immutable": "4.0.0-rc.12",
@@ -81,15 +79,12 @@
    "jquery-typeahead": "2.11.1",
    "jquery-ui-dist": "1.13.2",
    "knockout": "3.5.1",
-    "lodash": "4.17.23",
-    "lodash-es": "4.17.23",
-    "min-document": "2.19.1",
+    "loader-utils": "2.0.3",
    "mkdirp": "1.0.4",
    "monaco-editor": "0.44.0",
    "ms": "2.1.3",
-    "nanoid": "3.3.8",
    "p-retry": "6.2.1",
-    "patch-package": "8.0.1",
+    "patch-package": "8.0.0",
    "plotly.js-cartesian-dist-min": "1.52.3",
    "post-robot": "10.0.42",
    "q": "1.5.1",
@@ -108,6 +103,7 @@
    "react-youtube": "9.0.1",
    "reflect-metadata": "0.1.13",
    "rx-jupyter": "5.5.12",
+    "sanitize-html": "2.3.3",
    "shell-quote": "1.7.3",
    "styled-components": "5.0.1",
    "swr": "0.4.0",
@@ -115,30 +111,16 @@
    "tinykeys": "2.1.0",
    "underscore": "1.12.1",
    "utility-types": "3.10.0",
-    "uuid": "9.0.0",
    "web-vitals": "4.2.4",
-    "ws": "8.17.1",
+    "uuid": "9.0.0",
    "zustand": "3.5.0"
  },
-  "overrides": {
-    "d3-color": "3.1.0",
-    "cross-spawn": "7.0.6",
-    "less-vars-loader": {
-      "json5": "1.0.2"
-    },
-    "trim": "0.0.3",
-    "@octokit/plugin-paginate-rest": "9.2.2",
-    "@octokit/request-error": "5.1.1",
-    "@octokit/request": "8.4.1",
-    "prismjs": "1.30.0",
-    "sanitize-html": "2.17.0"
-  },
  "devDependencies": {
-    "@babel/core": "7.29.0",
+    "@babel/core": "7.24.7",
    "@babel/preset-env": "7.24.7",
    "@babel/preset-react": "7.24.7",
    "@babel/preset-typescript": "7.24.7",
-    "@playwright/test": "1.55.1",
+    "@playwright/test": "1.49.1",
    "@testing-library/react": "11.2.3",
    "@types/applicationinsights-js": "1.0.7",
    "@types/codemirror": "0.0.56",
@@ -152,7 +134,7 @@
    "@types/hasher": "0.0.31",
    "@types/jest": "29.5.12",
    "@types/jquery": "3.5.29",
-    "@types/node": "18.19.0",
+    "@types/node": "12.11.1",
    "@types/post-robot": "10.0.1",
    "@types/q": "1.5.1",
    "@types/react": "17.0.44",
@@ -163,7 +145,7 @@
    "@types/react-window": "1.8.8",
    "@types/sanitize-html": "1.27.2",
    "@types/sinon": "2.3.3",
-    "@types/styled-components": "5.1.32",
+    "@types/styled-components": "5.1.1",
    "@types/underscore": "1.7.36",
    "@types/youtube-player": "5.5.6",
    "@typescript-eslint/eslint-plugin": "6.7.4",
@@ -171,7 +153,6 @@
    "@webpack-cli/serve": "2.0.5",
    "babel-jest": "29.7.0",
    "babel-loader": "8.1.0",
-    "brace-expansion": "1.1.12",
    "buffer": "5.1.0",
    "case-sensitive-paths-webpack-plugin": "2.4.0",
    "create-file-webpack": "1.0.2",
@@ -189,7 +170,6 @@
    "html-inline-css-webpack-plugin": "1.11.2",
    "html-loader": "5.0.0",
    "html-webpack-plugin": "5.5.3",
-    "i18next-resources-for-ts": "2.0.0",
    "jest": "29.7.0",
    "jest-canvas-mock": "2.5.2",
    "jest-circus": "29.7.0",
@@ -197,8 +177,7 @@
    "jest-html-loader": "1.0.0",
    "jest-react-hooks-shallow": "1.5.1",
    "jest-trx-results-processor": "3.0.2",
-    "js-yaml": "3.14.2",
-    "less": "4.5.1",
+    "less": "3.8.1",
    "less-loader": "11.1.3",
    "less-vars-loader": "1.1.0",
    "mini-css-extract-plugin": "2.1.0",
@@ -216,17 +195,14 @@
    "typedoc": "0.26.2",
    "typescript": "4.9.5",
    "url-loader": "4.1.1",
-    "values-to-keys": "1.1.0",
-    "wait-on": "9.0.3",
-    "webpack": "5.104.1",
-    "webpack-bundle-analyzer": "5.2.0",
+    "wait-on": "4.0.2",
+    "webpack": "5.88.2",
+    "webpack-bundle-analyzer": "4.9.1",
    "webpack-cli": "5.1.4",
-    "webpack-dev-server": "5.2.3",
-    "ws": "8.17.1"
+    "webpack-dev-server": "4.15.2"
  },
  "scripts": {
-    "postinstall": "patch-package && npm run generate:i18n-keys",
-    "prestart": "npm run generate:i18n-keys",
+    "postinstall": "patch-package",
    "start": "webpack serve --mode development",
    "dev": "echo \"WARNING: npm run dev has been deprecated\" && npm run build",
    "build:dataExplorer:ci": "npm run build:ci",
@@ -253,7 +229,6 @@
    "strict:find": "node ./strict-null-checks/find.js",
    "strict:add": "node ./strict-null-checks/auto-add.js",
    "compile:fullStrict": "tsc -p ./tsconfig.json --strictNullChecks",
-    "generate:i18n-keys": "node utils/generateI18nKeys.mjs",
    "generateARMClients": "npx ts-node utils/armClientGenerator/generator.ts"
  },
  "repository": {
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -11,8 +11,8 @@ export default defineConfig({
  reporter: process.env.CI ? "blob" : "html",
  timeout: 10 * 60 * 1000,
  use: {
-    trace: "retain-on-failure",
-    video: "retain-on-failure",
+    trace: "off",
+    video: "off",
    screenshot: "on",
    testIdAttribute: "data-test",
    contextOptions: {
@@ -26,6 +26,15 @@ export default defineConfig({
  },

  projects: [
+    {
+      name: "chromium",
+      use: {
+        ...devices["Desktop Chrome"],
+        launchOptions: {
+          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
+        },
+      },
+    },
    {
      name: "firefox",
      use: {
--- a/preview/package-lock.json
+++ b/preview/package-lock.json
@@ -8,10 +8,9 @@
      "name": "cosmos-explorer-preview",
      "version": "1.0.0",
      "dependencies": {
-        "body-parser": "^2.2.2",
-        "express": "^5.2.1",
-        "follow-redirects": "^1.15.6",
-        "http-proxy-middleware": "^3.0.5",
+        "body-parser": "^1.20.3",
+        "express": "^4.21.2",
+        "http-proxy-middleware": "^3.0.3",
        "node": "^20.19.5",
        "node-fetch": "^2.6.1",
        "path-to-regexp": "^0.1.12"
@@ -19,7 +18,8 @@
    },
    "node_modules/@types/http-proxy": {
      "version": "1.17.16",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
      "dependencies": {
        "@types/node": "*"
      }
@@ -29,40 +29,50 @@
      "license": "MIT"
    },
    "node_modules/accepts": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
-      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
+      "version": "1.3.8",
+      "license": "MIT",
      "dependencies": {
-        "mime-types": "^3.0.0",
-        "negotiator": "^1.0.0"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
      },
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/body-parser": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz",
-      "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
      "dependencies": {
-        "bytes": "^3.1.2",
-        "content-type": "^1.0.5",
-        "debug": "^4.4.3",
-        "http-errors": "^2.0.0",
-        "iconv-lite": "^0.7.0",
-        "on-finished": "^2.4.1",
-        "qs": "^6.14.1",
-        "raw-body": "^3.0.1",
-        "type-is": "^2.0.1"
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
      },
      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
      }
    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
    "node_modules/bytes": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -73,7 +83,8 @@
    },
    "node_modules/call-bind-apply-helpers": {
      "version": "1.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
      "dependencies": {
        "es-errors": "^1.3.0",
        "function-bind": "^1.1.2"
@@ -84,7 +95,8 @@
    },
    "node_modules/call-bound": {
      "version": "1.0.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.2",
        "get-intrinsic": "^1.3.0"
@@ -97,15 +109,13 @@
      }
    },
    "node_modules/content-disposition": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
-      "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
-      "engines": {
-        "node": ">=18"
+      "version": "0.5.4",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+      "engines": {
+        "node": ">= 0.6"
      }
    },
    "node_modules/content-type": {
@@ -117,22 +127,20 @@
    },
    "node_modules/cookie": {
      "version": "0.7.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/cookie-signature": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
-      "engines": {
-        "node": ">=6.6.0"
-      }
+      "version": "1.0.6",
+      "license": "MIT"
    },
    "node_modules/debug": {
      "version": "4.4.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
      "dependencies": {
        "ms": "^2.1.3"
      },
@@ -152,9 +160,18 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
    "node_modules/dunder-proto": {
      "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.1",
        "es-errors": "^1.3.0",
@@ -178,21 +195,24 @@
    },
    "node_modules/es-define-property": {
      "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
      "engines": {
        "node": ">= 0.4"
      }
    },
    "node_modules/es-errors": {
      "version": "1.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
      "engines": {
        "node": ">= 0.4"
      }
    },
    "node_modules/es-object-atoms": {
      "version": "1.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
      "dependencies": {
        "es-errors": "^1.3.0"
      },
@@ -218,77 +238,104 @@
      "license": "MIT"
    },
    "node_modules/express": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
-      "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
      "dependencies": {
-        "accepts": "^2.0.0",
-        "body-parser": "^2.2.1",
-        "content-disposition": "^1.0.0",
-        "content-type": "^1.0.5",
-        "cookie": "^0.7.1",
-        "cookie-signature": "^1.2.1",
-        "debug": "^4.4.0",
-        "depd": "^2.0.0",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "finalhandler": "^2.1.0",
-        "fresh": "^2.0.0",
-        "http-errors": "^2.0.0",
-        "merge-descriptors": "^2.0.0",
-        "mime-types": "^3.0.0",
-        "on-finished": "^2.4.1",
-        "once": "^1.4.0",
-        "parseurl": "^1.3.3",
-        "proxy-addr": "^2.0.7",
-        "qs": "^6.14.0",
-        "range-parser": "^1.2.1",
-        "router": "^2.2.0",
-        "send": "^1.1.0",
-        "serve-static": "^2.2.0",
-        "statuses": "^2.0.1",
-        "type-is": "^2.0.1",
-        "vary": "^1.1.2"
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.7.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.3.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.3",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.12",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.13.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
      },
      "engines": {
-        "node": ">= 18"
+        "node": ">= 0.10.0"
      },
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/express"
      }
    },
+    "node_modules/express/node_modules/array-flatten": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
    "node_modules/finalhandler": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz",
-      "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
      "dependencies": {
-        "debug": "^4.4.0",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "on-finished": "^2.4.1",
-        "parseurl": "^1.3.3",
-        "statuses": "^2.0.1"
+        "debug": "2.6.9",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
      },
      "engines": {
-        "node": ">= 18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.8"
      }
    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
    "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.3",
      "funding": [
        {
          "type": "individual",
          "url": "https://github.com/sponsors/RubenVerborgh"
        }
      ],
+      "license": "MIT",
      "engines": {
        "node": ">=4.0"
      },
@@ -306,23 +353,25 @@
      }
    },
    "node_modules/fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
      "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
      }
    },
    "node_modules/function-bind": {
      "version": "1.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/get-intrinsic": {
      "version": "1.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.2",
        "es-define-property": "^1.0.1",
@@ -344,7 +393,8 @@
    },
    "node_modules/get-proto": {
      "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
      "dependencies": {
        "dunder-proto": "^1.0.1",
        "es-object-atoms": "^1.0.0"
@@ -355,7 +405,8 @@
    },
    "node_modules/gopd": {
      "version": "1.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -365,7 +416,8 @@
    },
    "node_modules/has-symbols": {
      "version": "1.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -375,7 +427,8 @@
    },
    "node_modules/hasown": {
      "version": "2.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
      "dependencies": {
        "function-bind": "^1.1.2"
      },
@@ -384,22 +437,17 @@
      }
    },
    "node_modules/http-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
+      "version": "2.0.0",
+      "license": "MIT",
      "dependencies": {
-        "depd": "~2.0.0",
-        "inherits": "~2.0.4",
-        "setprototypeof": "~1.2.0",
-        "statuses": "~2.0.2",
-        "toidentifier": "~1.0.1"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
      },
      "engines": {
        "node": ">= 0.8"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/http-proxy": {
@@ -432,7 +480,8 @@
    },
    "node_modules/http-proxy-middleware/node_modules/braces": {
      "version": "3.0.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
      "dependencies": {
        "fill-range": "^7.1.1"
      },
@@ -442,7 +491,8 @@
    },
    "node_modules/http-proxy-middleware/node_modules/fill-range": {
      "version": "7.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -452,14 +502,16 @@
    },
    "node_modules/http-proxy-middleware/node_modules/is-number": {
      "version": "7.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
      "engines": {
        "node": ">=0.12.0"
      }
    },
    "node_modules/http-proxy-middleware/node_modules/micromatch": {
      "version": "4.0.8",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
      "dependencies": {
        "braces": "^3.0.3",
        "picomatch": "^2.3.1"
@@ -470,7 +522,8 @@
    },
    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
      "version": "5.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
      "dependencies": {
        "is-number": "^7.0.0"
      },
@@ -479,18 +532,14 @@
      }
    },
    "node_modules/iconv-lite": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
-      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "safer-buffer": ">= 2.1.2 < 3"
      },
      "engines": {
        "node": ">=0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/inherits": {
@@ -521,58 +570,62 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/is-promise": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
-    },
    "node_modules/math-intrinsics": {
      "version": "1.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
      "engines": {
        "node": ">= 0.4"
      }
    },
    "node_modules/media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+      "version": "0.3.0",
+      "license": "MIT",
      "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
      }
    },
    "node_modules/merge-descriptors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
-      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
-      "engines": {
-        "node": ">=18"
-      },
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "version": "1.52.0",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/mime-types": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
-      "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
+      "version": "2.1.35",
+      "license": "MIT",
      "dependencies": {
-        "mime-db": "^1.54.0"
+        "mime-db": "1.52.0"
      },
      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.6"
      }
    },
    "node_modules/ms": {
@@ -580,27 +633,32 @@
      "license": "MIT"
    },
    "node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "version": "0.6.3",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/node": {
      "version": "20.19.5",
+      "resolved": "https://registry.npmjs.org/node/-/node-20.19.5.tgz",
+      "integrity": "sha512-9fJOHEP8AVrwpbhlUxnbudW8IbkseQVxl4yNQyI/rDfP+gNwKEmfPtBc/Luyf677i5Y0HKIBHiApiB9S9vvxKw==",
      "hasInstallScript": true,
-      "license": "ISC",
      "dependencies": {
        "node-bin-setup": "^1.0.0"
      },
      "bin": {
-        "node": "bin/node.exe"
+        "node": "bin/node"
      },
      "engines": {
        "npm": ">=5.0.0"
      }
    },
+    "node_modules/node-bin-setup": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/node-bin-setup/-/node-bin-setup-1.1.4.tgz",
+      "integrity": "sha512-vWNHOne0ZUavArqPP5LJta50+S8R261Fr5SvGul37HbEDcowvLjwdvd0ZeSr0r2lTSrPxl6okq9QUw8BFGiAxA=="
+    },
    "node_modules/node-fetch": {
      "version": "2.6.7",
      "license": "MIT",
@@ -619,13 +677,10 @@
        }
      }
    },
-    "node_modules/node/node_modules/node-bin-setup": {
-      "version": "1.1.4",
-      "license": "ISC"
-    },
    "node_modules/object-inspect": {
      "version": "1.13.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -643,14 +698,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
    "node_modules/parseurl": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -661,7 +708,8 @@
    },
    "node_modules/path-to-regexp": {
      "version": "0.1.12",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -692,10 +740,11 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.14.1",
-      "license": "BSD-3-Clause",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
      "dependencies": {
-        "side-channel": "^1.1.0"
+        "side-channel": "^1.0.6"
      },
      "engines": {
        "node": ">=0.6"
@@ -713,46 +762,40 @@
      }
    },
    "node_modules/raw-body": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz",
-      "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
      "dependencies": {
-        "bytes": "~3.1.2",
-        "http-errors": "~2.0.1",
-        "iconv-lite": "~0.7.0",
-        "unpipe": "~1.0.0"
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
      },
      "engines": {
-        "node": ">= 0.10"
+        "node": ">= 0.8"
      }
    },
    "node_modules/requires-port": {
      "version": "1.0.0",
      "license": "MIT"
    },
-    "node_modules/router": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
-      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
-      "dependencies": {
-        "debug": "^4.4.0",
-        "depd": "^2.0.0",
-        "is-promise": "^4.0.0",
-        "parseurl": "^1.3.3",
-        "path-to-regexp": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/router/node_modules/path-to-regexp": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
-      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
    },
    "node_modules/safer-buffer": {
      "version": "2.1.2",
@@ -760,46 +803,61 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "node_modules/send": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz",
-      "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
      "dependencies": {
-        "debug": "^4.4.3",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "fresh": "^2.0.0",
-        "http-errors": "^2.0.1",
-        "mime-types": "^3.0.2",
-        "ms": "^2.1.3",
-        "on-finished": "^2.4.1",
-        "range-parser": "^1.2.1",
-        "statuses": "^2.0.2"
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
      },
      "engines": {
-        "node": ">= 18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
      }
    },
    "node_modules/serve-static": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz",
-      "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
      "dependencies": {
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "parseurl": "^1.3.3",
-        "send": "^1.2.0"
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.19.0"
      },
      "engines": {
-        "node": ">= 18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.8.0"
      }
    },
    "node_modules/setprototypeof": {
@@ -808,7 +866,8 @@
    },
    "node_modules/side-channel": {
      "version": "1.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
      "dependencies": {
        "es-errors": "^1.3.0",
        "object-inspect": "^1.13.3",
@@ -825,7 +884,8 @@
    },
    "node_modules/side-channel-list": {
      "version": "1.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
      "dependencies": {
        "es-errors": "^1.3.0",
        "object-inspect": "^1.13.3"
@@ -839,7 +899,8 @@
    },
    "node_modules/side-channel-map": {
      "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
      "dependencies": {
        "call-bound": "^1.0.2",
        "es-errors": "^1.3.0",
@@ -855,7 +916,8 @@
    },
    "node_modules/side-channel-weakmap": {
      "version": "1.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
      "dependencies": {
        "call-bound": "^1.0.2",
        "es-errors": "^1.3.0",
@@ -871,9 +933,8 @@
      }
    },
    "node_modules/statuses": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "version": "2.0.1",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
@@ -890,13 +951,11 @@
      "license": "MIT"
    },
    "node_modules/type-is": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+      "version": "1.6.18",
+      "license": "MIT",
      "dependencies": {
-        "content-type": "^1.0.5",
-        "media-typer": "^1.1.0",
-        "mime-types": "^3.0.0"
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
      },
      "engines": {
        "node": ">= 0.6"
@@ -909,6 +968,13 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
    "node_modules/vary": {
      "version": "1.1.2",
      "license": "MIT",
@@ -927,11 +993,6 @@
        "tr46": "~0.0.3",
        "webidl-conversions": "^3.0.0"
      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
    }
  }
 }
--- a/preview/package.json
+++ b/preview/package.json
@@ -11,10 +11,9 @@
  "keywords": [],
  "author": "Microsoft Corporation",
  "dependencies": {
-    "body-parser": "^2.2.2",
-    "express": "^5.2.1",
-    "follow-redirects": "^1.15.6",
-    "http-proxy-middleware": "^3.0.5",
+    "body-parser": "^1.20.3",
+    "express": "^4.21.2",
+    "http-proxy-middleware": "^3.0.3",
    "node": "^20.19.5",
    "node-fetch": "^2.6.1",
    "path-to-regexp": "^0.1.12"
--- a/src/@types/i18next.d.ts
+++ b/src/@types/i18next.d.ts
@@ -1,11 +0,0 @@
-import "i18next";
-import Resources from "Localization/en/Resources.json";
-
-declare module "i18next" {
-  interface CustomTypeOptions {
-    defaultNS: "Resources";
-    resources: {
-      Resources: typeof Resources;
-    };
-  }
-}
--- a/src/Common/ErrorHandlingUtils.ts
+++ b/src/Common/ErrorHandlingUtils.ts
@@ -1,7 +1,5 @@
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { SubscriptionType } from "../Contracts/SubscriptionType";
-import { isExpectedError } from "../Metrics/ErrorClassification";
-import { scenarioMonitor } from "../Metrics/ScenarioMonitor";
 import { userContext } from "../UserContext";
 import { ARMError } from "../Utils/arm/request";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
@@ -9,36 +7,19 @@ import { HttpStatusCodes } from "./Constants";
 import { logError } from "./Logger";
 import { sendMessage } from "./MessageHandler";

-export interface HandleErrorOptions {
-  /** Optional redacted error to use for telemetry logging instead of the original error */
-  redactedError?: string | ARMError | Error;
-}
-
-export const handleError = (
-  error: string | ARMError | Error,
-  area: string,
-  consoleErrorPrefix?: string,
-  options?: HandleErrorOptions,
-): void => {
+export const handleError = (error: string | ARMError | Error, area: string, consoleErrorPrefix?: string): void => {
  const errorMessage = getErrorMessage(error);
  const errorCode = error instanceof ARMError ? error.code : undefined;

-  // logs error to data explorer console (always shows original, non-redacted message)
+  // logs error to data explorer console
  const consoleErrorMessage = consoleErrorPrefix ? `${consoleErrorPrefix}:\n ${errorMessage}` : errorMessage;
  logConsoleError(consoleErrorMessage);

-  // logs error to both app insight and kusto (use redacted message if provided)
-  const telemetryErrorMessage = options?.redactedError ? getErrorMessage(options.redactedError) : errorMessage;
-  logError(telemetryErrorMessage, area, errorCode);
+  // logs error to both app insight and kusto
+  logError(errorMessage, area, errorCode);

  // checks for errors caused by firewall and sends them to portal to handle
  sendNotificationForError(errorMessage, errorCode);
-
-  // Mark expected failures for health metrics (auth, firewall, permissions, etc.)
-  // This ensures timeouts with expected failures emit healthy instead of unhealthy
-  if (isExpectedError(error)) {
-    scenarioMonitor.markExpectedFailure();
-  }
 };

 export const getErrorMessage = (error: string | Error = ""): string => {
--- a/src/Common/LoadingOverlay.tsx
+++ b/src/Common/LoadingOverlay.tsx
@@ -1,5 +1,4 @@
 import { Overlay, Spinner, SpinnerSize } from "@fluentui/react";
-import { useThemeStore } from "hooks/useTheme";
 import React from "react";

 interface LoadingOverlayProps {
@@ -8,17 +7,15 @@ interface LoadingOverlayProps {
 }

 const LoadingOverlay: React.FC<LoadingOverlayProps> = ({ isLoading, label }) => {
-  const isDarkMode = useThemeStore((state) => state.isDarkMode);
  if (!isLoading) {
    return null;
  }

  return (
    <Overlay
-      data-test="loading-overlay"
      styles={{
        root: {
-          backgroundColor: isDarkMode ? "rgba(32, 31, 30, 0.9)" : "rgba(255,255,255,0.9)",
+          backgroundColor: "rgba(255,255,255,0.9)",
          zIndex: 9999,
          display: "flex",
          alignItems: "center",
@@ -26,11 +23,7 @@ const LoadingOverlay: React.FC<LoadingOverlayProps> = ({ isLoading, label }) =>
        },
      }}
    >
-      <Spinner
-        size={SpinnerSize.large}
-        label={label}
-        styles={{ label: { fontWeight: 600, color: isDarkMode ? "#ffffff" : "#323130" } }}
-      />
+      <Spinner size={SpinnerSize.large} label={label} styles={{ label: { fontWeight: 600 } }} />
    </Overlay>
  );
 };
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -38,7 +38,7 @@ export function queryIterator(databaseId: string, collection: Collection, query:
  let continuationToken: string;
  return {
    fetchNext: () => {
-      return queryDocuments(databaseId, collection, false, query, continuationToken).then((response) => {
+      return queryDocuments(databaseId, collection, false, query).then((response) => {
        continuationToken = response.continuationToken;
        const headers: { [key: string]: string | number } = {};
        response.headers.forEach((value, key) => {
--- a/src/Common/Pager/Pager.css
+++ b/src/Common/Pager/Pager.css
@@ -11,14 +11,3 @@
  gap: 8px;
  align-items: center;
 }
-
-/* Override dark mode inherit for pagination icons */
-body.isDarkMode .pager-container .ms-Button .ms-Button-icon,
-body.isDarkMode .pager-container .ms-Button i {
-  color: var(--colorBrandForeground1);
-}
-
-body.isDarkMode .pager-container .ms-Button:disabled .ms-Button-icon,
-body.isDarkMode .pager-container .ms-Button:disabled i {
-  color: var(--colorNeutralForegroundDisabled);
-}
--- a/src/Common/Pager/index.tsx
+++ b/src/Common/Pager/index.tsx
@@ -59,7 +59,7 @@ const Pager: React.FC<PagerProps> = ({
  return (
    <div className={className || "pager-container"}>
      {showItemCount && (
-        <Text className="themeText">
+        <Text>
          Showing {startIndex + 1} - {endIndex} of {totalCount} items
        </Text>
      )}
@@ -82,7 +82,7 @@ const Pager: React.FC<PagerProps> = ({
          disabled={disabled || currentPage === 1}
          styles={iconButtonStyles}
        />
-        <Text className="themeText">
+        <Text>
          Page {currentPage} of {totalPages}
        </Text>
        <IconButton
--- a/src/Common/SearchableDropdown.styles.ts
+++ b/src/Common/SearchableDropdown.styles.ts
@@ -1,78 +0,0 @@
-import { IButtonStyles, IStackStyles, ITextStyles } from "@fluentui/react";
-import * as React from "react";
-
-export const getDropdownButtonStyles = (disabled: boolean): IButtonStyles => ({
-  root: {
-    width: "100%",
-    height: "32px",
-    padding: "0 28px 0 8px",
-    border: "1px solid #8a8886",
-    background: "#fff",
-    color: "#323130",
-    textAlign: "left",
-    cursor: disabled ? "not-allowed" : "pointer",
-    position: "relative",
-  },
-  flexContainer: {
-    justifyContent: "flex-start",
-  },
-  label: {
-    fontWeight: "normal",
-    fontSize: "14px",
-    textAlign: "left",
-  },
-});
-
-export const buttonLabelStyles: ITextStyles = {
-  root: {
-    overflow: "hidden",
-    textOverflow: "ellipsis",
-    whiteSpace: "nowrap",
-    display: "block",
-    textAlign: "left",
-  },
-};
-
-export const buttonWrapperStyles: React.CSSProperties = {
-  position: "relative",
-  width: "100%",
-};
-
-export const chevronStyles: React.CSSProperties = {
-  position: "absolute",
-  right: "8px",
-  top: "50%",
-  transform: "translateY(-50%)",
-  pointerEvents: "none",
-  fontSize: "12px",
-};
-
-export const calloutContentStyles: IStackStyles = {
-  root: {
-    display: "flex",
-    flexDirection: "column",
-  },
-};
-
-export const listContainerStyles: IStackStyles = {
-  root: {
-    maxHeight: "300px",
-    overflowY: "auto",
-  },
-};
-
-export const getItemStyles = (isSelected: boolean): React.CSSProperties => ({
-  padding: "8px 12px",
-  cursor: "pointer",
-  fontSize: "14px",
-  backgroundColor: isSelected ? "#e6e6e6" : "transparent",
-  textAlign: "left",
-});
-
-export const emptyMessageStyles: ITextStyles = {
-  root: {
-    padding: "8px 12px",
-    color: "#605e5c",
-    textAlign: "left",
-  },
-};
--- a/src/Common/SearchableDropdown.test.tsx
+++ b/src/Common/SearchableDropdown.test.tsx
@@ -1,200 +0,0 @@
-import { fireEvent, render, screen } from "@testing-library/react";
-import "@testing-library/jest-dom";
-import React from "react";
-import { SearchableDropdown } from "./SearchableDropdown";
-
-interface TestItem {
-  id: string;
-  name: string;
-}
-
-describe("SearchableDropdown", () => {
-  const mockItems: TestItem[] = [
-    { id: "1", name: "Item One" },
-    { id: "2", name: "Item Two" },
-    { id: "3", name: "Item Three" },
-  ];
-
-  const defaultProps = {
-    label: "Test Label",
-    items: mockItems,
-    selectedItem: null as TestItem | null,
-    onSelect: jest.fn(),
-    getKey: (item: TestItem) => item.id,
-    getDisplayText: (item: TestItem) => item.name,
-    placeholder: "Select an item",
-    filterPlaceholder: "Filter items",
-    className: "test-dropdown",
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("should render with label and placeholder", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-    expect(screen.getByText("Test Label")).toBeInTheDocument();
-    expect(screen.getByText("Select an item")).toBeInTheDocument();
-  });
-
-  it("should display selected item", () => {
-    const propsWithSelection = {
-      ...defaultProps,
-      selectedItem: mockItems[0],
-    };
-    render(<SearchableDropdown {...propsWithSelection} />);
-    expect(screen.getByText("Item One")).toBeInTheDocument();
-  });
-
-  it("should show 'No items found' when items array is empty", () => {
-    const propsWithEmptyItems = {
-      ...defaultProps,
-      items: [] as TestItem[],
-    };
-    render(<SearchableDropdown {...propsWithEmptyItems} />);
-    expect(screen.getByText("No Test Labels Found")).toBeInTheDocument();
-  });
-
-  it("should open dropdown when button is clicked", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-    expect(screen.getByPlaceholderText("Filter items")).toBeInTheDocument();
-  });
-
-  it("should filter items based on search text", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    const searchBox = screen.getByPlaceholderText("Filter items");
-    fireEvent.change(searchBox, { target: { value: "Two" } });
-
-    expect(screen.getByText("Item Two")).toBeInTheDocument();
-    expect(screen.queryByText("Item One")).not.toBeInTheDocument();
-    expect(screen.queryByText("Item Three")).not.toBeInTheDocument();
-  });
-
-  it("should call onSelect when an item is clicked", () => {
-    const onSelectMock = jest.fn();
-    const propsWithMock = {
-      ...defaultProps,
-      onSelect: onSelectMock,
-    };
-    render(<SearchableDropdown {...propsWithMock} />);
-
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    const item = screen.getByText("Item Two");
-    fireEvent.click(item);
-
-    expect(onSelectMock).toHaveBeenCalledWith(mockItems[1]);
-  });
-
-  it("should close dropdown after selecting an item", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    expect(screen.getByPlaceholderText("Filter items")).toBeInTheDocument();
-
-    const item = screen.getByText("Item One");
-    fireEvent.click(item);
-
-    expect(screen.queryByPlaceholderText("Filter items")).not.toBeInTheDocument();
-  });
-
-  it("should disable button when disabled prop is true", () => {
-    const propsWithDisabled = {
-      ...defaultProps,
-      disabled: true,
-    };
-    render(<SearchableDropdown {...propsWithDisabled} />);
-
-    const button = screen.getByRole("button");
-    expect(button).toBeDisabled();
-  });
-
-  it("should not open dropdown when disabled", () => {
-    const propsWithDisabled = {
-      ...defaultProps,
-      disabled: true,
-    };
-    render(<SearchableDropdown {...propsWithDisabled} />);
-
-    const button = screen.getByRole("button");
-    fireEvent.click(button);
-
-    expect(screen.queryByPlaceholderText("Filter items")).not.toBeInTheDocument();
-  });
-
-  it("should show 'No items found' when search yields no results", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    const searchBox = screen.getByPlaceholderText("Filter items");
-    fireEvent.change(searchBox, { target: { value: "Nonexistent" } });
-
-    expect(screen.getByText("No items found")).toBeInTheDocument();
-  });
-
-  it("should handle case-insensitive filtering", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    const searchBox = screen.getByPlaceholderText("Filter items");
-    fireEvent.change(searchBox, { target: { value: "two" } });
-
-    expect(screen.getByText("Item Two")).toBeInTheDocument();
-    expect(screen.queryByText("Item One")).not.toBeInTheDocument();
-  });
-
-  it("should clear filter text when dropdown is closed and reopened", () => {
-    render(<SearchableDropdown {...defaultProps} />);
-
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    const searchBox = screen.getByPlaceholderText("Filter items");
-    fireEvent.change(searchBox, { target: { value: "Two" } });
-
-    // Close dropdown by selecting an item
-    const item = screen.getByText("Item Two");
-    fireEvent.click(item);
-
-    // Reopen dropdown
-    fireEvent.click(button);
-
-    // Filter text should be cleared
-    const reopenedSearchBox = screen.getByPlaceholderText("Filter items");
-    expect(reopenedSearchBox).toHaveValue("");
-  });
-
-  it("should use custom placeholder text", () => {
-    const propsWithCustomPlaceholder = {
-      ...defaultProps,
-      placeholder: "Choose an option",
-    };
-    render(<SearchableDropdown {...propsWithCustomPlaceholder} />);
-    expect(screen.getByText("Choose an option")).toBeInTheDocument();
-  });
-
-  it("should use custom filter placeholder text", () => {
-    const propsWithCustomFilterPlaceholder = {
-      ...defaultProps,
-      filterPlaceholder: "Search here",
-    };
-    render(<SearchableDropdown {...propsWithCustomFilterPlaceholder} />);
-
-    const button = screen.getByText("Select an item");
-    fireEvent.click(button);
-
-    expect(screen.getByPlaceholderText("Search here")).toBeInTheDocument();
-  });
-});
--- a/src/Common/SearchableDropdown.tsx
+++ b/src/Common/SearchableDropdown.tsx
@@ -1,155 +0,0 @@
-import {
-  Callout,
-  DefaultButton,
-  DirectionalHint,
-  Icon,
-  ISearchBoxStyles,
-  Label,
-  SearchBox,
-  Stack,
-  Text,
-} from "@fluentui/react";
-import * as React from "react";
-import { useMemo, useRef, useState } from "react";
-import {
-  buttonLabelStyles,
-  buttonWrapperStyles,
-  calloutContentStyles,
-  chevronStyles,
-  emptyMessageStyles,
-  getDropdownButtonStyles,
-  getItemStyles,
-  listContainerStyles,
-} from "./SearchableDropdown.styles";
-
-interface SearchableDropdownProps<T> {
-  label: string;
-  items: T[];
-  selectedItem: T | null;
-  onSelect: (item: T) => void;
-  getKey: (item: T) => string;
-  getDisplayText: (item: T) => string;
-  placeholder?: string;
-  filterPlaceholder?: string;
-  className?: string;
-  disabled?: boolean;
-  onDismiss?: () => void;
-  searchBoxStyles?: Partial<ISearchBoxStyles>;
-}
-
-export const SearchableDropdown = <T,>({
-  label,
-  items,
-  selectedItem,
-  onSelect,
-  getKey,
-  getDisplayText,
-  placeholder = "Select an item",
-  filterPlaceholder = "Filter items",
-  className,
-  disabled = false,
-  onDismiss,
-  searchBoxStyles: customSearchBoxStyles,
-}: SearchableDropdownProps<T>): React.ReactElement => {
-  const [isOpen, setIsOpen] = useState(false);
-  const [filterText, setFilterText] = useState("");
-  const buttonRef = useRef<HTMLDivElement>(null);
-
-  const closeDropdown = () => {
-    setIsOpen(false);
-    setFilterText("");
-  };
-
-  const filteredItems = useMemo(
-    () => items?.filter((item) => getDisplayText(item).toLowerCase().includes(filterText.toLowerCase())),
-    [items, filterText, getDisplayText],
-  );
-
-  const handleDismiss = () => {
-    closeDropdown();
-    onDismiss?.();
-  };
-
-  const handleButtonClick = () => {
-    if (disabled) {
-      return;
-    }
-
-    setIsOpen(!isOpen);
-  };
-
-  const handleSelect = (item: T) => {
-    onSelect(item);
-    closeDropdown();
-  };
-
-  const buttonLabel = selectedItem
-    ? getDisplayText(selectedItem)
-    : items?.length === 0
-    ? `No ${label}s Found`
-    : placeholder;
-
-  const buttonId = `${className}-button`;
-  const buttonStyles = getDropdownButtonStyles(disabled);
-
-  return (
-    <Stack>
-      <Label htmlFor={buttonId}>{label}</Label>
-      <div ref={buttonRef} style={buttonWrapperStyles}>
-        <DefaultButton
-          id={buttonId}
-          className={className}
-          onClick={handleButtonClick}
-          styles={buttonStyles}
-          disabled={disabled}
-        >
-          <Text styles={buttonLabelStyles}>{buttonLabel}</Text>
-        </DefaultButton>
-        <Icon iconName="ChevronDown" style={chevronStyles} />
-      </div>
-      {isOpen && (
-        <Callout
-          target={buttonRef.current}
-          onDismiss={handleDismiss}
-          directionalHint={DirectionalHint.bottomLeftEdge}
-          isBeakVisible={false}
-          gapSpace={0}
-          setInitialFocus
-        >
-          <Stack styles={calloutContentStyles} style={{ width: buttonRef.current?.offsetWidth || 300 }}>
-            <SearchBox
-              placeholder={filterPlaceholder}
-              value={filterText}
-              onChange={(_, newValue) => setFilterText(newValue || "")}
-              styles={customSearchBoxStyles}
-              showIcon={true}
-            />
-            <Stack styles={listContainerStyles}>
-              {filteredItems && filteredItems.length > 0 ? (
-                filteredItems.map((item) => {
-                  const key = getKey(item);
-                  const isSelected = selectedItem ? getKey(selectedItem) === key : false;
-                  return (
-                    <div
-                      key={key}
-                      onClick={() => handleSelect(item)}
-                      style={getItemStyles(isSelected)}
-                      onMouseEnter={(e) => (e.currentTarget.style.backgroundColor = "#f3f2f1")}
-                      onMouseLeave={(e) =>
-                        (e.currentTarget.style.backgroundColor = isSelected ? "#e6e6e6" : "transparent")
-                      }
-                    >
-                      <Text>{getDisplayText(item)}</Text>
-                    </div>
-                  );
-                })
-              ) : (
-                <Text styles={emptyMessageStyles}>No items found</Text>
-              )}
-            </Stack>
-          </Stack>
-        </Callout>
-      )}
-    </Stack>
-  );
-};
--- a/src/Common/snapshots/LoadingOverlay.test.tsx.snap
+++ b/src/Common/snapshots/LoadingOverlay.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`LoadingOverlay should handle long labels properly 1`] = `
 <div
  class="ms-Overlay root-109"
-  data-test="loading-overlay"
 >
  <div
    class="ms-Spinner root-111"
@@ -23,7 +22,6 @@ exports[`LoadingOverlay should handle long labels properly 1`] = `
 exports[`LoadingOverlay should render loading overlay when isLoading is true 1`] = `
 <div
  class="ms-Overlay root-109"
-  data-test="loading-overlay"
 >
  <div
    class="ms-Spinner root-111"
@@ -43,7 +41,6 @@ exports[`LoadingOverlay should render loading overlay when isLoading is true 1`]
 exports[`LoadingOverlay should render loading overlay with custom label 1`] = `
 <div
  class="ms-Overlay root-109"
-  data-test="loading-overlay"
 >
  <div
    class="ms-Spinner root-111"
@@ -63,7 +60,6 @@ exports[`LoadingOverlay should render loading overlay with custom label 1`] = `
 exports[`LoadingOverlay should render loading overlay with empty label 1`] = `
 <div
  class="ms-Overlay root-109"
-  data-test="loading-overlay"
 >
  <div
    class="ms-Spinner root-111"
--- a/src/Common/dataAccess/createCollection.ts
+++ b/src/Common/dataAccess/createCollection.ts
@@ -34,7 +34,6 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
          databaseId: params.databaseId,
          databaseLevelThroughput: params.databaseLevelThroughput,
          offerThroughput: params.offerThroughput,
-          targetAccountOverride: params.targetAccountOverride,
        };
        await createDatabase(createDatabaseParams);
      }
@@ -64,7 +63,7 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
 };

 const createCollectionWithARM = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  if (!params.createNewDatabase && !params.targetAccountOverride) {
+  if (!params.createNewDatabase) {
    const isValid = await useDatabases.getState().validateCollectionId(params.databaseId, params.collectionId);
    if (!isValid) {
      const collectionName = getCollectionName().toLocaleLowerCase();
@@ -123,9 +122,9 @@ const createSqlContainer = async (params: DataModels.CreateCollectionParams): Pr
  };

  const createResponse = await createUpdateSqlContainer(
-    params.targetAccountOverride?.subscriptionId ?? userContext.subscriptionId,
-    params.targetAccountOverride?.resourceGroup ?? userContext.resourceGroup,
-    params.targetAccountOverride?.accountName ?? userContext.databaseAccount.name,
+    userContext.subscriptionId,
+    userContext.resourceGroup,
+    userContext.databaseAccount.name,
    params.databaseId,
    params.collectionId,
    rpPayload,
--- a/src/Common/dataAccess/createDatabase.test.ts
+++ b/src/Common/dataAccess/createDatabase.test.ts
@@ -1,134 +0,0 @@
-jest.mock("../../Utils/arm/request");
-jest.mock("../CosmosClient");
-jest.mock("../../Utils/arm/generatedClients/cosmos/sqlResources");
-
-import ko from "knockout";
-import { AuthType } from "../../AuthType";
-import { CreateDatabaseParams, DatabaseAccount } from "../../Contracts/DataModels";
-import * as ViewModels from "../../Contracts/ViewModels";
-import { useDatabases } from "../../Explorer/useDatabases";
-import { updateUserContext } from "../../UserContext";
-import { createUpdateSqlDatabase } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
-import { SqlDatabaseGetResults } from "../../Utils/arm/generatedClients/cosmos/types";
-import { createDatabase } from "./createDatabase";
-
-const mockCreateUpdateSqlDatabase = createUpdateSqlDatabase as jest.MockedFunction<typeof createUpdateSqlDatabase>;
-
-describe("createDatabase", () => {
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: { name: "default-account" } as DatabaseAccount,
-      subscriptionId: "default-subscription",
-      resourceGroup: "default-rg",
-      apiType: "SQL",
-      authType: AuthType.AAD,
-    });
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockCreateUpdateSqlDatabase.mockResolvedValue({
-      properties: { resource: { id: "db", _rid: "", _self: "", _ts: 0, _etag: "" } },
-    } as SqlDatabaseGetResults);
-    useDatabases.setState({
-      databases: [],
-      validateDatabaseId: () => true,
-    } as unknown as ReturnType<typeof useDatabases.getState>);
-  });
-
-  it("should call ARM createUpdateSqlDatabase when logged in with AAD", async () => {
-    await createDatabase({ databaseId: "testDb" });
-    expect(mockCreateUpdateSqlDatabase).toHaveBeenCalled();
-  });
-
-  describe("targetAccountOverride behavior", () => {
-    it("should use targetAccountOverride subscriptionId, resourceGroup, and accountName for SQL DB creation", async () => {
-      const params: CreateDatabaseParams = {
-        databaseId: "testDb",
-        targetAccountOverride: {
-          subscriptionId: "override-sub",
-          resourceGroup: "override-rg",
-          accountName: "override-account",
-        },
-      };
-
-      await createDatabase(params);
-
-      expect(mockCreateUpdateSqlDatabase).toHaveBeenCalledWith(
-        "override-sub",
-        "override-rg",
-        "override-account",
-        "testDb",
-        expect.any(Object),
-      );
-    });
-
-    it("should use userContext values when targetAccountOverride is not provided", async () => {
-      await createDatabase({ databaseId: "testDb" });
-
-      expect(mockCreateUpdateSqlDatabase).toHaveBeenCalledWith(
-        "default-subscription",
-        "default-rg",
-        "default-account",
-        "testDb",
-        expect.any(Object),
-      );
-    });
-
-    it("should skip validateDatabaseId check when targetAccountOverride is provided", async () => {
-      // Simulate database already existing — validateDatabaseId returns false
-      useDatabases.setState({
-        databases: [{ id: ko.observable("testDb") } as unknown as ViewModels.Database],
-        validateDatabaseId: () => false,
-      } as unknown as ReturnType<typeof useDatabases.getState>);
-
-      const params: CreateDatabaseParams = {
-        databaseId: "testDb",
-        targetAccountOverride: {
-          subscriptionId: "override-sub",
-          resourceGroup: "override-rg",
-          accountName: "override-account",
-        },
-      };
-
-      // Should NOT throw even though the normal duplicate check would fail
-      await expect(createDatabase(params)).resolves.not.toThrow();
-      expect(mockCreateUpdateSqlDatabase).toHaveBeenCalled();
-    });
-
-    it("should throw if validateDatabaseId returns false and no targetAccountOverride is set", async () => {
-      useDatabases.setState({
-        databases: [{ id: ko.observable("existingDb") } as unknown as ViewModels.Database],
-        validateDatabaseId: () => false,
-      } as unknown as ReturnType<typeof useDatabases.getState>);
-
-      await expect(createDatabase({ databaseId: "existingDb" })).rejects.toThrow();
-      expect(mockCreateUpdateSqlDatabase).not.toHaveBeenCalled();
-    });
-
-    it("should pass databaseId in request payload regardless of targetAccountOverride", async () => {
-      const params: CreateDatabaseParams = {
-        databaseId: "my-database",
-        targetAccountOverride: {
-          subscriptionId: "any-sub",
-          resourceGroup: "any-rg",
-          accountName: "any-account",
-        },
-      };
-
-      await createDatabase(params);
-
-      expect(mockCreateUpdateSqlDatabase).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.any(String),
-        expect.any(String),
-        "my-database",
-        expect.objectContaining({
-          properties: expect.objectContaining({
-            resource: expect.objectContaining({ id: "my-database" }),
-          }),
-        }),
-      );
-    });
-  });
-});
--- a/src/Common/dataAccess/createDatabase.ts
+++ b/src/Common/dataAccess/createDatabase.ts
@@ -41,7 +41,7 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
 }

 async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  if (!params.targetAccountOverride && !useDatabases.getState().validateDatabaseId(params.databaseId)) {
+  if (!useDatabases.getState().validateDatabaseId(params.databaseId)) {
    const databaseName = getDatabaseName().toLocaleLowerCase();
    throw new Error(`Create ${databaseName} failed: ${databaseName} with id ${params.databaseId} already exists`);
  }
@@ -72,10 +72,13 @@ async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promi
      options,
    },
  };
-  const sub = params.targetAccountOverride?.subscriptionId ?? userContext.subscriptionId;
-  const rg = params.targetAccountOverride?.resourceGroup ?? userContext.resourceGroup;
-  const acct = params.targetAccountOverride?.accountName ?? userContext.databaseAccount.name;
-  const createResponse = await createUpdateSqlDatabase(sub, rg, acct, params.databaseId, rpPayload);
+  const createResponse = await createUpdateSqlDatabase(
+    userContext.subscriptionId,
+    userContext.resourceGroup,
+    userContext.databaseAccount.name,
+    params.databaseId,
+    rpPayload,
+  );
  return createResponse && (createResponse.properties.resource as DataModels.Database);
 }

--- a/src/Common/dataAccess/createStoredProcedure.ts
+++ b/src/Common/dataAccess/createStoredProcedure.ts
@@ -9,7 +9,7 @@ import {
  SqlStoredProcedureCreateUpdateParameters,
  SqlStoredProcedureResource,
 } from "../../Utils/arm/generatedClients/cosmos/types";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";

@@ -20,7 +20,6 @@ export async function createStoredProcedure(
 ): Promise<StoredProcedureDefinition & Resource> {
  const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
  try {
-    let resource: StoredProcedureDefinition & Resource;
    if (
      userContext.authType === AuthType.AAD &&
      !userContext.features.enableSDKoperations &&
@@ -61,16 +60,14 @@ export async function createStoredProcedure(
        storedProcedure.id,
        createSprocParams,
      );
-      resource = rpResponse && (rpResponse.properties?.resource as StoredProcedureDefinition & Resource);
-    } else {
-      const response = await client()
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.storedProcedures.create(storedProcedure);
-      resource = response.resource;
+      return rpResponse && (rpResponse.properties?.resource as StoredProcedureDefinition & Resource);
    }
-    logConsoleInfo(`Successfully created stored procedure ${storedProcedure.id}`);
-    return resource;
+
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.storedProcedures.create(storedProcedure);
+    return response?.resource;
  } catch (error) {
    handleError(error, "CreateStoredProcedure", `Error while creating stored procedure ${storedProcedure.id}`);
    throw error;
--- a/src/Common/dataAccess/createTrigger.ts
+++ b/src/Common/dataAccess/createTrigger.ts
@@ -3,7 +3,7 @@ import { AuthType } from "../../AuthType";
 import { userContext } from "../../UserContext";
 import { createUpdateSqlTrigger, getSqlTrigger } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
 import { SqlTriggerCreateUpdateParameters, SqlTriggerResource } from "../../Utils/arm/generatedClients/cosmos/types";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";

@@ -14,7 +14,6 @@ export async function createTrigger(
 ): Promise<TriggerDefinition | SqlTriggerResource> {
  const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
  try {
-    let resource: SqlTriggerResource | TriggerDefinition;
    if (
      userContext.authType === AuthType.AAD &&
      !userContext.features.enableSDKoperations &&
@@ -53,16 +52,14 @@ export async function createTrigger(
        trigger.id,
        createTriggerParams,
      );
-      resource = rpResponse && rpResponse.properties?.resource;
-    } else {
-      const sdkResponse = await client()
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.triggers.create(trigger as unknown as TriggerDefinition); // TODO: TypeScript does not like the SQL SDK trigger type
-      resource = sdkResponse.resource;
+      return rpResponse && rpResponse.properties?.resource;
    }
-    logConsoleInfo(`Successfully created trigger ${trigger.id}`);
-    return resource;
+
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.triggers.create(trigger as unknown as TriggerDefinition); // TODO: TypeScript does not like the SQL SDK trigger type
+    return response.resource;
  } catch (error) {
    handleError(error, "CreateTrigger", `Error while creating trigger ${trigger.id}`);
    throw error;
--- a/src/Common/dataAccess/createUserDefinedFunction.ts
+++ b/src/Common/dataAccess/createUserDefinedFunction.ts
@@ -9,7 +9,7 @@ import {
  SqlUserDefinedFunctionCreateUpdateParameters,
  SqlUserDefinedFunctionResource,
 } from "../../Utils/arm/generatedClients/cosmos/types";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";

@@ -20,7 +20,6 @@ export async function createUserDefinedFunction(
 ): Promise<UserDefinedFunctionDefinition & Resource> {
  const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
  try {
-    let resource: UserDefinedFunctionDefinition & Resource;
    if (
      userContext.authType === AuthType.AAD &&
      !userContext.features.enableSDKoperations &&
@@ -61,17 +60,14 @@ export async function createUserDefinedFunction(
        userDefinedFunction.id,
        createUDFParams,
      );
-
-      resource = rpResponse && (rpResponse.properties?.resource as UserDefinedFunctionDefinition & Resource);
-    } else {
-      const response = await client()
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.userDefinedFunctions.create(userDefinedFunction);
-      resource = response.resource;
+      return rpResponse && (rpResponse.properties?.resource as UserDefinedFunctionDefinition & Resource);
    }
-    logConsoleInfo(`Successfully created user defined function ${userDefinedFunction.id}`);
-    return resource;
+
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.userDefinedFunctions.create(userDefinedFunction);
+    return response?.resource;
  } catch (error) {
    handleError(
      error,
--- a/src/Common/dataAccess/dataTransfers.ts
+++ b/src/Common/dataAccess/dataTransfers.ts
@@ -1,4 +1,3 @@
-import { configContext } from "ConfigContext";
 import { ApiType, userContext } from "UserContext";
 import * as NotificationConsoleUtils from "Utils/NotificationConsoleUtils";
 import {
@@ -15,12 +14,9 @@ import {
  DataTransferJobFeedResults,
  DataTransferJobGetResults,
 } from "Utils/arm/generatedClients/dataTransferService/types";
-import { armRequest } from "Utils/arm/request";
 import { addToPolling, removeFromPolling, updateDataTransferJob, useDataTransferJobs } from "hooks/useDataTransferJobs";
 import promiseRetry, { AbortError, FailedAttemptError } from "p-retry";

-export const DATA_TRANSFER_JOB_API_VERSION = "2025-05-01-preview";
-
 export interface DataTransferParams {
  jobName: string;
  apiType: ApiType;
@@ -37,34 +33,26 @@ export const getDataTransferJobs = async (
  subscriptionId: string,
  resourceGroup: string,
  accountName: string,
-  signal?: AbortSignal,
 ): Promise<DataTransferJobGetResults[]> => {
  let dataTransferJobs: DataTransferJobGetResults[] = [];
  let dataTransferFeeds: DataTransferJobFeedResults = await listByDatabaseAccount(
    subscriptionId,
    resourceGroup,
    accountName,
-    signal,
  );
  dataTransferJobs = [...dataTransferJobs, ...(dataTransferFeeds?.value || [])];
  while (dataTransferFeeds?.nextLink) {
-    /**
-     * The `nextLink` URL returned by the Cosmos DB SQL API pointed to an incorrect endpoint, causing timeouts.
-     * (i.e: https://cdbmgmtprodby.documents.azure.com:450/subscriptions/{subId}/resourceGroups/{rg}/providers/Microsoft.DocumentDB/databaseAccounts/{account}/sql/dataTransferJobs?$top=100&$skiptoken=...)
-     * We manipulate the URL by parsing it to extract the path and query parameters,
-     * then construct the correct URL for the Azure Resource Manager (ARM) API.
-     * This ensures that the request is made to the correct base URL (`configContext.ARM_ENDPOINT`),
-     * which is required for ARM operations.
-     */
-    const parsedUrl = new URL(dataTransferFeeds.nextLink);
-    const nextUrlPath = parsedUrl.pathname + parsedUrl.search;
-    dataTransferFeeds = await armRequest({
-      host: configContext.ARM_ENDPOINT,
-      path: nextUrlPath,
-      method: "GET",
-      apiVersion: DATA_TRANSFER_JOB_API_VERSION,
+    const nextResponse = await window.fetch(dataTransferFeeds.nextLink, {
+      headers: {
+        Authorization: userContext.authorizationToken,
+      },
    });
-    dataTransferJobs.push(...(dataTransferFeeds?.value || []));
+    if (nextResponse.ok) {
+      dataTransferFeeds = await nextResponse.json();
+      dataTransferJobs = [...dataTransferJobs, ...(dataTransferFeeds?.value || [])];
+    } else {
+      break;
+    }
  }
  return dataTransferJobs;
 };
--- a/src/Common/dataAccess/deleteDocument.ts
+++ b/src/Common/dataAccess/deleteDocument.ts
@@ -44,8 +44,7 @@ export const deleteDocuments = async (
  documentIds: DocumentId[],
  abortSignal: AbortSignal,
 ): Promise<IBulkDeleteResult[]> => {
-  const totalCount = documentIds.length;
-  const clearMessage = logConsoleProgress(`Deleting ${totalCount} ${getEntityName(true)}`);
+  const clearMessage = logConsoleProgress(`Deleting ${documentIds.length} ${getEntityName(true)}`);
  try {
    const v2Container = await client().database(collection.databaseId).container(collection.id());

@@ -84,7 +83,11 @@ export const deleteDocuments = async (
    const flatAllResult = Array.prototype.concat.apply([], allResult);
    return flatAllResult;
  } catch (error) {
-    handleError(error, "DeleteDocuments", `Error while deleting ${totalCount} ${getEntityName(totalCount > 1)}`);
+    handleError(
+      error,
+      "DeleteDocuments",
+      `Error while deleting ${documentIds.length} ${getEntityName(documentIds.length > 1)}`,
+    );
    throw error;
  } finally {
    clearMessage();
--- a/src/Common/dataAccess/deleteStoredProcedure.ts
+++ b/src/Common/dataAccess/deleteStoredProcedure.ts
@@ -28,7 +28,6 @@ export async function deleteStoredProcedure(
    } else {
      await client().database(databaseId).container(collectionId).scripts.storedProcedure(storedProcedureId).delete();
    }
-    logConsoleProgress(`Successfully deleted stored procedure ${storedProcedureId}`);
  } catch (error) {
    handleError(error, "DeleteStoredProcedure", `Error while deleting stored procedure ${storedProcedureId}`);
    throw error;
--- a/src/Common/dataAccess/deleteTrigger.ts
+++ b/src/Common/dataAccess/deleteTrigger.ts
@@ -24,7 +24,6 @@ export async function deleteTrigger(databaseId: string, collectionId: string, tr
    } else {
      await client().database(databaseId).container(collectionId).scripts.trigger(triggerId).delete();
    }
-    logConsoleProgress(`Successfully deleted trigger ${triggerId}`);
  } catch (error) {
    handleError(error, "DeleteTrigger", `Error while deleting trigger ${triggerId}`);
    throw error;
--- a/src/Common/dataAccess/deleteUserDefinedFunction.ts
+++ b/src/Common/dataAccess/deleteUserDefinedFunction.ts
@@ -24,7 +24,6 @@ export async function deleteUserDefinedFunction(databaseId: string, collectionId
    } else {
      await client().database(databaseId).container(collectionId).scripts.userDefinedFunction(id).delete();
    }
-    logConsoleProgress(`Successfully deleted user defined function ${id}`);
  } catch (error) {
    handleError(error, "DeleteUserDefinedFunction", `Error while deleting user defined function ${id}`);
    throw error;
--- a/src/Common/dataAccess/queryDocumentsPage.test.ts
+++ b/src/Common/dataAccess/queryDocumentsPage.test.ts
@@ -1,171 +0,0 @@
-import { redactSyntaxErrorMessage } from "./queryDocumentsPage";
-
-/* Typical error to redact looks like this (the message property contains a JSON string with nested structure):
-{
-  "message": "{\"code\":\"BadRequest\",\"message\":\"{\\\"errors\\\":[{\\\"severity\\\":\\\"Error\\\",\\\"location\\\":{\\\"start\\\":0,\\\"end\\\":5},\\\"code\\\":\\\"SC1001\\\",\\\"message\\\":\\\"Syntax error, incorrect syntax near 'Crazy'.\\\"}]}\\r\\nActivityId: d5424e10-51bd-46f7-9aec-7b40bed36f17, Windows/10.0.20348 cosmos-netstandard-sdk/3.18.0\"}"
-}
-*/
-
-// Helper to create the nested error structure that matches what the SDK returns
-const createNestedError = (
-  errors: Array<{ severity?: string; location?: { start: number; end: number }; code: string; message: string }>,
-  activityId: string = "test-activity-id",
-): { message: string } => {
-  const innerErrorsJson = JSON.stringify({ errors });
-  const innerMessage = `${innerErrorsJson}\r\n${activityId}`;
-  const outerJson = JSON.stringify({ code: "BadRequest", message: innerMessage });
-  return { message: outerJson };
-};
-
-// Helper to parse the redacted result
-const parseRedactedResult = (result: { message: string }) => {
-  const outerParsed = JSON.parse(result.message);
-  const [innerErrorsJson, activityIdPart] = outerParsed.message.split("\r\n");
-  const innerErrors = JSON.parse(innerErrorsJson);
-  return { outerParsed, innerErrors, activityIdPart };
-};
-
-describe("redactSyntaxErrorMessage", () => {
-  it("should redact SC1001 error message", () => {
-    const error = createNestedError(
-      [
-        {
-          severity: "Error",
-          location: { start: 0, end: 5 },
-          code: "SC1001",
-          message: "Syntax error, incorrect syntax near 'Crazy'.",
-        },
-      ],
-      "ActivityId: d5424e10-51bd-46f7-9aec-7b40bed36f17",
-    );
-
-    const result = redactSyntaxErrorMessage(error) as { message: string };
-    const { outerParsed, innerErrors, activityIdPart } = parseRedactedResult(result);
-
-    expect(outerParsed.code).toBe("BadRequest");
-    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
-    expect(activityIdPart).toContain("ActivityId: d5424e10-51bd-46f7-9aec-7b40bed36f17");
-  });
-
-  it("should redact SC2001 error message", () => {
-    const error = createNestedError(
-      [
-        {
-          severity: "Error",
-          location: { start: 0, end: 10 },
-          code: "SC2001",
-          message: "Some sensitive syntax error message.",
-        },
-      ],
-      "ActivityId: abc123",
-    );
-
-    const result = redactSyntaxErrorMessage(error) as { message: string };
-    const { outerParsed, innerErrors, activityIdPart } = parseRedactedResult(result);
-
-    expect(outerParsed.code).toBe("BadRequest");
-    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
-    expect(activityIdPart).toContain("ActivityId: abc123");
-  });
-
-  it("should redact multiple errors with SC1001 and SC2001 codes", () => {
-    const error = createNestedError(
-      [
-        { severity: "Error", code: "SC1001", message: "First error" },
-        { severity: "Error", code: "SC2001", message: "Second error" },
-      ],
-      "ActivityId: xyz",
-    );
-
-    const result = redactSyntaxErrorMessage(error) as { message: string };
-    const { innerErrors } = parseRedactedResult(result);
-
-    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
-    expect(innerErrors.errors[1].message).toBe("__REDACTED__");
-  });
-
-  it("should not redact errors with other codes", () => {
-    const error = createNestedError(
-      [{ severity: "Error", code: "SC9999", message: "This should not be redacted." }],
-      "ActivityId: test123",
-    );
-
-    const result = redactSyntaxErrorMessage(error);
-
-    expect(result).toBe(error); // Should return original error unchanged
-  });
-
-  it("should not modify non-BadRequest errors", () => {
-    const innerMessage = JSON.stringify({ errors: [{ code: "SC1001", message: "Should not be redacted" }] });
-    const error = {
-      message: JSON.stringify({ code: "NotFound", message: innerMessage }),
-    };
-
-    const result = redactSyntaxErrorMessage(error);
-
-    expect(result).toBe(error);
-  });
-
-  it("should handle errors without message property", () => {
-    const error = { code: "BadRequest" };
-
-    const result = redactSyntaxErrorMessage(error);
-
-    expect(result).toBe(error);
-  });
-
-  it("should handle non-object errors", () => {
-    const stringError = "Simple string error";
-    const nullError: null = null;
-    const undefinedError: undefined = undefined;
-
-    expect(redactSyntaxErrorMessage(stringError)).toBe(stringError);
-    expect(redactSyntaxErrorMessage(nullError)).toBe(nullError);
-    expect(redactSyntaxErrorMessage(undefinedError)).toBe(undefinedError);
-  });
-
-  it("should handle malformed JSON in message", () => {
-    const error = {
-      message: "not valid json",
-    };
-
-    const result = redactSyntaxErrorMessage(error);
-
-    expect(result).toBe(error);
-  });
-
-  it("should handle message without ActivityId suffix", () => {
-    const innerErrorsJson = JSON.stringify({
-      errors: [{ severity: "Error", code: "SC1001", message: "Syntax error near something." }],
-    });
-    const error = {
-      message: JSON.stringify({ code: "BadRequest", message: innerErrorsJson + "\r\n" }),
-    };
-
-    const result = redactSyntaxErrorMessage(error) as { message: string };
-    const { innerErrors } = parseRedactedResult(result);
-
-    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
-  });
-
-  it("should preserve other error properties", () => {
-    const baseError = createNestedError([{ code: "SC1001", message: "Error" }], "ActivityId: test");
-    const error = {
-      ...baseError,
-      statusCode: 400,
-      additionalInfo: "extra data",
-    };
-
-    const result = redactSyntaxErrorMessage(error) as {
-      message: string;
-      statusCode: number;
-      additionalInfo: string;
-    };
-
-    expect(result.statusCode).toBe(400);
-    expect(result.additionalInfo).toBe("extra data");
-
-    const { innerErrors } = parseRedactedResult(result);
-    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
-  });
-});
--- a/src/Common/dataAccess/queryDocumentsPage.ts
+++ b/src/Common/dataAccess/queryDocumentsPage.ts
@@ -4,51 +4,6 @@ import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
 import { MinimalQueryIterator, nextPage } from "../IteratorUtilities";

-// Redact sensitive information from BadRequest errors with specific codes
-export const redactSyntaxErrorMessage = (error: unknown): unknown => {
-  const codesToRedact = ["SC1001", "SC2001", "SC1010"];
-
-  try {
-    // Handle error objects with a message property
-    if (error && typeof error === "object" && "message" in error) {
-      const errorObj = error as { code?: string; message?: string };
-      if (typeof errorObj.message === "string") {
-        // Parse the inner JSON from the message
-        const innerJson = JSON.parse(errorObj.message);
-        if (innerJson.code === "BadRequest" && typeof innerJson.message === "string") {
-          const [innerErrorsJson, activityIdPart] = innerJson.message.split("\r\n");
-          const innerErrorsObj = JSON.parse(innerErrorsJson);
-          if (Array.isArray(innerErrorsObj.errors)) {
-            let modified = false;
-            innerErrorsObj.errors = innerErrorsObj.errors.map((err: { code?: string; message?: string }) => {
-              if (err.code && codesToRedact.includes(err.code)) {
-                modified = true;
-                return { ...err, message: "__REDACTED__" };
-              }
-              return err;
-            });
-
-            if (modified) {
-              // Reconstruct the message with the redacted content
-              const redactedMessage = JSON.stringify(innerErrorsObj) + `\r\n${activityIdPart}`;
-              const redactedError = {
-                ...error,
-                message: JSON.stringify({ ...innerJson, message: redactedMessage }),
-                body: undefined as unknown, // Clear body to avoid sensitive data
-              };
-              return redactedError;
-            }
-          }
-        }
-      }
-    }
-  } catch {
-    // If parsing fails, return the original error
-  }
-
-  return error;
-};
-
 export const queryDocumentsPage = async (
  resourceName: string,
  documentsIterator: MinimalQueryIterator,
@@ -63,12 +18,7 @@ export const queryDocumentsPage = async (
    logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
    return result;
  } catch (error) {
-    // Redact sensitive information for telemetry while showing original in console
-    const redactedError = redactSyntaxErrorMessage(error);
-
-    handleError(error, "QueryDocumentsPage", `Failed to query ${entityName} for container ${resourceName}`, {
-      redactedError: redactedError as Error,
-    });
+    handleError(error, "QueryDocumentsPage", `Failed to query ${entityName} for container ${resourceName}`);
    throw error;
  } finally {
    clearMessage();
--- a/src/Common/dataAccess/readCollections.ts
+++ b/src/Common/dataAccess/readCollections.ts
@@ -1,6 +1,5 @@
 import { ContainerResponse } from "@azure/cosmos";
 import { Queries } from "Common/Constants";
-import * as Logger from "Common/Logger";
 import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
 import { isFabric, isFabricMirroredKey } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
@@ -62,14 +61,7 @@ export async function readCollections(databaseId: string): Promise<DataModels.Co
      return await readCollectionsWithARM(databaseId);
    }

-    Logger.logInfo(`readCollections: calling fetchAll for database ${databaseId}`, "readCollections");
-    const fetchAllStart = Date.now();
    const sdkResponse = await client().database(databaseId).containers.readAll().fetchAll();
-    Logger.logInfo(
-      `readCollections: fetchAll completed for database ${databaseId}, count=${sdkResponse.resources
-        ?.length}, durationMs=${Date.now() - fetchAllStart}`,
-      "readCollections",
-    );
    return sdkResponse.resources as DataModels.Collection[];
  } catch (error) {
    handleError(error, "ReadCollections", `Error while querying containers for database ${databaseId}`);
--- a/src/Common/dataAccess/readDatabases.test.ts
+++ b/src/Common/dataAccess/readDatabases.test.ts
@@ -1,12 +1,11 @@
 jest.mock("../../Utils/arm/request");
 jest.mock("../CosmosClient");
-
 import { AuthType } from "../../AuthType";
 import { DatabaseAccount } from "../../Contracts/DataModels";
 import { updateUserContext } from "../../UserContext";
 import { armRequest } from "../../Utils/arm/request";
 import { client } from "../CosmosClient";
-import { readDatabases, readDatabasesForAccount } from "./readDatabases";
+import { readDatabases } from "./readDatabases";

 describe("readDatabases", () => {
  beforeAll(() => {
@@ -43,64 +42,3 @@ describe("readDatabases", () => {
    expect(client).toHaveBeenCalled();
  });
 });
-
-describe("readDatabasesForAccount", () => {
-  const mockDatabase = { id: "testDb", _rid: "", _self: "", _etag: "", _ts: 0 };
-  const mockArmResponse = { value: [{ properties: { resource: mockDatabase } }] };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("should call ARM with a path that includes the provided subscriptionId, resourceGroup, and accountName", async () => {
-    (armRequest as jest.Mock).mockResolvedValue(mockArmResponse);
-
-    await readDatabasesForAccount("test-sub", "test-rg", "test-account");
-
-    expect(armRequest).toHaveBeenCalledWith(
-      expect.objectContaining({
-        path: expect.stringContaining("/subscriptions/test-sub/resourceGroups/test-rg/"),
-      }),
-    );
-    expect(armRequest).toHaveBeenCalledWith(
-      expect.objectContaining({
-        path: expect.stringContaining("/databaseAccounts/test-account/sqlDatabases"),
-      }),
-    );
-  });
-
-  it("should return mapped database resources from the response", async () => {
-    const db1 = { id: "db1", _rid: "r1", _self: "/dbs/db1", _etag: "", _ts: 1 };
-    const db2 = { id: "db2", _rid: "r2", _self: "/dbs/db2", _etag: "", _ts: 2 };
-
-    (armRequest as jest.Mock).mockResolvedValue({
-      value: [{ properties: { resource: db1 } }, { properties: { resource: db2 } }],
-    });
-
-    const result = await readDatabasesForAccount("sub", "rg", "account");
-
-    expect(result).toEqual([db1, db2]);
-  });
-
-  it("should return an empty array when the response is null", async () => {
-    (armRequest as jest.Mock).mockResolvedValue(null);
-
-    const result = await readDatabasesForAccount("sub", "rg", "account");
-
-    expect(result).toEqual([]);
-  });
-
-  it("should return an empty array when value is an empty list", async () => {
-    (armRequest as jest.Mock).mockResolvedValue({ value: [] });
-
-    const result = await readDatabasesForAccount("sub", "rg", "account");
-
-    expect(result).toEqual([]);
-  });
-
-  it("should throw and propagate errors from the ARM call", async () => {
-    (armRequest as jest.Mock).mockRejectedValue(new Error("ARM request failed"));
-
-    await expect(readDatabasesForAccount("sub", "rg", "account")).rejects.toThrow("ARM request failed");
-  });
-});
--- a/src/Common/dataAccess/readDatabases.ts
+++ b/src/Common/dataAccess/readDatabases.ts
@@ -112,20 +112,3 @@ async function readDatabasesWithARM(): Promise<DataModels.Database[]> {

  return rpResponse?.value?.map((database) => database.properties?.resource as DataModels.Database);
 }
-
-export async function readDatabasesForAccount(
-  subscriptionId: string,
-  resourceGroup: string,
-  accountName: string,
-): Promise<DataModels.Database[]> {
-  const clearMessage = logConsoleProgress(`Querying databases for account ${accountName}`);
-  try {
-    const rpResponse = await listSqlDatabases(subscriptionId, resourceGroup, accountName);
-    return rpResponse?.value?.map((database) => database.properties?.resource as DataModels.Database) ?? [];
-  } catch (error) {
-    handleError(error, "ReadDatabasesForAccount", `Error while querying databases for account ${accountName}`);
-    throw error;
-  } finally {
-    clearMessage();
-  }
-}
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -77,12 +77,6 @@ let configContext: Readonly<ConfigContext> = {
    `^https:\\/\\/.*\\.fabric\\.microsoft\\.com$`,
    `^https:\\/\\/.*\\.powerbi\\.com$`,
    `^https:\\/\\/dataexplorer-preview\\.azurewebsites\\.net$`,
-    `^https:\\/\\/explorer\\.cosmos\\.sovcloud-api\\.fr$`,
-    `^https:\\/\\/portal\\.sovcloud-azure\\.fr$`,
-    `^https:\\/\\/explorer\\.cosmos\\.sovcloud-api\\.de$`,
-    `^https:\\/\\/portal\\.sovcloud-azure\\.de$`,
-    `^https:\\/\\/explorer\\.cosmos\\.sovcloud-api\\.sg$`,
-    `^https:\\/\\/portal\\.sovcloud-azure\\.sg$`,
  ], // Webpack injects this at build time
  gitSha: process.env.GIT_SHA,
  hostedExplorerURL: "https://cosmos.azure.com/",
--- a/src/Contracts/DataExplorerMessagesContract.ts
+++ b/src/Contracts/DataExplorerMessagesContract.ts
@@ -46,10 +46,6 @@ export type DataExploreMessageV3 =
      params: {
        updateType: "created" | "deleted" | "settings";
      };
-    }
-  | {
-      type: FabricMessageTypes.RestoreContainer;
-      params: [];
    };
 export interface GetCosmosTokenMessageOptions {
  verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -275,7 +275,8 @@ export interface DataMaskingPolicy {
    startPosition: number;
    length: number;
  }>;
-  excludedPaths?: string[];
+  excludedPaths: string[];
+  isPolicyEnabled: boolean;
 }

 export interface MaterializedView {
@@ -404,18 +405,11 @@ export interface AutoPilotOfferSettings {
  targetMaxThroughput?: number;
 }

-export interface AccountOverride {
-  subscriptionId: string;
-  resourceGroup: string;
-  accountName: string;
-}
-
 export interface CreateDatabaseParams {
  autoPilotMaxThroughput?: number;
  databaseId: string;
  databaseLevelThroughput?: boolean;
  offerThroughput?: number;
-  targetAccountOverride?: AccountOverride;
 }

 export interface CreateCollectionParamsBase {
@@ -435,7 +429,6 @@ export interface CreateCollectionParamsBase {
 export interface CreateCollectionParams extends CreateCollectionParamsBase {
  createNewDatabase: boolean;
  collectionId: string;
-  targetAccountOverride?: AccountOverride;
 }

 export interface CreateMaterializedViewsParams extends CreateCollectionParamsBase {
--- a/src/Explorer/ContainerCopy/Actions/CopyJobActions.test.tsx
+++ b/src/Explorer/ContainerCopy/Actions/CopyJobActions.test.tsx
@@ -1,6 +1,5 @@
 import "@testing-library/jest-dom";
 import Explorer from "Explorer/Explorer";
-import { getDataTransferJobs } from "../../../Common/dataAccess/dataTransfers";
 import * as Logger from "../../../Common/Logger";
 import { useSidePanel } from "../../../hooks/useSidePanel";
 import * as dataTransferService from "../../../Utils/arm/generatedClients/dataTransferService/dataTransferJobs";
@@ -31,7 +30,6 @@ jest.mock("../../../Common/Logger");
 jest.mock("../../../Utils/arm/generatedClients/dataTransferService/dataTransferJobs");
 jest.mock("../MonitorCopyJobs/MonitorCopyJobRefState");
 jest.mock("../CopyJobUtils");
-jest.mock("../../../Common/dataAccess/dataTransfers");

 describe("CopyJobActions", () => {
  beforeEach(() => {
@@ -156,31 +154,33 @@ describe("CopyJobActions", () => {
    });

    it("should fetch and format copy jobs successfully", async () => {
-      const mockResponse = [
-        {
-          properties: {
-            jobName: "job-1",
-            status: "InProgress",
-            lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
-            processedCount: 50,
-            totalCount: 100,
-            mode: "online",
-            duration: "01:30:45",
-            source: {
-              component: "CosmosDBSql",
-              databaseName: "source-db",
-              containerName: "source-container",
-            },
-            destination: {
-              component: "CosmosDBSql",
-              databaseName: "target-db",
-              containerName: "target-container",
+      const mockResponse = {
+        value: [
+          {
+            properties: {
+              jobName: "job-1",
+              status: "InProgress",
+              lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
+              processedCount: 50,
+              totalCount: 100,
+              mode: "online",
+              duration: "01:30:45",
+              source: {
+                component: "CosmosDBSql",
+                databaseName: "source-db",
+                containerName: "source-container",
+              },
+              destination: {
+                component: "CosmosDBSql",
+                databaseName: "target-db",
+                containerName: "target-container",
+              },
            },
          },
-        },
-      ];
+        ],
+      };

-      (getDataTransferJobs as jest.Mock).mockResolvedValue(mockResponse);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue(mockResponse);
      (CopyJobUtils.formatUTCDateTime as jest.Mock).mockReturnValue({
        formattedDateTime: "1/1/2025, 10:00:00 AM",
        timestamp: 1704106800000,
@@ -201,36 +201,38 @@ describe("CopyJobActions", () => {
    });

    it("should filter jobs by CosmosDBSql component", async () => {
-      const mockResponse = [
-        {
-          properties: {
-            jobName: "sql-job",
-            status: "Completed",
-            lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
-            processedCount: 100,
-            totalCount: 100,
-            mode: "offline",
-            duration: "02:00:00",
-            source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
-            destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+      const mockResponse = {
+        value: [
+          {
+            properties: {
+              jobName: "sql-job",
+              status: "Completed",
+              lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
+              processedCount: 100,
+              totalCount: 100,
+              mode: "offline",
+              duration: "02:00:00",
+              source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
+              destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+            },
          },
-        },
-        {
-          properties: {
-            jobName: "other-job",
-            status: "Completed",
-            lastUpdatedUtcTime: "2025-01-01T11:00:00Z",
-            processedCount: 100,
-            totalCount: 100,
-            mode: "offline",
-            duration: "01:00:00",
-            source: { component: "OtherComponent", databaseName: "db1", containerName: "c1" },
-            destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+          {
+            properties: {
+              jobName: "other-job",
+              status: "Completed",
+              lastUpdatedUtcTime: "2025-01-01T11:00:00Z",
+              processedCount: 100,
+              totalCount: 100,
+              mode: "offline",
+              duration: "01:00:00",
+              source: { component: "OtherComponent", databaseName: "db1", containerName: "c1" },
+              destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+            },
          },
-        },
-      ];
+        ],
+      };

-      (getDataTransferJobs as jest.Mock).mockResolvedValue(mockResponse);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue(mockResponse);
      (CopyJobUtils.formatUTCDateTime as jest.Mock).mockReturnValue({
        formattedDateTime: "1/1/2025, 10:00:00 AM",
        timestamp: 1704106800000,
@@ -245,36 +247,38 @@ describe("CopyJobActions", () => {
    });

    it("should sort jobs by last updated time (newest first)", async () => {
-      const mockResponse = [
-        {
-          properties: {
-            jobName: "older-job",
-            status: "Completed",
-            lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
-            processedCount: 100,
-            totalCount: 100,
-            mode: "offline",
-            duration: "01:00:00",
-            source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
-            destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+      const mockResponse = {
+        value: [
+          {
+            properties: {
+              jobName: "older-job",
+              status: "Completed",
+              lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
+              processedCount: 100,
+              totalCount: 100,
+              mode: "offline",
+              duration: "01:00:00",
+              source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
+              destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+            },
          },
-        },
-        {
-          properties: {
-            jobName: "newer-job",
-            status: "InProgress",
-            lastUpdatedUtcTime: "2025-01-02T10:00:00Z",
-            processedCount: 50,
-            totalCount: 100,
-            mode: "online",
-            duration: "00:30:00",
-            source: { component: "CosmosDBSql", databaseName: "db3", containerName: "c3" },
-            destination: { component: "CosmosDBSql", databaseName: "db4", containerName: "c4" },
+          {
+            properties: {
+              jobName: "newer-job",
+              status: "InProgress",
+              lastUpdatedUtcTime: "2025-01-02T10:00:00Z",
+              processedCount: 50,
+              totalCount: 100,
+              mode: "online",
+              duration: "00:30:00",
+              source: { component: "CosmosDBSql", databaseName: "db3", containerName: "c3" },
+              destination: { component: "CosmosDBSql", databaseName: "db4", containerName: "c4" },
+            },
          },
-        },
-      ];
+        ],
+      };

-      (getDataTransferJobs as jest.Mock).mockResolvedValue(mockResponse);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue(mockResponse);
      (CopyJobUtils.formatUTCDateTime as jest.Mock).mockReturnValue({
        formattedDateTime: "1/1/2025, 10:00:00 AM",
        timestamp: 1704106800000,
@@ -289,23 +293,25 @@ describe("CopyJobActions", () => {
    });

    it("should calculate completion percentage correctly", async () => {
-      const mockResponse = [
-        {
-          properties: {
-            jobName: "job-1",
-            status: "InProgress",
-            lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
-            processedCount: 75,
-            totalCount: 100,
-            mode: "online",
-            duration: "01:00:00",
-            source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
-            destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+      const mockResponse = {
+        value: [
+          {
+            properties: {
+              jobName: "job-1",
+              status: "InProgress",
+              lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
+              processedCount: 75,
+              totalCount: 100,
+              mode: "online",
+              duration: "01:00:00",
+              source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
+              destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+            },
          },
-        },
-      ];
+        ],
+      };

-      (getDataTransferJobs as jest.Mock).mockResolvedValue(mockResponse);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue(mockResponse);
      (CopyJobUtils.formatUTCDateTime as jest.Mock).mockReturnValue({
        formattedDateTime: "1/1/2025, 10:00:00 AM",
        timestamp: 1704106800000,
@@ -319,23 +325,25 @@ describe("CopyJobActions", () => {
    });

    it("should handle zero total count gracefully", async () => {
-      const mockResponse = [
-        {
-          properties: {
-            jobName: "job-1",
-            status: "Pending",
-            lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
-            processedCount: 0,
-            totalCount: 0,
-            mode: "online",
-            duration: "00:00:00",
-            source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
-            destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+      const mockResponse = {
+        value: [
+          {
+            properties: {
+              jobName: "job-1",
+              status: "Pending",
+              lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
+              processedCount: 0,
+              totalCount: 0,
+              mode: "online",
+              duration: "00:00:00",
+              source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
+              destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+            },
          },
-        },
-      ];
+        ],
+      };

-      (getDataTransferJobs as jest.Mock).mockResolvedValue(mockResponse);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue(mockResponse);
      (CopyJobUtils.formatUTCDateTime as jest.Mock).mockReturnValue({
        formattedDateTime: "1/1/2025, 10:00:00 AM",
        timestamp: 1704106800000,
@@ -353,24 +361,26 @@ describe("CopyJobActions", () => {
        message: "Error message line 1\r\n\r\nError message line 2",
        code: "ErrorCode123",
      };
-      const mockResponse = [
-        {
-          properties: {
-            jobName: "failed-job",
-            status: "Failed",
-            lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
-            processedCount: 50,
-            totalCount: 100,
-            mode: "offline",
-            duration: "00:30:00",
-            source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
-            destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
-            error: mockError,
+      const mockResponse = {
+        value: [
+          {
+            properties: {
+              jobName: "failed-job",
+              status: "Failed",
+              lastUpdatedUtcTime: "2025-01-01T10:00:00Z",
+              processedCount: 50,
+              totalCount: 100,
+              mode: "offline",
+              duration: "00:30:00",
+              source: { component: "CosmosDBSql", databaseName: "db1", containerName: "c1" },
+              destination: { component: "CosmosDBSql", databaseName: "db2", containerName: "c2" },
+              error: mockError,
+            },
          },
-        },
-      ];
+        ],
+      };

-      (getDataTransferJobs as jest.Mock).mockResolvedValue(mockResponse);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue(mockResponse);
      (CopyJobUtils.formatUTCDateTime as jest.Mock).mockReturnValue({
        formattedDateTime: "1/1/2025, 10:00:00 AM",
        timestamp: 1704106800000,
@@ -398,7 +408,7 @@ describe("CopyJobActions", () => {
      };
      (global as any).AbortController = jest.fn(() => mockAbortController);

-      (getDataTransferJobs as jest.Mock).mockResolvedValue([]);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue({ value: [] });

      getCopyJobs();
      expect(mockAbortController.abort).not.toHaveBeenCalled();
@@ -408,7 +418,9 @@ describe("CopyJobActions", () => {
    });

    it("should throw error for invalid response format", async () => {
-      (getDataTransferJobs as jest.Mock).mockResolvedValue("not-an-array");
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockResolvedValue({
+        value: "not-an-array",
+      });

      await expect(getCopyJobs()).rejects.toThrow("Invalid migration job status response: Expected an array of jobs.");
    });
@@ -418,7 +430,7 @@ describe("CopyJobActions", () => {
        message: "Aborted",
        content: JSON.stringify({ message: "signal is aborted without reason" }),
      };
-      (getDataTransferJobs as jest.Mock).mockRejectedValue(abortError);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockRejectedValue(abortError);

      await expect(getCopyJobs()).rejects.toMatchObject({
        message: expect.stringContaining("Previous copy job request was cancelled."),
@@ -427,7 +439,7 @@ describe("CopyJobActions", () => {

    it("should handle generic errors", async () => {
      const genericError = new Error("Network error");
-      (getDataTransferJobs as jest.Mock).mockRejectedValue(genericError);
+      (dataTransferService.listByDatabaseAccount as jest.Mock).mockRejectedValue(genericError);

      await expect(getCopyJobs()).rejects.toThrow("Network error");
    });
@@ -457,13 +469,13 @@ describe("CopyJobActions", () => {
        jobName: "test-job",
        migrationType: "online" as any,
        source: {
-          subscriptionId: "sub-123",
+          subscription: {} as any,
          account: { id: "account-1", name: "source-account" } as any,
          databaseId: "source-db",
          containerId: "source-container",
        },
        target: {
-          subscription: {} as any,
+          subscriptionId: "sub-123",
          account: { id: "account-1", name: "target-account" } as any,
          databaseId: "target-db",
          containerId: "target-container",
@@ -498,7 +510,7 @@ describe("CopyJobActions", () => {
      );

      const callArgs = (dataTransferService.create as jest.Mock).mock.calls[0][4];
-      expect(callArgs.properties.destination.remoteAccountName).toBeUndefined();
+      expect(callArgs.properties.source.remoteAccountName).toBeUndefined();

      expect(mockRefreshJobList).toHaveBeenCalled();
      expect(mockOnSuccess).toHaveBeenCalled();
@@ -509,13 +521,13 @@ describe("CopyJobActions", () => {
        jobName: "cross-account-job",
        migrationType: "offline" as any,
        source: {
-          subscriptionId: "sub-123",
+          subscription: {} as any,
          account: { id: "account-1", name: "source-account" } as any,
          databaseId: "source-db",
          containerId: "source-container",
        },
        target: {
-          subscription: {} as any,
+          subscriptionId: "sub-456",
          account: { id: "account-2", name: "target-account" } as any,
          databaseId: "target-db",
          containerId: "target-container",
@@ -528,7 +540,7 @@ describe("CopyJobActions", () => {
      await submitCreateCopyJob(mockState, mockOnSuccess);

      const callArgs = (dataTransferService.create as jest.Mock).mock.calls[0][4];
-      expect(callArgs.properties.destination.remoteAccountName).toBe("target-account");
+      expect(callArgs.properties.source.remoteAccountName).toBe("source-account");
      expect(mockOnSuccess).toHaveBeenCalled();
    });

@@ -537,13 +549,13 @@ describe("CopyJobActions", () => {
        jobName: "failing-job",
        migrationType: "online" as any,
        source: {
-          subscriptionId: "sub-123",
+          subscription: {} as any,
          account: { id: "account-1", name: "source-account" } as any,
          databaseId: "source-db",
          containerId: "source-container",
        },
        target: {
-          subscription: {} as any,
+          subscriptionId: "sub-123",
          account: { id: "account-1", name: "target-account" } as any,
          databaseId: "target-db",
          containerId: "target-container",
@@ -566,13 +578,13 @@ describe("CopyJobActions", () => {
        jobName: "test-job",
        migrationType: "online" as any,
        source: {
-          subscriptionId: "sub-123",
+          subscription: {} as any,
          account: { id: "account-1", name: "source-account" } as any,
          databaseId: "source-db",
          containerId: "source-container",
        },
        target: {
-          subscription: {} as any,
+          subscriptionId: "sub-123",
          account: { id: "account-1", name: "target-account" } as any,
          databaseId: "target-db",
          containerId: "target-container",
--- a/src/Explorer/ContainerCopy/Actions/CopyJobActions.tsx
+++ b/src/Explorer/ContainerCopy/Actions/CopyJobActions.tsx
@@ -1,13 +1,13 @@
 import Explorer from "Explorer/Explorer";
 import React from "react";
 import { userContext } from "UserContext";
-import { getDataTransferJobs } from "../../../Common/dataAccess/dataTransfers";
 import { logError } from "../../../Common/Logger";
 import { useSidePanel } from "../../../hooks/useSidePanel";
 import {
  cancel,
  complete,
  create,
+  listByDatabaseAccount,
  pause,
  resume,
 } from "../../../Utils/arm/generatedClients/dataTransferService/dataTransferJobs";
@@ -63,8 +63,14 @@ export const getCopyJobs = async (): Promise<CopyJobType[]> => {
    const { subscriptionId, resourceGroup, accountName } = getAccountDetailsFromResourceId(
      userContext.databaseAccount?.id || "",
    );
-    const jobs = await getDataTransferJobs(subscriptionId, resourceGroup, accountName, copyJobsAbortController.signal);
+    const response = await listByDatabaseAccount(
+      subscriptionId,
+      resourceGroup,
+      accountName,
+      copyJobsAbortController.signal,
+    );

+    const jobs = response.value || [];
    if (!Array.isArray(jobs)) {
      throw new Error("Invalid migration job status response: Expected an array of jobs.");
    }
@@ -137,12 +143,12 @@ export const submitCreateCopyJob = async (state: CopyJobContextState, onSuccess:
      properties: {
        source: {
          component: "CosmosDBSql",
+          ...(isSameAccount ? {} : { remoteAccountName: source?.account?.name }),
          databaseName: source?.databaseId,
          containerName: source?.containerId,
        },
        destination: {
          component: "CosmosDBSql",
-          ...(isSameAccount ? {} : { remoteAccountName: target?.account?.name }),
          databaseName: target?.databaseId,
          containerName: target?.containerId,
        },
--- a/src/Explorer/ContainerCopy/CommandBar/CopyJobCommandBar.test.tsx
+++ b/src/Explorer/ContainerCopy/CommandBar/CopyJobCommandBar.test.tsx
@@ -39,7 +39,7 @@ describe("CopyJobCommandBar", () => {

    render(<CopyJobCommandBar explorer={mockExplorer} />);

-    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer, false);
+    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer);
    expect(mockGetCommandBarButtons).toHaveBeenCalledTimes(1);
  });

@@ -163,7 +163,7 @@ describe("CopyJobCommandBar", () => {

    render(<CopyJobCommandBar explorer={mockExplorer} />);

-    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer, false);
+    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer);
    expect(mockConvertButton.mock.calls[0][0]).toEqual(mockCommandButtonProps);
  });

@@ -175,11 +175,11 @@ describe("CopyJobCommandBar", () => {
    mockConvertButton.mockReturnValue([]);

    const { rerender } = render(<CopyJobCommandBar explorer={mockExplorer1} />);
-    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer1, false);
+    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer1);

    rerender(<CopyJobCommandBar explorer={mockExplorer2} />);

-    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer2, false);
+    expect(mockGetCommandBarButtons).toHaveBeenCalledWith(mockExplorer2);
    expect(mockGetCommandBarButtons).toHaveBeenCalledTimes(2);
  });
 });
--- a/src/Explorer/ContainerCopy/CommandBar/CopyJobCommandBar.tsx
+++ b/src/Explorer/ContainerCopy/CommandBar/CopyJobCommandBar.tsx
@@ -1,28 +1,24 @@
 import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
 import React from "react";
-import { useThemeStore } from "../../../hooks/useTheme";
+import { StyleConstants } from "../../../Common/StyleConstants";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import * as CommandBarUtil from "../../Menus/CommandBar/CommandBarUtil";
-import { getThemeTokens } from "../../Theme/ThemeUtil";
 import { ContainerCopyProps } from "../Types/CopyJobTypes";
 import { getCommandBarButtons } from "./Utils";

+const backgroundColor = StyleConstants.BaseLight;
+const rootStyle = {
+  root: {
+    backgroundColor: backgroundColor,
+  },
+};
+
 const CopyJobCommandBar: React.FC<ContainerCopyProps> = ({ explorer }) => {
-  const isDarkMode = useThemeStore((state) => state.isDarkMode);
-  const themeTokens = getThemeTokens(isDarkMode);
-  const backgroundColor = themeTokens.colorNeutralBackground1;
-
-  const rootStyle = {
-    root: {
-      backgroundColor: backgroundColor,
-    },
-  };
-
-  const commandBarItems: CommandButtonComponentProps[] = getCommandBarButtons(explorer, isDarkMode);
+  const commandBarItems: CommandButtonComponentProps[] = getCommandBarButtons(explorer);
  const controlButtons: ICommandBarItemProps[] = CommandBarUtil.convertButton(commandBarItems, backgroundColor);

  return (
-    <div className="commandBarContainer" style={{ backgroundColor }}>
+    <div className="commandBarContainer">
      <FluentCommandBar
        ariaLabel="Use left and right arrow keys to navigate between commands"
        styles={rootStyle}
--- a/src/Explorer/ContainerCopy/CommandBar/Utils.test.ts
+++ b/src/Explorer/ContainerCopy/CommandBar/Utils.test.ts
@@ -50,7 +50,7 @@ describe("CommandBar Utils", () => {

  describe("getCommandBarButtons", () => {
    it("should return an array of command button props", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      expect(buttons).toBeDefined();
      expect(Array.isArray(buttons)).toBe(true);
@@ -58,7 +58,7 @@ describe("CommandBar Utils", () => {
    });

    it("should include create copy job button", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);
      const createButton = buttons[0];

      expect(createButton).toBeDefined();
@@ -70,7 +70,7 @@ describe("CommandBar Utils", () => {
    });

    it("should include refresh button", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);
      const refreshButton = buttons[1];

      expect(refreshButton).toBeDefined();
@@ -80,11 +80,11 @@ describe("CommandBar Utils", () => {
    });

    it("should include feedback button when platform is Portal", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

-      expect(buttons.length).toBe(4);
+      expect(buttons.length).toBe(3);

-      const feedbackButton = buttons[3];
+      const feedbackButton = buttons[2];
      expect(feedbackButton).toBeDefined();
      expect(feedbackButton.ariaLabel).toBe("Provide feedback on copy jobs");
      expect(feedbackButton.tooltipText).toBe("Feedback");
@@ -105,13 +105,13 @@ describe("CommandBar Utils", () => {
      }));

      const { getCommandBarButtons: getCommandBarButtonsEmulator } = await import("./Utils");
-      const buttons = getCommandBarButtonsEmulator(mockExplorer, false);
+      const buttons = getCommandBarButtonsEmulator(mockExplorer);

-      expect(buttons.length).toBe(3);
+      expect(buttons.length).toBe(2);
    });

    it("should call openCreateCopyJobPanel when create button is clicked", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);
      const createButton = buttons[0];

      createButton.onCommandClick({} as React.SyntheticEvent);
@@ -121,7 +121,7 @@ describe("CommandBar Utils", () => {
    });

    it("should call refreshJobList when refresh button is clicked", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);
      const refreshButton = buttons[1];

      refreshButton.onCommandClick({} as React.SyntheticEvent);
@@ -130,8 +130,8 @@ describe("CommandBar Utils", () => {
    });

    it("should call openContainerCopyFeedbackBlade when feedback button is clicked", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
-      const feedbackButton = buttons[3];
+      const buttons = getCommandBarButtons(mockExplorer);
+      const feedbackButton = buttons[2];

      feedbackButton.onCommandClick({} as React.SyntheticEvent);

@@ -139,7 +139,7 @@ describe("CommandBar Utils", () => {
    });

    it("should return buttons with correct icon sources", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      expect(buttons[0].iconSrc).toBeDefined();
      expect(buttons[0].iconAlt).toBe("Create Copy Job");
@@ -148,10 +148,7 @@ describe("CommandBar Utils", () => {
      expect(buttons[1].iconAlt).toBe("Refresh");

      expect(buttons[2].iconSrc).toBeDefined();
-      expect(buttons[2].iconAlt).toBe("Dark Theme");
-
-      expect(buttons[3].iconSrc).toBeDefined();
-      expect(buttons[3].iconAlt).toBe("Feedback");
+      expect(buttons[2].iconAlt).toBe("Feedback");
    });

    it("should handle null MonitorCopyJobsRefState ref gracefully", () => {
@@ -160,14 +157,14 @@ describe("CommandBar Utils", () => {
        return selector(state);
      });

-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);
      const refreshButton = buttons[1];

      expect(() => refreshButton.onCommandClick({} as React.SyntheticEvent)).not.toThrow();
    });

    it("should set hasPopup to false for all buttons", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button) => {
        expect(button.hasPopup).toBe(false);
@@ -175,7 +172,7 @@ describe("CommandBar Utils", () => {
    });

    it("should set commandButtonLabel to undefined for all buttons", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button) => {
        expect(button.commandButtonLabel).toBeUndefined();
@@ -183,16 +180,15 @@ describe("CommandBar Utils", () => {
    });

    it("should respect disabled state when provided", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

-      // Theme toggle (index 2) is disabled in Portal mode, others are not
-      const expectedDisabled = buttons.map((_, index) => index === 2);
-      const actualDisabled = buttons.map((button) => button.disabled);
-      expect(actualDisabled).toEqual(expectedDisabled);
+      buttons.forEach((button) => {
+        expect(button.disabled).toBe(false);
+      });
    });

    it("should return CommandButtonComponentProps with all required properties", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button: CommandButtonComponentProps) => {
        expect(button).toHaveProperty("iconSrc");
@@ -206,19 +202,18 @@ describe("CommandBar Utils", () => {
      });
    });

-    it("should maintain button order: create, refresh, themeToggle, feedback", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+    it("should maintain button order: create, refresh, feedback", () => {
+      const buttons = getCommandBarButtons(mockExplorer);

      expect(buttons[0].tooltipText).toBe("Create Copy Job");
      expect(buttons[1].tooltipText).toBe("Refresh");
-      expect(buttons[2].tooltipText).toBe("Dark Theme");
-      expect(buttons[3].tooltipText).toBe("Feedback");
+      expect(buttons[2].tooltipText).toBe("Feedback");
    });
  });

  describe("Button click handlers", () => {
    it("should execute click handlers without errors", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button) => {
        expect(() => button.onCommandClick({} as React.SyntheticEvent)).not.toThrow();
@@ -226,7 +221,7 @@ describe("CommandBar Utils", () => {
    });

    it("should call correct action for each button", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons[0].onCommandClick({} as React.SyntheticEvent);
      expect(Actions.openCreateCopyJobPanel).toHaveBeenCalledWith(mockExplorer);
@@ -234,14 +229,14 @@ describe("CommandBar Utils", () => {
      buttons[1].onCommandClick({} as React.SyntheticEvent);
      expect(mockRefreshJobList).toHaveBeenCalled();

-      buttons[3].onCommandClick({} as React.SyntheticEvent);
+      buttons[2].onCommandClick({} as React.SyntheticEvent);
      expect(mockOpenContainerCopyFeedbackBlade).toHaveBeenCalled();
    });
  });

  describe("Accessibility", () => {
    it("should have aria labels for all buttons", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button) => {
        expect(button.ariaLabel).toBeDefined();
@@ -251,7 +246,7 @@ describe("CommandBar Utils", () => {
    });

    it("should have tooltip text for all buttons", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button) => {
        expect(button.tooltipText).toBeDefined();
@@ -261,7 +256,7 @@ describe("CommandBar Utils", () => {
    });

    it("should have icon alt text for all buttons", () => {
-      const buttons = getCommandBarButtons(mockExplorer, false);
+      const buttons = getCommandBarButtons(mockExplorer);

      buttons.forEach((button) => {
        expect(button.iconAlt).toBeDefined();
--- a/src/Explorer/ContainerCopy/CommandBar/Utils.ts
+++ b/src/Explorer/ContainerCopy/CommandBar/Utils.ts
@@ -1,10 +1,7 @@
 import AddIcon from "../../../../images/Add.svg";
 import FeedbackIcon from "../../../../images/Feedback-Command.svg";
-import MoonIcon from "../../../../images/MoonIcon.svg";
 import RefreshIcon from "../../../../images/refresh-cosmos.svg";
-import SunIcon from "../../../../images/SunIcon.svg";
 import { configContext, Platform } from "../../../ConfigContext";
-import { useThemeStore } from "../../../hooks/useTheme";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import * as Actions from "../Actions/CopyJobActions";
@@ -12,9 +9,8 @@ import ContainerCopyMessages from "../ContainerCopyMessages";
 import { MonitorCopyJobsRefState } from "../MonitorCopyJobs/MonitorCopyJobRefState";
 import { CopyJobCommandBarBtnType } from "../Types/CopyJobTypes";

-function getCopyJobBtns(explorer: Explorer, isDarkMode: boolean): CopyJobCommandBarBtnType[] {
+function getCopyJobBtns(explorer: Explorer): CopyJobCommandBarBtnType[] {
  const monitorCopyJobsRef = MonitorCopyJobsRefState((state) => state.ref);
-  const isPortal = configContext.platform === Platform.Portal;
  const buttons: CopyJobCommandBarBtnType[] = [
    {
      key: "createCopyJob",
@@ -30,20 +26,7 @@ function getCopyJobBtns(explorer: Explorer, isDarkMode: boolean): CopyJobCommand
      ariaLabel: ContainerCopyMessages.refreshButtonAriaLabel,
      onClick: () => monitorCopyJobsRef?.refreshJobList(),
    },
-    {
-      key: "themeToggle",
-      iconSrc: isDarkMode ? SunIcon : MoonIcon,
-      label: isDarkMode ? "Light Theme" : "Dark Theme",
-      ariaLabel: isPortal
-        ? "Dark Mode is managed in Azure Portal Settings"
-        : isDarkMode
-        ? "Switch to Light Theme"
-        : "Switch to Dark Theme",
-      disabled: isPortal,
-      onClick: isPortal ? () => {} : () => useThemeStore.getState().toggleTheme(),
-    },
  ];
-
  if (configContext.platform === Platform.Portal) {
    buttons.push({
      key: "feedback",
@@ -71,6 +54,6 @@ function btnMapper(config: CopyJobCommandBarBtnType): CommandButtonComponentProp
  };
 }

-export function getCommandBarButtons(explorer: Explorer, isDarkMode: boolean): CommandButtonComponentProps[] {
-  return getCopyJobBtns(explorer, isDarkMode).map(btnMapper);
+export function getCommandBarButtons(explorer: Explorer): CommandButtonComponentProps[] {
+  return getCopyJobBtns(explorer).map(btnMapper);
 }
--- a/src/Explorer/ContainerCopy/ContainerCopyMessages.ts
+++ b/src/Explorer/ContainerCopy/ContainerCopyMessages.ts
@@ -20,23 +20,12 @@ export default {
  createCopyJobPanelTitle: "Create copy job",

  // Select Account Screen
-  selectAccountDescription: "Please select a destination account to copy to.",
+  selectAccountDescription: "Please select a source account from which to copy.",
  subscriptionDropdownLabel: "Subscription",
  subscriptionDropdownPlaceholder: "Select a subscription",
-  destinationAccountDropdownLabel: "Account",
-  destinationAccountDropdownPlaceholder: "Select an account",
-  migrationTypeOptions: {
-    offline: {
-      title: "Offline mode",
-      description:
-        "Offline container copy jobs let you copy data from a source container to a destination Cosmos DB container for supported APIs. To ensure data integrity between the source and destination, we recommend stopping updates on the source container before creating the copy job. Learn more about [offline copy jobs](https://learn.microsoft.com/azure/cosmos-db/how-to-container-copy?tabs=offline-copy&pivots=api-nosql).",
-    },
-    online: {
-      title: "Online mode",
-      description:
-        "Online container copy jobs let you copy data from a source container to a destination Cosmos DB NoSQL API container using the [All Versions and Delete](https://learn.microsoft.com/azure/cosmos-db/change-feed-modes?tabs=all-versions-and-deletes#all-versions-and-deletes-change-feed-mode-preview) change feed. This allows updates to continue on the source while data is copied. A brief downtime is required at the end to safely switch over client applications to the destination container. Learn more about [online copy jobs](https://learn.microsoft.com/azure/cosmos-db/container-copy?tabs=online-copy&pivots=api-nosql#getting-started).",
-    },
-  },
+  sourceAccountDropdownLabel: "Account",
+  sourceAccountDropdownPlaceholder: "Select an account",
+  migrationTypeCheckboxLabel: "Copy container in offline mode",

  // Select Source and Target Containers Screen
  selectSourceAndTargetContainersDescription:
@@ -47,17 +36,14 @@ export default {
  databaseDropdownPlaceholder: "Select a database",
  containerDropdownLabel: "Container",
  containerDropdownPlaceholder: "Select a container",
-  createNewContainerSubHeading: (accountName?: string) =>
-    accountName
-      ? `Configure the properties for the new container on destination account "${accountName}".`
-      : "Configure the properties for the new container.",
+  createNewContainerSubHeading: "Select the properties for your container.",
  createContainerButtonLabel: "Create a new container",
  createContainerHeading: "Create new container",

  // Preview and Create Screen
  jobNameLabel: "Job name",
-  destinationSubscriptionLabel: "Destination subscription",
-  destinationAccountLabel: "Destination account",
+  sourceSubscriptionLabel: "Source subscription",
+  sourceAccountLabel: "Source account",
  sourceDatabaseLabel: "Source database",
  sourceContainerLabel: "Source container",
  targetDatabaseLabel: "Destination database",
@@ -66,7 +52,7 @@ export default {
  // Assign Permissions Screen
  assignPermissions: {
    crossAccountDescription:
-      "To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.",
+      "To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.",
    intraAccountOnlineDescription: (accountName: string) =>
      `Follow the steps below to enable online copy on your "${accountName}" account.`,
    crossAccountConfiguration: {
@@ -119,18 +105,18 @@ export default {
    popoverDescription: (accountName: string) =>
      `Assign the system-assigned managed identity as the default for "${accountName}". To confirm, click the "Yes" button. `,
  },
-  readWritePermissionAssigned: {
-    title: "Read-write permissions assigned to the default identity.",
+  readPermissionAssigned: {
+    title: "Read permissions assigned to the default identity.",
    description:
-      "To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.",
+      "To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.",
    tooltip: {
      content: "Learn more about",
-      hrefText: "Read-write permissions.",
+      hrefText: "Read permissions.",
      href: "https://learn.microsoft.com/azure/cosmos-db/nosql/how-to-connect-role-based-access-control",
    },
-    popoverTitle: "Assign read-write permissions to default identity.",
+    popoverTitle: "Read permissions assigned to default identity.",
    popoverDescription:
-      'Assign read-write permissions on the source account to the default identity of the destination account. To confirm, click the "Yes" button.',
+      "Assign read permissions of the source account to the default identity of the destination account. To confirm click the “Yes” button.",
  },
  pointInTimeRestore: {
    title: "Point In Time Restore enabled",
@@ -187,10 +173,5 @@ export default {
      Skipped: "Cancelled",
      Cancelled: "Cancelled",
    },
-    dialog: {
-      heading: "",
-      confirmButtonText: "Confirm",
-      cancelButtonText: "Cancel",
-    },
  },
 };
--- a/src/Explorer/ContainerCopy/Context/CopyJobContext.test.tsx
+++ b/src/Explorer/ContainerCopy/Context/CopyJobContext.test.tsx
@@ -59,6 +59,12 @@ describe("CopyJobContext", () => {
        jobName: "",
        migrationType: CopyJobMigrationType.Offline,
        source: {
+          subscription: null,
+          account: null,
+          databaseId: "",
+          containerId: "",
+        },
+        target: {
          subscriptionId: "test-subscription-id",
          account: {
            id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDB/databaseAccounts/test-account",
@@ -69,13 +75,7 @@ describe("CopyJobContext", () => {
          databaseId: "",
          containerId: "",
        },
-        target: {
-          subscription: null,
-          account: null,
-          databaseId: "",
-          containerId: "",
-        },
-        sourceReadWriteAccessFromTarget: false,
+        sourceReadAccessFromTarget: false,
      });
      expect(contextValue.flow).toBeNull();
      expect(contextValue.contextError).toBeNull();
@@ -598,8 +598,8 @@ describe("CopyJobContext", () => {
        </CopyJobContextProvider>,
      );

-      expect(contextValue.copyJobState.source?.subscriptionId).toBe("test-subscription-id");
-      expect(contextValue.copyJobState.source?.account?.name).toBe("test-account");
+      expect(contextValue.copyJobState.source?.subscription?.subscriptionId).toBeUndefined();
+      expect(contextValue.copyJobState.source?.account?.name).toBeUndefined();
    });

    it("should initialize target with userContext values", () => {
@@ -616,11 +616,11 @@ describe("CopyJobContext", () => {
        </CopyJobContextProvider>,
      );

-      expect(contextValue.copyJobState.target.subscription).toBeNull();
-      expect(contextValue.copyJobState.target.account).toBeNull();
+      expect(contextValue.copyJobState.target.subscriptionId).toBe("test-subscription-id");
+      expect(contextValue.copyJobState.target.account.name).toBe("test-account");
    });

-    it("should initialize sourceReadWriteAccessFromTarget as false", () => {
+    it("should initialize sourceReadAccessFromTarget as false", () => {
      let contextValue: any;

      render(
@@ -634,7 +634,7 @@ describe("CopyJobContext", () => {
        </CopyJobContextProvider>,
      );

-      expect(contextValue.copyJobState.sourceReadWriteAccessFromTarget).toBe(false);
+      expect(contextValue.copyJobState.sourceReadAccessFromTarget).toBe(false);
    });

    it("should initialize with empty database and container ids", () => {
--- a/src/Explorer/ContainerCopy/Context/CopyJobContext.tsx
+++ b/src/Explorer/ContainerCopy/Context/CopyJobContext.tsx
@@ -23,18 +23,18 @@ const getInitialCopyJobState = (): CopyJobContextState => {
    jobName: "",
    migrationType: CopyJobMigrationType.Offline,
    source: {
-      subscriptionId: userContext.subscriptionId || "",
-      account: userContext.databaseAccount || null,
-      databaseId: "",
-      containerId: "",
-    },
-    target: {
      subscription: null,
      account: null,
      databaseId: "",
      containerId: "",
    },
-    sourceReadWriteAccessFromTarget: false,
+    target: {
+      subscriptionId: userContext.subscriptionId || "",
+      account: userContext.databaseAccount || null,
+      databaseId: "",
+      containerId: "",
+    },
+    sourceReadAccessFromTarget: false,
  };
 };

--- a/src/Explorer/ContainerCopy/CopyJobUtils.test.ts
+++ b/src/Explorer/ContainerCopy/CopyJobUtils.test.ts
@@ -395,14 +395,6 @@ describe("CopyJobUtils", () => {
      expect(result).toBe(false);
    });

-    it("should return false for different completion percentage", () => {
-      const jobs1 = [createMockJob("job1", "Running")];
-      const jobs2 = [{ ...createMockJob("job1", "Running"), CompletionPercentage: 75 }];
-
-      const result = CopyJobUtils.isEqual(jobs1, jobs2);
-      expect(result).toBe(false);
-    });
-
    it("should return true for empty arrays", () => {
      const result = CopyJobUtils.isEqual([], []);
      expect(result).toBe(true);
--- a/src/Explorer/ContainerCopy/CopyJobUtils.ts
+++ b/src/Explorer/ContainerCopy/CopyJobUtils.ts
@@ -142,7 +142,7 @@ export function isEqual(prevJobs: CopyJobType[], newJobs: CopyJobType[]): boolea
    if (!newJob) {
      return false;
    }
-    return prevJob.Status === newJob.Status && prevJob.CompletionPercentage === newJob.CompletionPercentage;
+    return prevJob.Status === newJob.Status;
  });
 }

--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddManagedIdentity.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddManagedIdentity.test.tsx
@@ -67,7 +67,7 @@ describe("AddManagedIdentity", () => {
      databaseId: "target-db",
      containerId: "target-container",
    },
-    sourceReadWriteAccessFromTarget: false,
+    sourceReadAccessFromTarget: false,
  };

  const mockContextValue = {
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddManagedIdentity.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddManagedIdentity.tsx
@@ -12,12 +12,7 @@ import useToggle from "./hooks/useToggle";
 const managedIdentityTooltip = (
  <Text>
    {ContainerCopyMessages.addManagedIdentity.tooltip.content} &nbsp;
-    <Link
-      style={{ color: "var(--colorBrandForeground1)" }}
-      href={ContainerCopyMessages.addManagedIdentity.tooltip.href}
-      target="_blank"
-      rel="noopener noreferrer"
-    >
+    <Link href={ContainerCopyMessages.addManagedIdentity.tooltip.href} target="_blank" rel="noopener noreferrer">
      {ContainerCopyMessages.addManagedIdentity.tooltip.hrefText}
    </Link>
  </Text>
@@ -31,7 +26,7 @@ const AddManagedIdentity: React.FC<AddManagedIdentityProps> = () => {

  return (
    <Stack className="addManagedIdentityContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
-      <Text className="themeText">
+      <Text>
        {ContainerCopyMessages.addManagedIdentity.description}&ensp;
        <Link href={ContainerCopyMessages.addManagedIdentity.descriptionHref} target="_blank" rel="noopener noreferrer">
          {ContainerCopyMessages.addManagedIdentity.descriptionHrefText}
@@ -40,7 +35,6 @@ const AddManagedIdentity: React.FC<AddManagedIdentityProps> = () => {
        <InfoTooltip content={managedIdentityTooltip} />
      </Text>
      <Toggle
-        data-test="btn-toggle"
        checked={systemAssigned}
        onText={ContainerCopyMessages.toggleBtn.onText}
        offText={ContainerCopyMessages.toggleBtn.offText}
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddReadPermissionToDefaultIdentity.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddReadPermissionToDefaultIdentity.test.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { CopyJobContext } from "../../../Context/CopyJobContext";
 import { CopyJobContextProviderType } from "../../../Types/CopyJobTypes";
-import AddReadWritePermissionToDefaultIdentity from "./AddReadWritePermissionToDefaultIdentity";
+import AddReadPermissionToDefaultIdentity from "./AddReadPermissionToDefaultIdentity";

 jest.mock("../../../../../Common/Logger", () => ({
  logError: jest.fn(),
@@ -73,7 +73,7 @@ import { assignRole, RoleAssignmentType } from "../../../../../Utils/arm/RbacUti
 import { getAccountDetailsFromResourceId } from "../../../CopyJobUtils";
 import useToggle from "./hooks/useToggle";

-describe("AddReadWritePermissionToDefaultIdentity Component", () => {
+describe("AddReadPermissionToDefaultIdentity Component", () => {
  const mockUseToggle = useToggle as jest.MockedFunction<typeof useToggle>;
  const mockAssignRole = assignRole as jest.MockedFunction<typeof assignRole>;
  const mockGetAccountDetailsFromResourceId = getAccountDetailsFromResourceId as jest.MockedFunction<
@@ -86,7 +86,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
      jobName: "test-job",
      migrationType: CopyJobMigrationType.Offline,
      source: {
-        subscriptionId: "source-sub-id",
+        subscription: { subscriptionId: "source-sub-id" } as Subscription,
        account: {
          id: "/subscriptions/source-sub-id/resourceGroups/source-rg/providers/Microsoft.DocumentDB/databaseAccounts/source-account",
          name: "source-account",
@@ -101,7 +101,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
        containerId: "source-container",
      },
      target: {
-        subscription: { subscriptionId: "target-sub-id" } as Subscription,
+        subscriptionId: "target-sub-id",
        account: {
          id: "/subscriptions/target-sub-id/resourceGroups/target-rg/providers/Microsoft.DocumentDB/databaseAccounts/target-account",
          name: "target-account",
@@ -119,7 +119,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
        databaseId: "target-db",
        containerId: "target-container",
      },
-      sourceReadWriteAccessFromTarget: false,
+      sourceReadAccessFromTarget: false,
    },
    setCopyJobState: jest.fn(),
    setContextError: jest.fn(),
@@ -133,7 +133,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
  const renderComponent = (contextValue = mockContextValue) => {
    return render(
      <CopyJobContext.Provider value={contextValue}>
-        <AddReadWritePermissionToDefaultIdentity />
+        <AddReadPermissionToDefaultIdentity />
      </CopyJobContext.Provider>,
    );
  };
@@ -164,12 +164,12 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
      expect(container).toMatchSnapshot();
    });

-    it("should render correctly when sourceReadWriteAccessFromTarget is true", () => {
+    it("should render correctly when sourceReadAccessFromTarget is true", () => {
      const contextWithAccess = {
        ...mockContextValue,
        copyJobState: {
          ...mockContextValue.copyJobState,
-          sourceReadWriteAccessFromTarget: true,
+          sourceReadAccessFromTarget: true,
        },
      };
      const { container } = renderComponent(contextWithAccess);
@@ -180,7 +180,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
  describe("Component Structure", () => {
    it("should display the description text", () => {
      renderComponent();
-      expect(screen.getByText(ContainerCopyMessages.readWritePermissionAssigned.description)).toBeInTheDocument();
+      expect(screen.getByText(ContainerCopyMessages.readPermissionAssigned.description)).toBeInTheDocument();
    });

    it("should display the info tooltip", () => {
@@ -212,10 +212,10 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {

      expect(screen.getByTestId("popover-message")).toBeInTheDocument();
      expect(screen.getByTestId("popover-title")).toHaveTextContent(
-        ContainerCopyMessages.readWritePermissionAssigned.popoverTitle,
+        ContainerCopyMessages.readPermissionAssigned.popoverTitle,
      );
      expect(screen.getByTestId("popover-content")).toHaveTextContent(
-        ContainerCopyMessages.readWritePermissionAssigned.popoverDescription,
+        ContainerCopyMessages.readPermissionAssigned.popoverDescription,
      );
    });

@@ -243,7 +243,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
      expect(mockOnToggle).toHaveBeenCalledWith(null, false);
    });

-    it("should call handleAddReadWritePermission when primary button is clicked", async () => {
+    it("should call handleAddReadPermission when primary button is clicked", async () => {
      mockGetAccountDetailsFromResourceId.mockReturnValue({
        subscriptionId: "source-sub-id",
        resourceGroup: "source-rg",
@@ -264,7 +264,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
    });
  });

-  describe("handleAddReadWritePermission Function", () => {
+  describe("handleAddReadPermission Function", () => {
    beforeEach(() => {
      mockUseToggle.mockReturnValue([true, jest.fn()]);
    });
@@ -312,7 +312,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {
      await waitFor(() => {
        expect(mockLogError).toHaveBeenCalledWith(
          "Permission denied",
-          "CopyJob/AddReadWritePermissionToDefaultIdentity.handleAddReadWritePermission",
+          "CopyJob/AddReadPermissionToDefaultIdentity.handleAddReadPermission",
        );
      });

@@ -336,14 +336,14 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {

      await waitFor(() => {
        expect(mockLogError).toHaveBeenCalledWith(
-          "Error assigning read-write permission to default identity. Please try again later.",
-          "CopyJob/AddReadWritePermissionToDefaultIdentity.handleAddReadWritePermission",
+          "Error assigning read permission to default identity. Please try again later.",
+          "CopyJob/AddReadPermissionToDefaultIdentity.handleAddReadPermission",
        );
      });

      await waitFor(() => {
        expect(mockContextValue.setContextError).toHaveBeenCalledWith(
-          "Error assigning read-write permission to default identity. Please try again later.",
+          "Error assigning read permission to default identity. Please try again later.",
        );
      });
    });
@@ -496,7 +496,7 @@ describe("AddReadWritePermissionToDefaultIdentity Component", () => {

      expect(updatedState).toEqual({
        ...mockContextValue.copyJobState,
-        sourceReadWriteAccessFromTarget: true,
+        sourceReadAccessFromTarget: true,
      });
    });
  });
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddReadWritePermissionToDefaultIdentity.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddReadWritePermissionToDefaultIdentity.tsx
@@ -12,29 +12,22 @@ import useToggle from "./hooks/useToggle";

 const TooltipContent = (
  <Text>
-    {ContainerCopyMessages.readWritePermissionAssigned.tooltip.content} &nbsp;
-    <Link
-      style={{ color: "var(--colorBrandForeground1)" }}
-      href={ContainerCopyMessages.readWritePermissionAssigned.tooltip.href}
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      {ContainerCopyMessages.readWritePermissionAssigned.tooltip.hrefText}
+    {ContainerCopyMessages.readPermissionAssigned.tooltip.content} &nbsp;
+    <Link href={ContainerCopyMessages.readPermissionAssigned.tooltip.href} target="_blank" rel="noopener noreferrer">
+      {ContainerCopyMessages.readPermissionAssigned.tooltip.hrefText}
    </Link>
  </Text>
 );
+type AddReadPermissionToDefaultIdentityProps = Partial<PermissionSectionConfig>;

-type AddReadWritePermissionToDefaultIdentityProps = Partial<PermissionSectionConfig>;
-
-const AddReadWritePermissionToDefaultIdentity: React.FC<AddReadWritePermissionToDefaultIdentityProps> = () => {
+const AddReadPermissionToDefaultIdentity: React.FC<AddReadPermissionToDefaultIdentityProps> = () => {
  const [loading, setLoading] = React.useState(false);
  const { copyJobState, setCopyJobState, setContextError } = useCopyJobContext();
-  const [readWritePermissionAssigned, onToggle] = useToggle(copyJobState.sourceReadWriteAccessFromTarget ?? false);
+  const [readPermissionAssigned, onToggle] = useToggle(false);

-  const handleAddReadWritePermission = async () => {
+  const handleAddReadPermission = async () => {
    const { source, target } = copyJobState;
    const selectedSourceAccount = source?.account;
-
    try {
      const {
        subscriptionId: sourceSubscriptionId,
@@ -49,17 +42,16 @@ const AddReadWritePermissionToDefaultIdentity: React.FC<AddReadWritePermissionTo
        sourceAccountName,
        target?.account?.identity?.principalId ?? "",
      );
-
      if (assignedRole) {
        setCopyJobState((prevState) => ({
          ...prevState,
-          sourceReadWriteAccessFromTarget: true,
+          sourceReadAccessFromTarget: true,
        }));
      }
    } catch (error) {
      const errorMessage =
-        error.message || "Error assigning read-write permission to default identity. Please try again later.";
-      logError(errorMessage, "CopyJob/AddReadWritePermissionToDefaultIdentity.handleAddReadWritePermission");
+        error.message || "Error assigning read permission to default identity. Please try again later.";
+      logError(errorMessage, "CopyJob/AddReadPermissionToDefaultIdentity.handleAddReadPermission");
      setContextError(errorMessage);
    } finally {
      setLoading(false);
@@ -69,12 +61,11 @@ const AddReadWritePermissionToDefaultIdentity: React.FC<AddReadWritePermissionTo
  return (
    <Stack className="defaultManagedIdentityContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
      <Text className="toggle-label">
-        {ContainerCopyMessages.readWritePermissionAssigned.description}&ensp;
+        {ContainerCopyMessages.readPermissionAssigned.description}&ensp;
        <InfoTooltip content={TooltipContent} />
      </Text>
      <Toggle
-        data-test="btn-toggle"
-        checked={readWritePermissionAssigned}
+        checked={readPermissionAssigned}
        onText={ContainerCopyMessages.toggleBtn.onText}
        offText={ContainerCopyMessages.toggleBtn.offText}
        onChange={onToggle}
@@ -86,15 +77,15 @@ const AddReadWritePermissionToDefaultIdentity: React.FC<AddReadWritePermissionTo
      />
      <PopoverMessage
        isLoading={loading}
-        visible={readWritePermissionAssigned}
-        title={ContainerCopyMessages.readWritePermissionAssigned.popoverTitle}
+        visible={readPermissionAssigned}
+        title={ContainerCopyMessages.readPermissionAssigned.popoverTitle}
        onCancel={() => onToggle(null, false)}
-        onPrimary={handleAddReadWritePermission}
+        onPrimary={handleAddReadPermission}
      >
-        {ContainerCopyMessages.readWritePermissionAssigned.popoverDescription}
+        {ContainerCopyMessages.readPermissionAssigned.popoverDescription}
      </PopoverMessage>
    </Stack>
  );
 };

-export default AddReadWritePermissionToDefaultIdentity;
+export default AddReadPermissionToDefaultIdentity;
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AssignPermissions.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AssignPermissions.test.tsx
@@ -43,12 +43,12 @@ jest.mock("./AddManagedIdentity", () => {
  return MockAddManagedIdentity;
 });

-jest.mock("./AddReadWritePermissionToDefaultIdentity", () => {
-  const MockAddReadWritePermissionToDefaultIdentity = () => {
-    return <div data-testid="add-read-write-permission">Add Read-Write Permission Component</div>;
+jest.mock("./AddReadPermissionToDefaultIdentity", () => {
+  const MockAddReadPermissionToDefaultIdentity = () => {
+    return <div data-testid="add-read-permission">Add Read Permission Component</div>;
  };
-  MockAddReadWritePermissionToDefaultIdentity.displayName = "MockAddReadWritePermissionToDefaultIdentity";
-  return MockAddReadWritePermissionToDefaultIdentity;
+  MockAddReadPermissionToDefaultIdentity.displayName = "MockAddReadPermissionToDefaultIdentity";
+  return MockAddReadPermissionToDefaultIdentity;
 });

 jest.mock("./DefaultManagedIdentity", () => {
@@ -85,18 +85,18 @@ describe("AssignPermissions Component", () => {
    jobName: "test-job",
    migrationType: CopyJobMigrationType.Offline,
    source: {
-      subscriptionId: "source-sub",
+      subscription: { subscriptionId: "source-sub" } as any,
      account: { id: "source-account", name: "Source Account" } as any,
      databaseId: "source-db",
      containerId: "source-container",
    },
    target: {
-      subscription: { subscriptionId: "target-sub" } as any,
+      subscriptionId: "target-sub",
      account: { id: "target-account", name: "Target Account" } as any,
      databaseId: "target-db",
      containerId: "target-container",
    },
-    sourceReadWriteAccessFromTarget: false,
+    sourceReadAccessFromTarget: false,
    ...overrides,
  });

@@ -164,13 +164,13 @@ describe("AssignPermissions Component", () => {
      const copyJobState = createMockCopyJobState({
        migrationType: CopyJobMigrationType.Online,
        source: {
-          subscriptionId: "same-sub",
+          subscription: { subscriptionId: "same-sub" } as any,
          account: { id: "same-account", name: "Same Account" } as any,
          databaseId: "source-db",
          containerId: "source-container",
        },
        target: {
-          subscription: { subscriptionId: "same-sub" } as any,
+          subscriptionId: "same-sub",
          account: { id: "same-account", name: "Same Account" } as any,
          databaseId: "target-db",
          containerId: "target-container",
@@ -201,7 +201,7 @@ describe("AssignPermissions Component", () => {
              completed: true,
            },
            {
-              id: "readWritePermissionAssigned",
+              id: "readPermissionAssigned",
              title: "Read Permission Assigned",
              Component: () => <div data-testid="add-read-permission">Add Read Permission Component</div>,
              disabled: false,
@@ -347,7 +347,7 @@ describe("AssignPermissions Component", () => {
    it("should handle missing account names", () => {
      const copyJobState = createMockCopyJobState({
        source: {
-          subscriptionId: "source-sub",
+          subscription: { subscriptionId: "source-sub" } as any,
          account: { id: "source-account" } as any,
          databaseId: "source-db",
          containerId: "source-container",
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AssignPermissions.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AssignPermissions.tsx
@@ -12,7 +12,7 @@ import { useCopyJobPrerequisitesCache } from "../../Utils/useCopyJobPrerequisite
 import usePermissionSections, { PermissionGroupConfig, PermissionSectionConfig } from "./hooks/usePermissionsSection";

 const PermissionSection: React.FC<PermissionSectionConfig> = ({ id, title, Component, completed, disabled }) => (
-  <AccordionItem key={id} value={id} disabled={disabled} data-test="accordion-item">
+  <AccordionItem key={id} value={id} disabled={disabled}>
    <AccordionHeader className="accordionHeader">
      <Text className="accordionHeaderText" variant="medium">
        {title}
@@ -25,13 +25,13 @@ const PermissionSection: React.FC<PermissionSectionConfig> = ({ id, title, Compo
        height={completed ? 20 : 24}
      />
    </AccordionHeader>
-    <AccordionPanel aria-disabled={disabled} className="accordionPanel" data-test="accordion-panel">
+    <AccordionPanel aria-disabled={disabled} className="accordionPanel">
      <Component />
    </AccordionPanel>
  </AccordionItem>
 );

-const PermissionGroup: React.FC<PermissionGroupConfig> = ({ id, title, description, sections }) => {
+const PermissionGroup: React.FC<PermissionGroupConfig> = ({ title, description, sections }) => {
  const [openItems, setOpenItems] = React.useState<string[]>([]);

  useEffect(() => {
@@ -44,12 +44,11 @@ const PermissionGroup: React.FC<PermissionGroupConfig> = ({ id, title, descripti

  return (
    <Stack
-      data-test={`permission-group-container-${id}`}
      tokens={{ childrenGap: 15 }}
      styles={{
        root: {
-          background: "var(--colorNeutralBackground2)",
-          border: "1px solid var(--colorNeutralStroke1)",
+          background: "#fafafa",
+          border: "1px solid #e1e1e1",
          borderRadius: 8,
          padding: 16,
          boxShadow: "0 1px 3px rgba(0,0,0,0.1)",
@@ -57,11 +56,11 @@ const PermissionGroup: React.FC<PermissionGroupConfig> = ({ id, title, descripti
      }}
    >
      <Stack tokens={{ childrenGap: 5 }}>
-        <Text variant="medium" style={{ fontWeight: 600, color: "var(--colorNeutralForeground1)" }}>
+        <Text variant="medium" style={{ fontWeight: 600 }}>
          {title}
        </Text>
        {description && (
-          <Text variant="small" styles={{ root: { color: "var(--colorNeutralForeground2)" } }}>
+          <Text variant="small" styles={{ root: { color: "#605E5C" } }}>
            {description}
          </Text>
        )}
@@ -100,12 +99,8 @@ const AssignPermissions = () => {
  }, []);

  return (
-    <Stack
-      data-test="Panel:AssignPermissionsContainer"
-      className="assignPermissionsContainer"
-      tokens={{ childrenGap: 20 }}
-    >
-      <Text variant="medium" style={{ color: "var(--colorNeutralForeground1)" }}>
+    <Stack className="assignPermissionsContainer" tokens={{ childrenGap: 20 }}>
+      <Text variant="medium">
        {isSameAccount && copyJobState.migrationType === CopyJobMigrationType.Online
          ? ContainerCopyMessages.assignPermissions.intraAccountOnlineDescription(
              copyJobState?.source?.account?.name || "",
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/DefaultManagedIdentity.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/DefaultManagedIdentity.tsx
@@ -12,12 +12,7 @@ import useToggle from "./hooks/useToggle";
 const managedIdentityTooltip = (
  <Text>
    {ContainerCopyMessages.defaultManagedIdentity.tooltip.content} &nbsp;
-    <Link
-      style={{ color: "var(--colorBrandForeground1)" }}
-      href={ContainerCopyMessages.defaultManagedIdentity.tooltip.href}
-      target="_blank"
-      rel="noopener noreferrer"
-    >
+    <Link href={ContainerCopyMessages.defaultManagedIdentity.tooltip.href} target="_blank" rel="noopener noreferrer">
      {ContainerCopyMessages.defaultManagedIdentity.tooltip.hrefText}
    </Link>
  </Text>
@@ -36,7 +31,6 @@ const DefaultManagedIdentity: React.FC<AddManagedIdentityProps> = () => {
        <InfoTooltip content={managedIdentityTooltip} />
      </div>
      <Toggle
-        data-test="btn-toggle"
        checked={defaultSystemAssigned}
        onText={ContainerCopyMessages.toggleBtn.onText}
        offText={ContainerCopyMessages.toggleBtn.offText}
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/PointInTimeRestore.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/PointInTimeRestore.test.tsx
@@ -50,18 +50,18 @@ describe("PointInTimeRestore", () => {
    jobName: "test-job",
    migrationType: CopyJobMigrationType.Offline,
    source: {
-      subscriptionId: "test-sub",
+      subscription: { subscriptionId: "test-sub", displayName: "Test Subscription" },
      account: mockSourceAccount,
      databaseId: "test-db",
      containerId: "test-container",
    },
    target: {
-      subscription: { subscriptionId: "test-sub", displayName: "Test Subscription" },
+      subscriptionId: "test-sub",
      account: mockSourceAccount,
      databaseId: "target-db",
      containerId: "target-container",
    },
-    sourceReadWriteAccessFromTarget: false,
+    sourceReadAccessFromTarget: false,
  } as CopyJobContextState;

  const mockSetCopyJobState = jest.fn();
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/PointInTimeRestore.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/PointInTimeRestore.tsx
@@ -13,12 +13,7 @@ import InfoTooltip from "../Components/InfoTooltip";
 const tooltipContent = (
  <Text>
    {ContainerCopyMessages.pointInTimeRestore.tooltip.content} &nbsp;
-    <Link
-      style={{ color: "var(--colorBrandForeground1)" }}
-      href={ContainerCopyMessages.pointInTimeRestore.tooltip.href}
-      target="_blank"
-      rel="noopener noreferrer"
-    >
+    <Link href={ContainerCopyMessages.pointInTimeRestore.tooltip.href} target="_blank" rel="noopener noreferrer">
      {ContainerCopyMessages.pointInTimeRestore.tooltip.hrefText}
    </Link>
  </Text>
@@ -132,7 +127,6 @@ const PointInTimeRestore: React.FC = () => {
      <Stack.Item>
        {showRefreshButton ? (
          <PrimaryButton
-            data-test="pointInTimeRestore:RefreshBtn"
            className="fullWidth"
            text={ContainerCopyMessages.refreshButtonLabel}
            iconProps={{ iconName: "Refresh" }}
@@ -140,7 +134,6 @@ const PointInTimeRestore: React.FC = () => {
          />
        ) : (
          <PrimaryButton
-            data-test="pointInTimeRestore:PrimaryBtn"
            className="fullWidth"
            text={loading ? "" : ContainerCopyMessages.pointInTimeRestore.buttonText}
            {...(loading ? { iconProps: { iconName: "SyncStatusSolid" } } : {})}
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/AddManagedIdentity.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/AddManagedIdentity.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`AddManagedIdentity Snapshot Tests renders initial state correctly 1`] =
  class="ms-Stack addManagedIdentityContainer css-109"
 >
  <span
-    class="themeText css-110"
+    class="css-110"
  >
    A system-assigned managed identity is restricted to one per resource and is tied to the lifecycle of this resource. Once enabled, you can grant permissions to the managed identity by using Azure role-based access control (Azure RBAC). The managed identity is authenticated with Microsoft Entra ID, so you don’t have to store any credentials in code.
     
@@ -67,7 +67,6 @@ exports[`AddManagedIdentity Snapshot Tests renders initial state correctly 1`] =
        class="ms-Toggle-background pill-117"
        data-is-focusable="true"
        data-ktp-target="true"
-        data-test="btn-toggle"
        id="Toggle1"
        role="switch"
        type="button"
@@ -93,7 +92,7 @@ exports[`AddManagedIdentity Snapshot Tests renders loading state 1`] = `
  class="ms-Stack addManagedIdentityContainer css-109"
 >
  <span
-    class="themeText css-110"
+    class="css-110"
  >
    A system-assigned managed identity is restricted to one per resource and is tied to the lifecycle of this resource. Once enabled, you can grant permissions to the managed identity by using Azure role-based access control (Azure RBAC). The managed identity is authenticated with Microsoft Entra ID, so you don’t have to store any credentials in code.
     
@@ -155,7 +154,6 @@ exports[`AddManagedIdentity Snapshot Tests renders loading state 1`] = `
        class="ms-Toggle-background pill-121"
        data-is-focusable="true"
        data-ktp-target="true"
-        data-test="btn-toggle"
        id="Toggle11"
        role="switch"
        type="button"
@@ -175,12 +173,10 @@ exports[`AddManagedIdentity Snapshot Tests renders loading state 1`] = `
  </div>
  <div
    class="ms-Stack popover-container foreground loading css-123"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <div
      class="ms-Overlay root-135"
-      data-test="loading-overlay"
    >
      <div
        class="ms-Spinner root-137"
@@ -196,13 +192,13 @@ exports[`AddManagedIdentity Snapshot Tests renders loading state 1`] = `
      </div>
    </div>
    <span
-      class="themeText css-124"
+      class="css-124"
      style="font-weight: 600;"
    >
      Enable system assigned managed identity
    </span>
    <span
-      class="themeText css-110"
+      class="css-110"
    >
      Enable system-assigned managed identity on the test-target-account. To confirm, click the "Yes" button.
    </span>
@@ -265,7 +261,7 @@ exports[`AddManagedIdentity Snapshot Tests renders with toggle on and popover vi
  class="ms-Stack addManagedIdentityContainer css-109"
 >
  <span
-    class="themeText css-110"
+    class="css-110"
  >
    A system-assigned managed identity is restricted to one per resource and is tied to the lifecycle of this resource. Once enabled, you can grant permissions to the managed identity by using Azure role-based access control (Azure RBAC). The managed identity is authenticated with Microsoft Entra ID, so you don’t have to store any credentials in code.
     
@@ -327,7 +323,6 @@ exports[`AddManagedIdentity Snapshot Tests renders with toggle on and popover vi
        class="ms-Toggle-background pill-121"
        data-is-focusable="true"
        data-ktp-target="true"
-        data-test="btn-toggle"
        id="Toggle3"
        role="switch"
        type="button"
@@ -347,17 +342,16 @@ exports[`AddManagedIdentity Snapshot Tests renders with toggle on and popover vi
  </div>
  <div
    class="ms-Stack popover-container foreground css-123"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-124"
+      class="css-124"
      style="font-weight: 600;"
    >
      Enable system assigned managed identity
    </span>
    <span
-      class="themeText css-110"
+      class="css-110"
    >
      Enable system-assigned managed identity on the test-target-account. To confirm, click the "Yes" button.
    </span>
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/AddReadPermissionToDefaultIdentity.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/AddReadPermissionToDefaultIdentity.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should handle missing source account 1`] = `
+exports[`AddReadPermissionToDefaultIdentity Component Edge Cases should handle missing source account 1`] = `
 <div>
  <div
    class="ms-Stack defaultManagedIdentityContainer css-109"
@@ -8,7 +8,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
    <span
      class="toggle-label css-110"
    >
-      To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.
+      To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.
       
      <div
        data-testid="info-tooltip"
@@ -24,7 +24,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
            rel="noopener noreferrer"
            target="_blank"
          >
-            Read-write permissions.
+            Read permissions.
          </a>
        </span>
      </div>
@@ -41,7 +41,6 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle17"
          role="switch"
          type="button"
@@ -63,7 +62,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
 </div>
 `;

-exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should handle missing target account identity 1`] = `
+exports[`AddReadPermissionToDefaultIdentity Component Edge Cases should handle missing target account identity 1`] = `
 <div>
  <div
    class="ms-Stack defaultManagedIdentityContainer css-109"
@@ -71,7 +70,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
    <span
      class="toggle-label css-110"
    >
-      To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.
+      To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.
       
      <div
        data-testid="info-tooltip"
@@ -87,7 +86,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
            rel="noopener noreferrer"
            target="_blank"
          >
-            Read-write permissions.
+            Read permissions.
          </a>
        </span>
      </div>
@@ -104,7 +103,6 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle16"
          role="switch"
          type="button"
@@ -126,7 +124,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Edge Cases should han
 </div>
 `;

-exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should render correctly when sourceReadWriteAccessFromTarget is true 1`] = `
+exports[`AddReadPermissionToDefaultIdentity Component Rendering should render correctly when sourceReadAccessFromTarget is true 1`] = `
 <div>
  <div
    class="ms-Stack defaultManagedIdentityContainer css-109"
@@ -134,7 +132,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
    <span
      class="toggle-label css-110"
    >
-      To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.
+      To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.
       
      <div
        data-testid="info-tooltip"
@@ -150,7 +148,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
            rel="noopener noreferrer"
            target="_blank"
          >
-            Read-write permissions.
+            Read permissions.
          </a>
        </span>
      </div>
@@ -167,7 +165,6 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle3"
          role="switch"
          type="button"
@@ -189,7 +186,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
 </div>
 `;

-exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should render correctly when toggle is on 1`] = `
+exports[`AddReadPermissionToDefaultIdentity Component Rendering should render correctly when toggle is on 1`] = `
 <div>
  <div
    class="ms-Stack defaultManagedIdentityContainer css-109"
@@ -197,7 +194,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
    <span
      class="toggle-label css-110"
    >
-      To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.
+      To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.
       
      <div
        data-testid="info-tooltip"
@@ -213,7 +210,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
            rel="noopener noreferrer"
            target="_blank"
          >
-            Read-write permissions.
+            Read permissions.
          </a>
        </span>
      </div>
@@ -230,7 +227,6 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
          class="ms-Toggle-background pill-119"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle1"
          role="switch"
          type="button"
@@ -255,12 +251,12 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
      <div
        data-testid="popover-title"
      >
-        Assign read-write permissions to default identity.
+        Read permissions assigned to default identity.
      </div>
      <div
        data-testid="popover-content"
      >
-        Assign read-write permissions on the source account to the default identity of the destination account. To confirm, click the "Yes" button.
+        Assign read permissions of the source account to the default identity of the destination account. To confirm click the “Yes” button.
      </div>
      <button
        data-testid="popover-cancel"
@@ -277,7 +273,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
 </div>
 `;

-exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should render correctly with default state 1`] = `
+exports[`AddReadPermissionToDefaultIdentity Component Rendering should render correctly with default state 1`] = `
 <div>
  <div
    class="ms-Stack defaultManagedIdentityContainer css-109"
@@ -285,7 +281,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
    <span
      class="toggle-label css-110"
    >
-      To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.
+      To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.
       
      <div
        data-testid="info-tooltip"
@@ -301,7 +297,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
            rel="noopener noreferrer"
            target="_blank"
          >
-            Read-write permissions.
+            Read permissions.
          </a>
        </span>
      </div>
@@ -318,7 +314,6 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle0"
          role="switch"
          type="button"
@@ -340,7 +335,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
 </div>
 `;

-exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should render correctly with different context states 1`] = `
+exports[`AddReadPermissionToDefaultIdentity Component Rendering should render correctly with different context states 1`] = `
 <div>
  <div
    class="ms-Stack defaultManagedIdentityContainer css-109"
@@ -348,7 +343,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
    <span
      class="toggle-label css-110"
    >
-      To allow data copy from source to the destination container, provide read-write access on the source account to the default identity of the destination account.
+      To allow data copy from source to the destination container, provide read access of the source account to the default identity of the destination account.
       
      <div
        data-testid="info-tooltip"
@@ -364,7 +359,7 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
            rel="noopener noreferrer"
            target="_blank"
          >
-            Read-write permissions.
+            Read permissions.
          </a>
        </span>
      </div>
@@ -381,7 +376,6 @@ exports[`AddReadWritePermissionToDefaultIdentity Component Rendering should rend
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle2"
          role="switch"
          type="button"
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/AssignPermissions.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/AssignPermissions.test.tsx.snap
@@ -4,19 +4,17 @@ exports[`AssignPermissions Component Accordion Behavior should render accordion
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
    >
-      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.
+      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.
    </span>
    <div
      class="ms-Stack css-111"
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-testGroup"
      >
        <div
          class="ms-Stack css-113"
@@ -38,7 +36,6 @@ exports[`AssignPermissions Component Accordion Behavior should render accordion
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -88,7 +85,6 @@ exports[`AssignPermissions Component Accordion Behavior should render accordion
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -138,7 +134,6 @@ exports[`AssignPermissions Component Accordion Behavior should render accordion
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div>
                Incomplete Component
@@ -147,7 +142,6 @@ exports[`AssignPermissions Component Accordion Behavior should render accordion
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___lyghz50_53x5ri0 f1s2aq7o f1c21dwh f1s184ao ft85np5 fwrgwhw"
@@ -207,19 +201,17 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
    >
-      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.
+      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.
    </span>
    <div
      class="ms-Stack css-111"
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-testGroup"
      >
        <div
          class="ms-Stack css-113"
@@ -241,7 +233,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -291,7 +282,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -341,7 +331,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div>
                Incomplete Component
@@ -350,7 +339,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___lyghz50_53x5ri0 f1s2aq7o f1c21dwh f1s184ao ft85np5 fwrgwhw"
@@ -410,7 +398,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
@@ -422,7 +409,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-testGroup"
      >
        <div
          class="ms-Stack css-113"
@@ -444,7 +430,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -494,7 +479,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -544,7 +528,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div>
                Incomplete Component
@@ -553,7 +536,6 @@ exports[`AssignPermissions Component Edge Cases should calculate correct indent
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___lyghz50_53x5ri0 f1s2aq7o f1c21dwh f1s184ao ft85np5 fwrgwhw"
@@ -613,19 +595,17 @@ exports[`AssignPermissions Component Edge Cases should handle missing account na
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
    >
-      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.
+      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.
    </span>
    <div
      class="ms-Stack css-111"
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-testGroup"
      >
        <div
          class="ms-Stack css-113"
@@ -647,7 +627,6 @@ exports[`AssignPermissions Component Edge Cases should handle missing account na
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -697,7 +676,6 @@ exports[`AssignPermissions Component Edge Cases should handle missing account na
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -747,7 +725,6 @@ exports[`AssignPermissions Component Edge Cases should handle missing account na
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div>
                Incomplete Component
@@ -756,7 +733,6 @@ exports[`AssignPermissions Component Edge Cases should handle missing account na
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___lyghz50_53x5ri0 f1s2aq7o f1c21dwh f1s184ao ft85np5 fwrgwhw"
@@ -816,7 +792,6 @@ exports[`AssignPermissions Component Permission Groups should render multiple pe
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
@@ -828,7 +803,6 @@ exports[`AssignPermissions Component Permission Groups should render multiple pe
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-crossAccountConfigs"
      >
        <div
          class="ms-Stack css-113"
@@ -850,7 +824,6 @@ exports[`AssignPermissions Component Permission Groups should render multiple pe
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -902,7 +875,6 @@ exports[`AssignPermissions Component Permission Groups should render multiple pe
      </div>
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-onlineConfigs"
      >
        <div
          class="ms-Stack css-113"
@@ -924,7 +896,6 @@ exports[`AssignPermissions Component Permission Groups should render multiple pe
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -974,7 +945,6 @@ exports[`AssignPermissions Component Permission Groups should render multiple pe
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div
                data-testid="online-copy-enabled"
@@ -994,7 +964,6 @@ exports[`AssignPermissions Component Permission Groups should render online migr
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
@@ -1006,7 +975,6 @@ exports[`AssignPermissions Component Permission Groups should render online migr
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-onlineConfigs"
      >
        <div
          class="ms-Stack css-113"
@@ -1028,7 +996,6 @@ exports[`AssignPermissions Component Permission Groups should render online migr
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -1078,7 +1045,6 @@ exports[`AssignPermissions Component Permission Groups should render online migr
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -1128,7 +1094,6 @@ exports[`AssignPermissions Component Permission Groups should render online migr
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div
                data-testid="online-copy-enabled"
@@ -1148,19 +1113,17 @@ exports[`AssignPermissions Component Permission Groups should render permission
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
    >
-      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.
+      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.
    </span>
    <div
      class="ms-Stack css-111"
    >
      <div
        class="ms-Stack css-112"
-        data-test="permission-group-container-crossAccountConfigs"
      >
        <div
          class="ms-Stack css-113"
@@ -1182,7 +1145,6 @@ exports[`AssignPermissions Component Permission Groups should render permission
        >
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -1232,7 +1194,6 @@ exports[`AssignPermissions Component Permission Groups should render permission
          </div>
          <div
            class="fui-AccordionItem"
-            data-test="accordion-item"
          >
            <div
              class="fui-AccordionHeader accordionHeader ___kex8dp0_1udlp87 f19n0e5 f1c21dwh f1s184ao ft85np5"
@@ -1282,7 +1243,6 @@ exports[`AssignPermissions Component Permission Groups should render permission
            <div
              aria-disabled="false"
              class="fui-AccordionPanel accordionPanel ___1rufncu_1hx1scr f1axvtxu"
-              data-test="accordion-panel"
            >
              <div
                data-testid="add-read-permission"
@@ -1302,12 +1262,11 @@ exports[`AssignPermissions Component Rendering should render without crashing wi
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
    >
-      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.
+      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.
    </span>
    <div
      data-testid="shimmer-tree"
@@ -1324,12 +1283,11 @@ exports[`AssignPermissions Component Rendering should render without crashing wi
 <div>
  <div
    class="ms-Stack assignPermissionsContainer css-109"
-    data-test="Panel:AssignPermissionsContainer"
  >
    <span
      class="css-110"
    >
-      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read-write access to the source account by completing the following steps.
+      To copy data from the source to the destination container, ensure that the managed identity of the destination account has read access to the source account by completing the following steps.
    </span>
    <div
      data-testid="shimmer-tree"
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/DefaultManagedIdentity.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/DefaultManagedIdentity.test.tsx.snap
@@ -41,7 +41,6 @@ exports[`DefaultManagedIdentity Edge Cases should handle missing account name gr
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle14"
          role="switch"
          type="button"
@@ -104,7 +103,6 @@ exports[`DefaultManagedIdentity Edge Cases should handle null account 1`] = `
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle15"
          role="switch"
          type="button"
@@ -167,7 +165,6 @@ exports[`DefaultManagedIdentity Loading States should render loading state snaps
          class="ms-Toggle-background pill-119"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle10"
          role="switch"
          type="button"
@@ -259,7 +256,6 @@ exports[`DefaultManagedIdentity Rendering should render correctly with default s
          class="ms-Toggle-background pill-115"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle0"
          role="switch"
          type="button"
@@ -322,7 +318,6 @@ exports[`DefaultManagedIdentity Toggle Interactions should render toggle with ch
          class="ms-Toggle-background pill-119"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="btn-toggle"
          id="Toggle7"
          role="switch"
          type="button"
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/PointInTimeRestore.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/snapshots/PointInTimeRestore.test.tsx.snap
@@ -56,7 +56,6 @@ exports[`PointInTimeRestore Initial Render should render correctly with default
      <button
        class="ms-Button ms-Button--primary fullWidth root-115"
        data-is-focusable="true"
-        data-test="pointInTimeRestore:PrimaryBtn"
        type="button"
      >
        <span
@@ -132,7 +131,6 @@ exports[`PointInTimeRestore Initial Render should render with empty account name
      <button
        class="ms-Button ms-Button--primary fullWidth root-115"
        data-is-focusable="true"
-        data-test="pointInTimeRestore:PrimaryBtn"
        type="button"
      >
        <span
@@ -163,7 +161,6 @@ exports[`PointInTimeRestore Snapshots should match snapshot in loading state 1`]
  >
    <div
      class="ms-Overlay root-123"
-      data-test="loading-overlay"
    >
      <div
        class="ms-Spinner root-125"
@@ -226,7 +223,6 @@ exports[`PointInTimeRestore Snapshots should match snapshot in loading state 1`]
        aria-disabled="true"
        class="ms-Button ms-Button--primary is-disabled fullWidth root-128"
        data-is-focusable="false"
-        data-test="pointInTimeRestore:PrimaryBtn"
        disabled=""
        type="button"
      >
@@ -305,7 +301,6 @@ exports[`PointInTimeRestore Snapshots should match snapshot with refresh button
      <button
        class="ms-Button ms-Button--primary fullWidth root-115"
        data-is-focusable="true"
-        data-test="pointInTimeRestore:RefreshBtn"
        type="button"
      >
        <span
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/usePermissionsSection.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/usePermissionsSection.test.tsx
@@ -13,7 +13,7 @@ import {
 import { CopyJobContextState } from "../../../../Types/CopyJobTypes";
 import * as CopyJobPrerequisitesCacheModule from "../../../Utils/useCopyJobPrerequisitesCache";
 import usePermissionSections, {
-  checkTargetHasReadWriteRoleOnSource,
+  checkTargetHasReaderRoleOnSource,
  PermissionGroupConfig,
  SECTION_IDS,
 } from "./usePermissionsSection";
@@ -40,12 +40,12 @@ jest.mock("../AddManagedIdentity", () => {
  return MockAddManagedIdentity;
 });

-jest.mock("../AddReadWritePermissionToDefaultIdentity", () => {
-  const MockAddReadWritePermissionToDefaultIdentity = () => {
-    return <div data-testid="add-read-write-permission">AddReadWritePermissionToDefaultIdentity</div>;
+jest.mock("../AddReadPermissionToDefaultIdentity", () => {
+  const MockAddReadPermissionToDefaultIdentity = () => {
+    return <div data-testid="add-read-permission">AddReadPermissionToDefaultIdentity</div>;
  };
-  MockAddReadWritePermissionToDefaultIdentity.displayName = "MockAddReadWritePermissionToDefaultIdentity";
-  return MockAddReadWritePermissionToDefaultIdentity;
+  MockAddReadPermissionToDefaultIdentity.displayName = "MockAddReadPermissionToDefaultIdentity";
+  return MockAddReadPermissionToDefaultIdentity;
 });

 jest.mock("../DefaultManagedIdentity", () => {
@@ -133,7 +133,7 @@ describe("usePermissionsSection", () => {
        type: "",
        kind: "",
      },
-      subscriptionId: "",
+      subscription: undefined,
      databaseId: "",
      containerId: "",
    },
@@ -152,7 +152,7 @@ describe("usePermissionsSection", () => {
        type: "",
        kind: "",
      },
-      subscription: undefined,
+      subscriptionId: "",
      databaseId: "",
      containerId: "",
    },
@@ -193,7 +193,7 @@ describe("usePermissionsSection", () => {
      expect(capturedResult[0].sections.map((s) => s.id)).toEqual([
        SECTION_IDS.addManagedIdentity,
        SECTION_IDS.defaultManagedIdentity,
-        SECTION_IDS.readWritePermissionAssigned,
+        SECTION_IDS.readPermissionAssigned,
      ]);
    });

@@ -208,7 +208,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscriptionId: "",
+          subscription: undefined,
          databaseId: "",
          containerId: "",
        },
@@ -222,7 +222,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscription: undefined,
+          subscriptionId: "",
          databaseId: "",
          containerId: "",
        },
@@ -299,7 +299,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscription: undefined,
+          subscriptionId: "",
          databaseId: "",
          containerId: "",
        },
@@ -337,7 +337,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscription: undefined,
+          subscriptionId: "",
          databaseId: "",
          containerId: "",
        },
@@ -358,17 +358,16 @@ describe("usePermissionsSection", () => {
      expect(defaultManagedIdentitySection?.completed).toBe(true);
    });

-    it("should validate readWritePermissionAssigned section with contributor role", async () => {
+    it("should validate readPermissionAssigned section with reader role", async () => {
      const mockRoleDefinitions: RbacUtils.RoleDefinitionType[] = [
        {
          id: "role-1",
-          name: "00000000-0000-0000-0000-000000000002",
+          name: "Custom Role",
          permissions: [
            {
              dataActions: [
                "Microsoft.DocumentDB/databaseAccounts/readMetadata",
                "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/read",
-                "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/write",
              ],
            },
          ],
@@ -399,7 +398,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscription: undefined,
+          subscriptionId: "",
          databaseId: "",
          containerId: "",
        },
@@ -408,9 +407,7 @@ describe("usePermissionsSection", () => {
      render(<TestWrapper state={state} onResult={noop} />);

      await waitFor(() => {
-        expect(screen.getByTestId(`section-${SECTION_IDS.readWritePermissionAssigned}-completed`)).toHaveTextContent(
-          "true",
-        );
+        expect(screen.getByTestId(`section-${SECTION_IDS.readPermissionAssigned}-completed`)).toHaveTextContent("true");
      });

      expect(mockedRbacUtils.fetchRoleAssignments).toHaveBeenCalledWith(
@@ -438,7 +435,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscriptionId: "",
+          subscription: undefined,
          databaseId: "",
          containerId: "",
        },
@@ -479,7 +476,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscriptionId: "",
+          subscription: undefined,
          databaseId: "",
          containerId: "",
        },
@@ -549,7 +546,7 @@ describe("usePermissionsSection", () => {
            type: "",
            kind: "",
          },
-          subscription: undefined,
+          subscriptionId: "",
          databaseId: "",
          containerId: "",
        },
@@ -571,12 +568,12 @@ describe("usePermissionsSection", () => {
  });
 });

-describe("checkTargetHasReadWriteRoleOnSource", () => {
-  it("should return true for built-in Contributor role", () => {
+describe("checkTargetHasReaderRoleOnSource", () => {
+  it("should return true for built-in Reader role", () => {
    const roleDefinitions: RbacUtils.RoleDefinitionType[] = [
      {
        id: "role-1",
-        name: "00000000-0000-0000-0000-000000000002",
+        name: "00000000-0000-0000-0000-000000000001",
        permissions: [],
        assignableScopes: [],
        resourceGroup: "",
@@ -586,21 +583,20 @@ describe("checkTargetHasReadWriteRoleOnSource", () => {
      },
    ];

-    const result = checkTargetHasReadWriteRoleOnSource(roleDefinitions);
+    const result = checkTargetHasReaderRoleOnSource(roleDefinitions);
    expect(result).toBe(true);
  });

-  it("should return true for custom role with read-write data actions", () => {
+  it("should return true for custom role with required data actions", () => {
    const roleDefinitions: RbacUtils.RoleDefinitionType[] = [
      {
        id: "role-1",
-        name: "Custom Contributor Role",
+        name: "Custom Reader Role",
        permissions: [
          {
            dataActions: [
              "Microsoft.DocumentDB/databaseAccounts/readMetadata",
              "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/read",
-              "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/write",
            ],
          },
        ],
@@ -612,7 +608,7 @@ describe("checkTargetHasReadWriteRoleOnSource", () => {
      },
    ];

-    const result = checkTargetHasReadWriteRoleOnSource(roleDefinitions);
+    const result = checkTargetHasReaderRoleOnSource(roleDefinitions);
    expect(result).toBe(true);
  });

@@ -634,12 +630,12 @@ describe("checkTargetHasReadWriteRoleOnSource", () => {
      },
    ];

-    const result = checkTargetHasReadWriteRoleOnSource(roleDefinitions);
+    const result = checkTargetHasReaderRoleOnSource(roleDefinitions);
    expect(result).toBe(false);
  });

  it("should return false for empty role definitions", () => {
-    const result = checkTargetHasReadWriteRoleOnSource([]);
+    const result = checkTargetHasReaderRoleOnSource([]);
    expect(result).toBe(false);
  });

@@ -657,11 +653,11 @@ describe("checkTargetHasReadWriteRoleOnSource", () => {
      },
    ];

-    const result = checkTargetHasReadWriteRoleOnSource(roleDefinitions);
+    const result = checkTargetHasReaderRoleOnSource(roleDefinitions);
    expect(result).toBe(false);
  });

-  it("should handle multiple roles and return true if any has sufficient read-write permissions", () => {
+  it("should handle multiple roles and return true if any has sufficient permissions", () => {
    const roleDefinitions: RbacUtils.RoleDefinitionType[] = [
      {
        id: "role-1",
@@ -679,7 +675,7 @@ describe("checkTargetHasReadWriteRoleOnSource", () => {
      },
      {
        id: "role-2",
-        name: "00000000-0000-0000-0000-000000000002",
+        name: "00000000-0000-0000-0000-000000000001",
        permissions: [],
        assignableScopes: [],
        resourceGroup: "",
@@ -689,7 +685,7 @@ describe("checkTargetHasReadWriteRoleOnSource", () => {
      },
    ];

-    const result = checkTargetHasReadWriteRoleOnSource(roleDefinitions);
+    const result = checkTargetHasReaderRoleOnSource(roleDefinitions);
    expect(result).toBe(true);
  });
 });
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/usePermissionsSection.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/usePermissionsSection.tsx
@@ -12,7 +12,7 @@ import {
 import { CopyJobContextState } from "../../../../Types/CopyJobTypes";
 import { useCopyJobPrerequisitesCache } from "../../../Utils/useCopyJobPrerequisitesCache";
 import AddManagedIdentity from "../AddManagedIdentity";
-import AddReadWritePermissionToDefaultIdentity from "../AddReadWritePermissionToDefaultIdentity";
+import AddReadPermissionToDefaultIdentity from "../AddReadPermissionToDefaultIdentity";
 import DefaultManagedIdentity from "../DefaultManagedIdentity";
 import OnlineCopyEnabled from "../OnlineCopyEnabled";
 import PointInTimeRestore from "../PointInTimeRestore";
@@ -36,13 +36,11 @@ export interface PermissionGroupConfig {
 export const SECTION_IDS = {
  addManagedIdentity: "addManagedIdentity",
  defaultManagedIdentity: "defaultManagedIdentity",
-  readWritePermissionAssigned: "readWritePermissionAssigned",
+  readPermissionAssigned: "readPermissionAssigned",
  pointInTimeRestore: "pointInTimeRestore",
  onlineCopyEnabled: "onlineCopyEnabled",
 } as const;

-const COSMOS_DB_BUILT_IN_DATA_CONTRIBUTOR_ROLE_ID = "00000000-0000-0000-0000-000000000002";
-
 const PERMISSION_SECTIONS_CONFIG: PermissionSectionConfig[] = [
  {
    id: SECTION_IDS.addManagedIdentity,
@@ -68,9 +66,9 @@ const PERMISSION_SECTIONS_CONFIG: PermissionSectionConfig[] = [
    },
  },
  {
-    id: SECTION_IDS.readWritePermissionAssigned,
-    title: ContainerCopyMessages.readWritePermissionAssigned.title,
-    Component: AddReadWritePermissionToDefaultIdentity,
+    id: SECTION_IDS.readPermissionAssigned,
+    title: ContainerCopyMessages.readPermissionAssigned.title,
+    Component: AddReadPermissionToDefaultIdentity,
    disabled: true,
    validate: async (state: CopyJobContextState) => {
      const principalId = state?.target?.account?.identity?.principalId;
@@ -89,7 +87,7 @@ const PERMISSION_SECTIONS_CONFIG: PermissionSectionConfig[] = [
      );

      const roleDefinitions = await fetchRoleDefinitions(rolesAssigned ?? []);
-      return checkTargetHasReadWriteRoleOnSource(roleDefinitions ?? []);
+      return checkTargetHasReaderRoleOnSource(roleDefinitions ?? []);
    },
  },
 ];
@@ -121,34 +119,18 @@ const PERMISSION_SECTIONS_FOR_ONLINE_JOBS: PermissionSectionConfig[] = [
 ];

 /**
- * Checks if the user has contributor-style read-write access on the source account.
+ * Checks if the user has the Reader role based on role definitions.
 */
-export function checkTargetHasReadWriteRoleOnSource(roleDefinitions: RoleDefinitionType[]): boolean {
-  return roleDefinitions?.some((role) => {
-    if (role.name === COSMOS_DB_BUILT_IN_DATA_CONTRIBUTOR_ROLE_ID) {
-      return true;
-    }
-
-    const dataActions = role.permissions?.flatMap((permission) => permission.dataActions ?? []) ?? [];
-
-    const hasAccountWildcard = dataActions.includes("Microsoft.DocumentDB/databaseAccounts/*");
-    const hasContainerWildcard =
-      hasAccountWildcard || dataActions.includes("Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/*");
-    const hasItemsWildcard =
-      hasContainerWildcard ||
-      dataActions.includes("Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/*");
-
-    const hasAccountReadMetadata =
-      hasAccountWildcard || dataActions.includes("Microsoft.DocumentDB/databaseAccounts/readMetadata");
-    const hasItemRead =
-      hasItemsWildcard ||
-      dataActions.includes("Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/read");
-    const hasItemWrite =
-      hasItemsWildcard ||
-      dataActions.includes("Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/write");
-
-    return hasAccountReadMetadata && hasItemRead && hasItemWrite;
-  });
+export function checkTargetHasReaderRoleOnSource(roleDefinitions: RoleDefinitionType[]): boolean {
+  return roleDefinitions?.some(
+    (role) =>
+      role.name === "00000000-0000-0000-0000-000000000001" ||
+      role.permissions.some(
+        (permission) =>
+          permission.dataActions.includes("Microsoft.DocumentDB/databaseAccounts/readMetadata") &&
+          permission.dataActions.includes("Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/read"),
+      ),
+  );
 }

 /**
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/NavigationControls.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/NavigationControls.tsx
@@ -19,21 +19,9 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
  isPreviousDisabled,
 }) => (
  <Stack horizontal tokens={{ childrenGap: 20 }}>
-    <PrimaryButton
-      data-test="copy-job-primary"
-      text={primaryBtnText}
-      onClick={onPrimary}
-      allowDisabledFocus
-      disabled={isPrimaryDisabled}
-    />
-    <DefaultButton
-      data-test="copy-job-previous"
-      text="Previous"
-      onClick={onPrevious}
-      allowDisabledFocus
-      disabled={isPreviousDisabled}
-    />
-    <DefaultButton data-test="copy-job-cancel" text="Cancel" onClick={onCancel} />
+    <PrimaryButton text={primaryBtnText} onClick={onPrimary} allowDisabledFocus disabled={isPrimaryDisabled} />
+    <DefaultButton text="Previous" onClick={onPrevious} allowDisabledFocus disabled={isPreviousDisabled} />
+    <DefaultButton text="Cancel" onClick={onCancel} />
  </Stack>
 );

--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/PopoverContainer.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/PopoverContainer.tsx
@@ -17,16 +17,15 @@ const PopoverContainer: React.FC<PopoverContainerProps> = React.memo(
  ({ isLoading = false, title, children, onPrimary, onCancel }) => {
    return (
      <Stack
-        data-test="popover-container"
        className={`popover-container foreground ${isLoading ? "loading" : ""}`}
        tokens={{ childrenGap: 20 }}
        style={{ maxWidth: 450 }}
      >
        <LoadingOverlay isLoading={isLoading} label={ContainerCopyMessages.popoverOverlaySpinnerLabel} />
-        <Text variant="mediumPlus" className="themeText" style={{ fontWeight: 600 }}>
+        <Text variant="mediumPlus" style={{ fontWeight: 600 }}>
          {title}
        </Text>
-        <Text className="themeText">{children}</Text>
+        <Text>{children}</Text>
        <Stack horizontal tokens={{ childrenGap: 20 }}>
          <PrimaryButton text={"Yes"} onClick={onPrimary} disabled={isLoading} />
          <DefaultButton text="No" onClick={onCancel} disabled={isLoading} />
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/snapshots/PopoverContainer.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/snapshots/PopoverContainer.test.tsx.snap
@@ -4,15 +4,14 @@ exports[`PopoverMessage Component Edge Cases should handle empty string title 1`
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    />
    <span
-      class="themeText css-111"
+      class="css-111"
    >
      <div>
        Test content
@@ -72,11 +71,10 @@ exports[`PopoverMessage Component Edge Cases should handle null children 1`] = `
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      Test Title
@@ -135,11 +133,10 @@ exports[`PopoverMessage Component Edge Cases should handle undefined children 1`
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      Test Title
@@ -198,17 +195,16 @@ exports[`PopoverMessage Component Edge Cases should handle very long title 1`] =
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      This is a very long title that might cause layout issues or text wrapping in the popover component
    </span>
    <span
-      class="themeText css-111"
+      class="css-111"
    >
      <div>
        Test content
@@ -270,17 +266,16 @@ exports[`PopoverMessage Component Rendering should render correctly when visible
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      Test Title
    </span>
    <span
-      class="themeText css-111"
+      class="css-111"
    >
      <div>
        Test content
@@ -340,17 +335,16 @@ exports[`PopoverMessage Component Rendering should render correctly with differe
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      Test Title
    </span>
    <span
-      class="themeText css-111"
+      class="css-111"
    >
      <div>
        <p>
@@ -415,17 +409,16 @@ exports[`PopoverMessage Component Rendering should render correctly with differe
 <div>
  <div
    class="ms-Stack popover-container foreground css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      Custom Title
    </span>
    <span
-      class="themeText css-111"
+      class="css-111"
    >
      <div>
        Test content
@@ -485,7 +478,6 @@ exports[`PopoverMessage Component Rendering should render correctly with loading
 <div>
  <div
    class="ms-Stack popover-container foreground loading css-109"
-    data-test="popover-container"
    style="max-width: 450px;"
  >
    <div
@@ -493,13 +485,13 @@ exports[`PopoverMessage Component Rendering should render correctly with loading
      data-testid="loading-overlay"
    />
    <span
-      class="themeText css-110"
+      class="css-110"
      style="font-weight: 600;"
    >
      Test Title
    </span>
    <span
-      class="themeText css-111"
+      class="css-111"
    >
      <div>
        Test content
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateContainer/AddCollectionPanelWrapper.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateContainer/AddCollectionPanelWrapper.test.tsx
@@ -81,7 +81,7 @@ describe("AddCollectionPanelWrapper", () => {
        databaseId: "",
        containerId: "",
      },
-      sourceReadWriteAccessFromTarget: false,
+      sourceReadAccessFromTarget: false,
    },
    setCopyJobState: mockSetCopyJobState,
    flow: null,
@@ -109,7 +109,7 @@ describe("AddCollectionPanelWrapper", () => {
      expect(container.querySelector(".addCollectionPanelWrapper")).toBeInTheDocument();
      expect(container.querySelector(".addCollectionPanelHeader")).toBeInTheDocument();
      expect(container.querySelector(".addCollectionPanelBody")).toBeInTheDocument();
-      expect(screen.getByText(ContainerCopyMessages.createNewContainerSubHeading())).toBeInTheDocument();
+      expect(screen.getByText(ContainerCopyMessages.createNewContainerSubHeading)).toBeInTheDocument();
      expect(screen.getByTestId("add-collection-panel")).toBeInTheDocument();
    });

--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateContainer/AddCollectionPanelWrapper.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateContainer/AddCollectionPanelWrapper.tsx
@@ -1,14 +1,11 @@
-import { IDropdownOption, MessageBar, MessageBarType, Spinner, SpinnerSize, Stack, Text } from "@fluentui/react";
-import { readDatabasesForAccount } from "Common/dataAccess/readDatabases";
-import { AccountOverride } from "Contracts/DataModels";
+import { Stack, Text } from "@fluentui/react";
 import Explorer from "Explorer/Explorer";
 import { useSidePanel } from "hooks/useSidePanel";
 import { produce } from "immer";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect } from "react";
 import { AddCollectionPanel } from "../../../../Panes/AddCollectionPanel/AddCollectionPanel";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
-import { getAccountDetailsFromResourceId } from "../../../CopyJobUtils";

 type AddCollectionPanelWrapperProps = {
  explorer?: Explorer;
@@ -16,26 +13,7 @@ type AddCollectionPanelWrapperProps = {
 };

 const AddCollectionPanelWrapper: React.FunctionComponent<AddCollectionPanelWrapperProps> = ({ explorer, goBack }) => {
-  const { setCopyJobState, copyJobState } = useCopyJobContext();
-  const [destinationDatabases, setDestinationDatabases] = useState<IDropdownOption[]>([]);
-  const [isLoading, setIsLoading] = useState(true);
-  const [permissionError, setPermissionError] = useState<string | null>(null);
-
-  const targetAccountOverride: AccountOverride | undefined = useMemo(() => {
-    const accountId = copyJobState?.target?.account?.id;
-    if (!accountId) {
-      return undefined;
-    }
-    const details = getAccountDetailsFromResourceId(accountId);
-    if (!details?.subscriptionId || !details?.resourceGroup || !details?.accountName) {
-      return undefined;
-    }
-    return {
-      subscriptionId: details.subscriptionId,
-      resourceGroup: details.resourceGroup,
-      accountName: details.accountName,
-    };
-  }, [copyJobState?.target?.account?.id]);
+  const { setCopyJobState } = useCopyJobContext();

  useEffect(() => {
    const sidePanelStore = useSidePanel.getState();
@@ -47,52 +25,6 @@ const AddCollectionPanelWrapper: React.FunctionComponent<AddCollectionPanelWrapp
    };
  }, []);

-  useEffect(() => {
-    if (!targetAccountOverride) {
-      setIsLoading(false);
-      return undefined;
-    }
-
-    let cancelled = false;
-    const fetchDatabases = async () => {
-      setIsLoading(true);
-      setPermissionError(null);
-      try {
-        const databases = await readDatabasesForAccount(
-          targetAccountOverride.subscriptionId,
-          targetAccountOverride.resourceGroup,
-          targetAccountOverride.accountName,
-        );
-        if (!cancelled) {
-          setDestinationDatabases(databases.map((db) => ({ key: db.id, text: db.id })));
-        }
-      } catch (error) {
-        if (!cancelled) {
-          const message = error?.message || String(error);
-          if (message.includes("AuthorizationFailed") || message.includes("403")) {
-            setPermissionError(
-              `You do not have sufficient permissions to access the destination account "${targetAccountOverride.accountName}". ` +
-                "Please ensure you have at least Contributor or Owner access to create databases and containers.",
-            );
-          } else {
-            setPermissionError(
-              `Failed to load databases from the destination account "${targetAccountOverride.accountName}": ${message}`,
-            );
-          }
-        }
-      } finally {
-        if (!cancelled) {
-          setIsLoading(false);
-        }
-      }
-    };
-
-    fetchDatabases();
-    return () => {
-      cancelled = true;
-    };
-  }, [targetAccountOverride]);
-
  const handleAddCollectionSuccess = useCallback(
    (collectionData: { databaseId: string; collectionId: string }) => {
      setCopyJobState(
@@ -106,37 +38,13 @@ const AddCollectionPanelWrapper: React.FunctionComponent<AddCollectionPanelWrapp
    [goBack],
  );

-  if (isLoading) {
-    return (
-      <Stack horizontalAlign="center" verticalAlign="center" styles={{ root: { padding: 20 } }}>
-        <Spinner size={SpinnerSize.large} label="Loading destination account databases..." />
-      </Stack>
-    );
-  }
-
-  if (permissionError) {
-    return (
-      <Stack styles={{ root: { padding: 20 } }}>
-        <MessageBar messageBarType={MessageBarType.error}>{permissionError}</MessageBar>
-      </Stack>
-    );
-  }
-
  return (
    <Stack className="addCollectionPanelWrapper">
      <Stack.Item className="addCollectionPanelHeader">
-        <Text className="themeText">
-          {ContainerCopyMessages.createNewContainerSubHeading(targetAccountOverride?.accountName)}
-        </Text>
+        <Text>{ContainerCopyMessages.createNewContainerSubHeading}</Text>
      </Stack.Item>
      <Stack.Item className="addCollectionPanelBody">
-        <AddCollectionPanel
-          explorer={explorer}
-          isCopyJobFlow={true}
-          onSubmitSuccess={handleAddCollectionSuccess}
-          targetAccountOverride={targetAccountOverride}
-          externalDatabaseOptions={destinationDatabases}
-        />
+        <AddCollectionPanel explorer={explorer} isCopyJobFlow={true} onSubmitSuccess={handleAddCollectionSuccess} />
      </Stack.Item>
    </Stack>
  );
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateContainer/snapshots/AddCollectionPanelWrapper.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateContainer/snapshots/AddCollectionPanelWrapper.test.tsx.snap
@@ -3,19 +3,19 @@
 exports[`AddCollectionPanelWrapper Component Rendering should match snapshot 1`] = `
 <div>
  <div
-    class="ms-Stack addCollectionPanelWrapper css-115"
+    class="ms-Stack addCollectionPanelWrapper css-109"
  >
    <div
-      class="ms-StackItem addCollectionPanelHeader css-116"
+      class="ms-StackItem addCollectionPanelHeader css-110"
    >
      <span
-        class="themeText css-117"
+        class="css-111"
      >
-        Configure the properties for the new container.
+        Select the properties for your container.
      </span>
    </div>
    <div
-      class="ms-StackItem addCollectionPanelBody css-116"
+      class="ms-StackItem addCollectionPanelBody css-110"
    >
      <div
        data-testid="add-collection-panel"
@@ -44,19 +44,19 @@ exports[`AddCollectionPanelWrapper Component Rendering should match snapshot 1`]
 exports[`AddCollectionPanelWrapper Component Rendering should match snapshot with both props 1`] = `
 <div>
  <div
-    class="ms-Stack addCollectionPanelWrapper css-115"
+    class="ms-Stack addCollectionPanelWrapper css-109"
  >
    <div
-      class="ms-StackItem addCollectionPanelHeader css-116"
+      class="ms-StackItem addCollectionPanelHeader css-110"
    >
      <span
-        class="themeText css-117"
+        class="css-111"
      >
-        Configure the properties for the new container.
+        Select the properties for your container.
      </span>
    </div>
    <div
-      class="ms-StackItem addCollectionPanelBody css-116"
+      class="ms-StackItem addCollectionPanelBody css-110"
    >
      <div
        data-testid="add-collection-panel"
@@ -85,19 +85,19 @@ exports[`AddCollectionPanelWrapper Component Rendering should match snapshot wit
 exports[`AddCollectionPanelWrapper Component Rendering should match snapshot with explorer prop 1`] = `
 <div>
  <div
-    class="ms-Stack addCollectionPanelWrapper css-115"
+    class="ms-Stack addCollectionPanelWrapper css-109"
  >
    <div
-      class="ms-StackItem addCollectionPanelHeader css-116"
+      class="ms-StackItem addCollectionPanelHeader css-110"
    >
      <span
-        class="themeText css-117"
+        class="css-111"
      >
-        Configure the properties for the new container.
+        Select the properties for your container.
      </span>
    </div>
    <div
-      class="ms-StackItem addCollectionPanelBody css-116"
+      class="ms-StackItem addCollectionPanelBody css-110"
    >
      <div
        data-testid="add-collection-panel"
@@ -126,19 +126,19 @@ exports[`AddCollectionPanelWrapper Component Rendering should match snapshot wit
 exports[`AddCollectionPanelWrapper Component Rendering should match snapshot with goBack prop 1`] = `
 <div>
  <div
-    class="ms-Stack addCollectionPanelWrapper css-115"
+    class="ms-Stack addCollectionPanelWrapper css-109"
  >
    <div
-      class="ms-StackItem addCollectionPanelHeader css-116"
+      class="ms-StackItem addCollectionPanelHeader css-110"
    >
      <span
-        class="themeText css-117"
+        class="css-111"
      >
-        Configure the properties for the new container.
+        Select the properties for your container.
      </span>
    </div>
    <div
-      class="ms-StackItem addCollectionPanelBody css-116"
+      class="ms-StackItem addCollectionPanelBody css-110"
    >
      <div
        data-testid="add-collection-panel"
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateCopyJobScreens.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateCopyJobScreens.tsx
@@ -22,7 +22,6 @@ const CreateCopyJobScreens: React.FC = () => {
      <Stack.Item className="createCopyJobScreensContent">
        {contextError && (
          <MessageBar
-            data-test="Panel:ErrorContainer"
            className="createCopyJobErrorMessageBar"
            messageBarType={MessageBarType.blocked}
            isMultiline={false}
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/PreviewCopyJob/PreviewCopyJob.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/PreviewCopyJob/PreviewCopyJob.test.tsx
@@ -87,18 +87,18 @@ describe("PreviewCopyJob", () => {
      jobName: "",
      migrationType: CopyJobMigrationType.Offline,
      source: {
-        subscriptionId: "test-subscription-id",
+        subscription: mockSubscription,
        account: mockDatabaseAccount,
        databaseId: "source-database",
        containerId: "source-container",
      },
      target: {
-        subscription: mockSubscription,
+        subscriptionId: "test-subscription-id",
        account: mockDatabaseAccount,
        databaseId: "target-database",
        containerId: "target-container",
      },
-      sourceReadWriteAccessFromTarget: false,
+      sourceReadAccessFromTarget: false,
      ...overrides,
    };

@@ -146,7 +146,7 @@ describe("PreviewCopyJob", () => {
  it("should render with missing source subscription information", () => {
    const mockContext = createMockContext({
      source: {
-        subscriptionId: "",
+        subscription: undefined,
        account: mockDatabaseAccount,
        databaseId: "source-database",
        containerId: "source-container",
@@ -165,7 +165,7 @@ describe("PreviewCopyJob", () => {
  it("should render with missing source account information", () => {
    const mockContext = createMockContext({
      source: {
-        subscriptionId: "test-subscription-id",
+        subscription: mockSubscription,
        account: null,
        databaseId: "source-database",
        containerId: "source-container",
@@ -184,13 +184,13 @@ describe("PreviewCopyJob", () => {
  it("should render with undefined database and container names", () => {
    const mockContext = createMockContext({
      source: {
-        subscriptionId: "test-subscription-id",
+        subscription: mockSubscription,
        account: mockDatabaseAccount,
        databaseId: "",
        containerId: "",
      },
      target: {
-        subscription: mockSubscription,
+        subscriptionId: "test-subscription-id",
        account: mockDatabaseAccount,
        databaseId: "",
        containerId: "",
@@ -219,7 +219,7 @@ describe("PreviewCopyJob", () => {

    const mockContext = createMockContext({
      source: {
-        subscriptionId: longNameSubscription.subscriptionId,
+        subscription: longNameSubscription,
        account: longNameAccount,
        databaseId: "long-database-name-for-testing-purposes",
        containerId: "long-container-name-for-testing-purposes",
@@ -253,13 +253,13 @@ describe("PreviewCopyJob", () => {
  it("should handle special characters in database and container names", () => {
    const mockContext = createMockContext({
      source: {
-        subscriptionId: "test-subscription-id",
+        subscription: mockSubscription,
        account: mockDatabaseAccount,
        databaseId: "test-db_with@special#chars",
        containerId: "test-container_with@special#chars",
      },
      target: {
-        subscription: mockSubscription,
+        subscriptionId: "test-subscription-id",
        account: mockDatabaseAccount,
        databaseId: "target-db_with@special#chars",
        containerId: "target-container_with@special#chars",
@@ -285,12 +285,12 @@ describe("PreviewCopyJob", () => {

    const mockContext = createMockContext({
      target: {
-        subscription: mockSubscription,
+        subscriptionId: "target-subscription-id",
        account: targetAccount,
        databaseId: "target-database",
        containerId: "target-container",
      },
-      sourceReadWriteAccessFromTarget: true,
+      sourceReadAccessFromTarget: true,
    });

    const { container } = render(
@@ -360,7 +360,7 @@ describe("PreviewCopyJob", () => {
    );

    expect(getByText(/Job name/i)).toBeInTheDocument();
-    expect(getByText(/Destination subscription/i)).toBeInTheDocument();
-    expect(getByText(/Destination account/i)).toBeInTheDocument();
+    expect(getByText(/Source subscription/i)).toBeInTheDocument();
+    expect(getByText(/Source account/i)).toBeInTheDocument();
  });
 });
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/PreviewCopyJob/PreviewCopyJob.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/PreviewCopyJob/PreviewCopyJob.tsx
@@ -31,21 +31,17 @@ const PreviewCopyJob: React.FC = () => {
    }));
  };
  return (
-    <Stack tokens={{ childrenGap: 20 }} className="previewCopyJobContainer" data-test="Panel:PreviewCopyJob">
+    <Stack tokens={{ childrenGap: 20 }} className="previewCopyJobContainer">
      <FieldRow label={ContainerCopyMessages.jobNameLabel}>
-        <TextField data-test="job-name-textfield" value={jobName} onChange={onJobNameChange} />
+        <TextField value={jobName} onChange={onJobNameChange} />
      </FieldRow>
      <Stack>
-        <Text className="bold themeText">{ContainerCopyMessages.destinationSubscriptionLabel}</Text>
-        <Text data-test="destination-subscription-name" className="themeText">
-          {copyJobState.target?.subscription?.displayName}
-        </Text>
+        <Text className="bold">{ContainerCopyMessages.sourceSubscriptionLabel}</Text>
+        <Text>{copyJobState.source?.subscription?.displayName}</Text>
      </Stack>
      <Stack>
-        <Text className="bold themeText">{ContainerCopyMessages.destinationAccountLabel}</Text>
-        <Text data-test="destination-account-name" className="themeText">
-          {copyJobState.target?.account?.name}
-        </Text>
+        <Text className="bold">{ContainerCopyMessages.sourceAccountLabel}</Text>
+        <Text>{copyJobState.source?.account?.name}</Text>
      </Stack>
      <Stack>
        <DetailsList
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/PreviewCopyJob/snapshots/PreviewCopyJob.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/PreviewCopyJob/snapshots/PreviewCopyJob.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`PreviewCopyJob should handle special characters in database and container names 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -33,7 +32,6 @@ exports[`PreviewCopyJob should handle special characters in database and contain
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField84"
              type="text"
              value="job-with@special#chars_123"
@@ -47,13 +45,12 @@ exports[`PreviewCopyJob should handle special characters in database and contain
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -62,13 +59,12 @@ exports[`PreviewCopyJob should handle special characters in database and contain
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
      test-account
    </span>
@@ -325,7 +321,6 @@ exports[`PreviewCopyJob should handle special characters in database and contain
 exports[`PreviewCopyJob should render component with cross-subscription setup 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -355,7 +350,6 @@ exports[`PreviewCopyJob should render component with cross-subscription setup 1`
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField96"
              type="text"
              value=""
@@ -369,13 +363,12 @@ exports[`PreviewCopyJob should render component with cross-subscription setup 1`
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -384,15 +377,14 @@ exports[`PreviewCopyJob should render component with cross-subscription setup 1`
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
-      target-account
+      test-account
    </span>
  </div>
  <div
@@ -647,7 +639,6 @@ exports[`PreviewCopyJob should render component with cross-subscription setup 1`
 exports[`PreviewCopyJob should render with default state and empty job name 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -677,7 +668,6 @@ exports[`PreviewCopyJob should render with default state and empty job name 1`]
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField0"
              type="text"
              value=""
@@ -691,13 +681,12 @@ exports[`PreviewCopyJob should render with default state and empty job name 1`]
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -706,13 +695,12 @@ exports[`PreviewCopyJob should render with default state and empty job name 1`]
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
      test-account
    </span>
@@ -969,7 +957,6 @@ exports[`PreviewCopyJob should render with default state and empty job name 1`]
 exports[`PreviewCopyJob should render with long subscription and account names 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -999,7 +986,6 @@ exports[`PreviewCopyJob should render with long subscription and account names 1
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField60"
              type="text"
              value=""
@@ -1013,30 +999,28 @@ exports[`PreviewCopyJob should render with long subscription and account names 1
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
-      Test Subscription
+      This is a very long subscription name that might cause display issues if not handled properly
    </span>
  </div>
  <div
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
-      test-account
+      this-is-a-very-long-database-account-name-that-might-cause-display-issues
    </span>
  </div>
  <div
@@ -1291,7 +1275,6 @@ exports[`PreviewCopyJob should render with long subscription and account names 1
 exports[`PreviewCopyJob should render with missing source account information 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -1321,7 +1304,6 @@ exports[`PreviewCopyJob should render with missing source account information 1`
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField36"
              type="text"
              value=""
@@ -1335,13 +1317,12 @@ exports[`PreviewCopyJob should render with missing source account information 1`
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -1350,15 +1331,9 @@ exports[`PreviewCopyJob should render with missing source account information 1`
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
-    </span>
-    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
-    >
-      test-account
+      Source account
    </span>
  </div>
  <div
@@ -1613,7 +1588,6 @@ exports[`PreviewCopyJob should render with missing source account information 1`
 exports[`PreviewCopyJob should render with missing source subscription information 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -1643,7 +1617,6 @@ exports[`PreviewCopyJob should render with missing source subscription informati
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField24"
              type="text"
              value=""
@@ -1657,28 +1630,21 @@ exports[`PreviewCopyJob should render with missing source subscription informati
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
-    </span>
-    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
-    >
-      Test Subscription
+      Source subscription
    </span>
  </div>
  <div
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
      test-account
    </span>
@@ -1935,7 +1901,6 @@ exports[`PreviewCopyJob should render with missing source subscription informati
 exports[`PreviewCopyJob should render with online migration type 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -1965,7 +1930,6 @@ exports[`PreviewCopyJob should render with online migration type 1`] = `
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField72"
              type="text"
              value="online-migration-job"
@@ -1979,13 +1943,12 @@ exports[`PreviewCopyJob should render with online migration type 1`] = `
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -1994,13 +1957,12 @@ exports[`PreviewCopyJob should render with online migration type 1`] = `
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
      test-account
    </span>
@@ -2257,7 +2219,6 @@ exports[`PreviewCopyJob should render with online migration type 1`] = `
 exports[`PreviewCopyJob should render with pre-filled job name 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -2287,7 +2248,6 @@ exports[`PreviewCopyJob should render with pre-filled job name 1`] = `
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField12"
              type="text"
              value="custom-job-name-123"
@@ -2301,13 +2261,12 @@ exports[`PreviewCopyJob should render with pre-filled job name 1`] = `
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -2316,13 +2275,12 @@ exports[`PreviewCopyJob should render with pre-filled job name 1`] = `
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
      test-account
    </span>
@@ -2579,7 +2537,6 @@ exports[`PreviewCopyJob should render with pre-filled job name 1`] = `
 exports[`PreviewCopyJob should render with undefined database and container names 1`] = `
 <div
  class="ms-Stack previewCopyJobContainer css-109"
-  data-test="Panel:PreviewCopyJob"
 >
  <div
    class="ms-Stack flex-row css-110"
@@ -2609,7 +2566,6 @@ exports[`PreviewCopyJob should render with undefined database and container name
            <input
              aria-invalid="false"
              class="ms-TextField-field field-115"
-              data-test="job-name-textfield"
              id="TextField48"
              type="text"
              value=""
@@ -2623,13 +2579,12 @@ exports[`PreviewCopyJob should render with undefined database and container name
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination subscription
+      Source subscription
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-subscription-name"
+      class="css-125"
    >
      Test Subscription
    </span>
@@ -2638,13 +2593,12 @@ exports[`PreviewCopyJob should render with undefined database and container name
    class="ms-Stack css-124"
  >
    <span
-      class="bold themeText css-125"
+      class="bold css-125"
    >
-      Destination account
+      Source account
    </span>
    <span
-      class="themeText css-125"
-      data-test="destination-account-name"
+      class="css-125"
    >
      test-account
    </span>
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.test.tsx
@@ -9,7 +9,7 @@ import ContainerCopyMessages from "../../../../ContainerCopyMessages";
 import { CopyJobContext } from "../../../../Context/CopyJobContext";
 import { CopyJobMigrationType } from "../../../../Enums/CopyJobEnums";
 import { CopyJobContextProviderType, CopyJobContextState } from "../../../../Types/CopyJobTypes";
-import { AccountDropdown, normalizeAccountId } from "./AccountDropdown";
+import { AccountDropdown } from "./AccountDropdown";

 jest.mock("../../../../../../hooks/useDatabaseAccounts");
 jest.mock("../../../../../../UserContext", () => ({
@@ -38,12 +38,6 @@ describe("AccountDropdown", () => {
    jobName: "",
    migrationType: CopyJobMigrationType.Offline,
    source: {
-      subscriptionId: "",
-      account: null,
-      databaseId: "",
-      containerId: "",
-    },
-    target: {
      subscription: {
        subscriptionId: "test-subscription-id",
        displayName: "Test Subscription",
@@ -52,7 +46,13 @@ describe("AccountDropdown", () => {
      databaseId: "",
      containerId: "",
    },
-    sourceReadWriteAccessFromTarget: false,
+    target: {
+      subscriptionId: "",
+      account: null,
+      databaseId: "",
+      containerId: "",
+    },
+    sourceReadAccessFromTarget: false,
  } as CopyJobContextState;

  const mockCopyJobContextValue = {
@@ -129,11 +129,11 @@ describe("AccountDropdown", () => {
      renderWithContext();

      expect(
-        screen.getByText(`${ContainerCopyMessages.destinationAccountDropdownLabel}:`, { exact: true }),
+        screen.getByText(`${ContainerCopyMessages.sourceAccountDropdownLabel}:`, { exact: true }),
      ).toBeInTheDocument();
      expect(screen.getByRole("combobox")).toHaveAttribute(
        "aria-label",
-        ContainerCopyMessages.destinationAccountDropdownLabel,
+        ContainerCopyMessages.sourceAccountDropdownLabel,
      );
    });

@@ -202,16 +202,13 @@ describe("AccountDropdown", () => {

      const stateUpdateFunction = mockSetCopyJobState.mock.calls[0][0];
      const newState = stateUpdateFunction(mockCopyJobState);
-      expect(newState.target.account).toEqual({
-        ...mockDatabaseAccount1,
-        id: normalizeAccountId(mockDatabaseAccount1.id),
-      });
+      expect(newState.source.account).toBe(mockDatabaseAccount1);
    });

    it("should auto-select predefined account from userContext if available", async () => {
      const userContextAccount = {
        ...mockDatabaseAccount2,
-        id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDB/databaseAccounts/account2",
+        id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDb/databaseAccounts/account2",
      };

      (userContext as any).databaseAccount = userContextAccount;
@@ -226,21 +223,17 @@ describe("AccountDropdown", () => {

      const stateUpdateFunction = mockSetCopyJobState.mock.calls[0][0];
      const newState = stateUpdateFunction(mockCopyJobState);
-      expect(newState.target.account).toEqual({
-        ...mockDatabaseAccount2,
-        id: normalizeAccountId(mockDatabaseAccount2.id),
-      });
+      expect(newState.source.account).toBe(mockDatabaseAccount2);
    });

    it("should keep current account if it exists in the filtered list", async () => {
-      const normalizedAccount1 = { ...mockDatabaseAccount1, id: normalizeAccountId(mockDatabaseAccount1.id) };
      const contextWithSelectedAccount = {
        ...mockCopyJobContextValue,
        copyJobState: {
          ...mockCopyJobState,
-          target: {
-            ...mockCopyJobState.target,
-            account: normalizedAccount1,
+          source: {
+            ...mockCopyJobState.source,
+            account: mockDatabaseAccount1,
          },
        },
      };
@@ -255,13 +248,7 @@ describe("AccountDropdown", () => {

      const stateUpdateFunction = mockSetCopyJobState.mock.calls[0][0];
      const newState = stateUpdateFunction(contextWithSelectedAccount.copyJobState);
-      expect(newState).toEqual({
-        ...contextWithSelectedAccount.copyJobState,
-        target: {
-          ...contextWithSelectedAccount.copyJobState.target,
-          account: normalizedAccount1,
-        },
-      });
+      expect(newState).toBe(contextWithSelectedAccount.copyJobState);
    });

    it("should handle account change when user selects different account", async () => {
@@ -285,7 +272,7 @@ describe("AccountDropdown", () => {
    it("should normalize account ID for Portal platform", () => {
      const portalAccount = {
        ...mockDatabaseAccount1,
-        id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDB/databaseAccounts/account1",
+        id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDb/databaseAccounts/account1",
      };

      (configContext as any).platform = Platform.Portal;
@@ -295,8 +282,8 @@ describe("AccountDropdown", () => {
        ...mockCopyJobContextValue,
        copyJobState: {
          ...mockCopyJobState,
-          target: {
-            ...mockCopyJobState.target,
+          source: {
+            ...mockCopyJobState.source,
            account: portalAccount,
          },
        },
@@ -321,8 +308,8 @@ describe("AccountDropdown", () => {
        ...mockCopyJobContextValue,
        copyJobState: {
          ...mockCopyJobState,
-          target: {
-            ...mockCopyJobState.target,
+          source: {
+            ...mockCopyJobState.source,
            account: hostedAccount,
          },
        },
@@ -359,8 +346,8 @@ describe("AccountDropdown", () => {
        ...mockCopyJobContextValue,
        copyJobState: {
          ...mockCopyJobState,
-          target: {
-            ...mockCopyJobState.target,
+          source: {
+            ...mockCopyJobState.source,
            subscription: null,
          },
        } as CopyJobContextState,
@@ -374,13 +361,13 @@ describe("AccountDropdown", () => {
    });

    it("should not update state if account is already selected and the same", async () => {
-      const selectedAccount = { ...mockDatabaseAccount1, id: normalizeAccountId(mockDatabaseAccount1.id) };
+      const selectedAccount = mockDatabaseAccount1;
      const contextWithSelectedAccount = {
        ...mockCopyJobContextValue,
        copyJobState: {
          ...mockCopyJobState,
-          target: {
-            ...mockCopyJobState.target,
+          source: {
+            ...mockCopyJobState.source,
            account: selectedAccount,
          },
        },
@@ -407,7 +394,7 @@ describe("AccountDropdown", () => {
      renderWithContext();

      const dropdown = screen.getByRole("combobox");
-      expect(dropdown).toHaveAttribute("aria-label", ContainerCopyMessages.destinationAccountDropdownLabel);
+      expect(dropdown).toHaveAttribute("aria-label", ContainerCopyMessages.sourceAccountDropdownLabel);
    });

    it("should have required attribute", () => {
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx
@@ -12,7 +12,7 @@ import FieldRow from "../../Components/FieldRow";

 interface AccountDropdownProps {}

-export const normalizeAccountId = (id: string = "") => {
+const normalizeAccountId = (id: string) => {
  if (configContext.platform === Platform.Portal) {
    return id.replace("/Microsoft.DocumentDb/", "/Microsoft.DocumentDB/");
  } else if (configContext.platform === Platform.Hosted) {
@@ -25,22 +25,17 @@ export const normalizeAccountId = (id: string = "") => {
 export const AccountDropdown: React.FC<AccountDropdownProps> = () => {
  const { copyJobState, setCopyJobState } = useCopyJobContext();

-  const selectedSubscriptionId = copyJobState?.target?.subscription?.subscriptionId;
+  const selectedSubscriptionId = copyJobState?.source?.subscription?.subscriptionId;
  const allAccounts: DatabaseAccount[] = useDatabaseAccounts(selectedSubscriptionId);
-  const sqlApiOnlyAccounts = (allAccounts || [])
-    .filter((account) => apiType(account) === "SQL")
-    .map((account) => ({
-      ...account,
-      id: normalizeAccountId(account.id),
-    }));
+  const sqlApiOnlyAccounts: DatabaseAccount[] = (allAccounts || []).filter((account) => apiType(account) === "SQL");

  const updateCopyJobState = (newAccount: DatabaseAccount) => {
    setCopyJobState((prevState) => {
-      if (prevState.target?.account?.id !== newAccount.id) {
+      if (prevState.source?.account?.id !== newAccount.id) {
        return {
          ...prevState,
-          target: {
-            ...prevState.target,
+          source: {
+            ...prevState.source,
            account: newAccount,
          },
        };
@@ -51,19 +46,19 @@ export const AccountDropdown: React.FC<AccountDropdownProps> = () => {

  useEffect(() => {
    if (sqlApiOnlyAccounts && sqlApiOnlyAccounts.length > 0 && selectedSubscriptionId) {
-      const currentAccountId = copyJobState?.target?.account?.id;
-      const predefinedAccountId = normalizeAccountId(userContext.databaseAccount?.id);
+      const currentAccountId = copyJobState?.source?.account?.id;
+      const predefinedAccountId = userContext.databaseAccount?.id;
      const selectedAccountId = currentAccountId || predefinedAccountId;

-      const matchedAccount: DatabaseAccount | null =
+      const targetAccount: DatabaseAccount | null =
        sqlApiOnlyAccounts.find((account) => account.id === selectedAccountId) || null;
-      updateCopyJobState(matchedAccount || sqlApiOnlyAccounts[0]);
+      updateCopyJobState(targetAccount || sqlApiOnlyAccounts[0]);
    }
  }, [sqlApiOnlyAccounts?.length, selectedSubscriptionId]);

  const accountOptions =
    sqlApiOnlyAccounts?.map((account) => ({
-      key: account.id,
+      key: normalizeAccountId(account.id),
      text: account.name,
      data: account,
    })) || [];
@@ -77,13 +72,13 @@ export const AccountDropdown: React.FC<AccountDropdownProps> = () => {
  };

  const isAccountDropdownDisabled = !selectedSubscriptionId || accountOptions.length === 0;
-  const selectedAccountId = normalizeAccountId(copyJobState?.target?.account?.id ?? "");
+  const selectedAccountId = normalizeAccountId(copyJobState?.source?.account?.id ?? "");

  return (
-    <FieldRow label={ContainerCopyMessages.destinationAccountDropdownLabel}>
+    <FieldRow label={ContainerCopyMessages.sourceAccountDropdownLabel}>
      <Dropdown
-        placeholder={ContainerCopyMessages.destinationAccountDropdownPlaceholder}
-        ariaLabel={ContainerCopyMessages.destinationAccountDropdownLabel}
+        placeholder={ContainerCopyMessages.sourceAccountDropdownPlaceholder}
+        ariaLabel={ContainerCopyMessages.sourceAccountDropdownLabel}
        options={accountOptions}
        disabled={isAccountDropdownDisabled}
        required
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationType.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationType.test.tsx
@@ -1,241 +0,0 @@
-import "@testing-library/jest-dom";
-import { fireEvent, render, screen } from "@testing-library/react";
-import React from "react";
-import ContainerCopyMessages from "../../../../ContainerCopyMessages";
-import { useCopyJobContext } from "../../../../Context/CopyJobContext";
-import { CopyJobMigrationType } from "../../../../Enums/CopyJobEnums";
-import { MigrationType } from "./MigrationType";
-
-jest.mock("../../../../Context/CopyJobContext", () => ({
-  useCopyJobContext: jest.fn(),
-}));
-
-describe("MigrationType", () => {
-  const mockSetCopyJobState = jest.fn();
-
-  const defaultContextValue = {
-    copyJobState: {
-      jobName: "",
-      migrationType: CopyJobMigrationType.Online,
-      source: {
-        subscription: null as any,
-        account: null as any,
-        databaseId: "",
-        containerId: "",
-      },
-      target: {
-        subscriptionId: "",
-        account: null as any,
-        databaseId: "",
-        containerId: "",
-      },
-      sourceReadWriteAccessFromTarget: false,
-    },
-    setCopyJobState: mockSetCopyJobState,
-    flow: { currentScreen: "selectAccount" },
-    setFlow: jest.fn(),
-    contextError: "",
-    setContextError: jest.fn(),
-    explorer: {} as any,
-    resetCopyJobState: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    (useCopyJobContext as jest.Mock).mockReturnValue(defaultContextValue);
-  });
-
-  describe("Component Rendering", () => {
-    it("should render migration type component with radio buttons", () => {
-      const { container } = render(<MigrationType />);
-
-      expect(container.querySelector("[data-test='migration-type']")).toBeInTheDocument();
-      expect(screen.getByRole("radiogroup")).toBeInTheDocument();
-
-      const offlineRadio = screen.getByRole("radio", {
-        name: ContainerCopyMessages.migrationTypeOptions.offline.title,
-      });
-      const onlineRadio = screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.online.title });
-
-      expect(offlineRadio).toBeInTheDocument();
-      expect(onlineRadio).toBeInTheDocument();
-      expect(container).toMatchSnapshot();
-    });
-
-    it("should render with online mode selected by default", () => {
-      render(<MigrationType />);
-
-      const onlineRadio = screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.online.title });
-      const offlineRadio = screen.getByRole("radio", {
-        name: ContainerCopyMessages.migrationTypeOptions.offline.title,
-      });
-
-      expect(onlineRadio).toBeChecked();
-      expect(offlineRadio).not.toBeChecked();
-    });
-
-    it("should render with offline mode selected when state is offline", () => {
-      (useCopyJobContext as jest.Mock).mockReturnValue({
-        ...defaultContextValue,
-        copyJobState: {
-          ...defaultContextValue.copyJobState,
-          migrationType: CopyJobMigrationType.Offline,
-        },
-      });
-
-      render(<MigrationType />);
-
-      const offlineRadio = screen.getByRole("radio", {
-        name: ContainerCopyMessages.migrationTypeOptions.offline.title,
-      });
-      const onlineRadio = screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.online.title });
-
-      expect(offlineRadio).toBeChecked();
-      expect(onlineRadio).not.toBeChecked();
-    });
-  });
-
-  describe("Descriptions and Learn More Links", () => {
-    it("should render online description and learn more link when online is selected", () => {
-      const { container } = render(<MigrationType />);
-
-      expect(container.querySelector("[data-test='migration-type-description-online']")).toBeInTheDocument();
-
-      const learnMoreLink = screen.getByRole("link", {
-        name: "online copy jobs",
-      });
-      expect(learnMoreLink).toBeInTheDocument();
-      expect(learnMoreLink).toHaveAttribute(
-        "href",
-        "https://learn.microsoft.com/azure/cosmos-db/container-copy?tabs=online-copy&pivots=api-nosql#getting-started",
-      );
-      expect(learnMoreLink).toHaveAttribute("target", "_blank");
-    });
-
-    it("should render offline description and learn more link when offline is selected", () => {
-      (useCopyJobContext as jest.Mock).mockReturnValue({
-        ...defaultContextValue,
-        copyJobState: {
-          ...defaultContextValue.copyJobState,
-          migrationType: CopyJobMigrationType.Offline,
-        },
-      });
-
-      const { container } = render(<MigrationType />);
-
-      expect(container.querySelector("[data-test='migration-type-description-offline']")).toBeInTheDocument();
-
-      const learnMoreLink = screen.getByRole("link", {
-        name: "offline copy jobs",
-      });
-      expect(learnMoreLink).toBeInTheDocument();
-      expect(learnMoreLink).toHaveAttribute(
-        "href",
-        "https://learn.microsoft.com/azure/cosmos-db/how-to-container-copy?tabs=offline-copy&pivots=api-nosql",
-      );
-    });
-  });
-
-  describe("User Interactions", () => {
-    it("should call setCopyJobState when offline radio button is clicked", () => {
-      render(<MigrationType />);
-
-      const offlineRadio = screen.getByRole("radio", {
-        name: ContainerCopyMessages.migrationTypeOptions.offline.title,
-      });
-      fireEvent.click(offlineRadio);
-
-      expect(mockSetCopyJobState).toHaveBeenCalledWith(expect.any(Function));
-
-      const updateFunction = mockSetCopyJobState.mock.calls[0][0];
-      const result = updateFunction(defaultContextValue.copyJobState);
-
-      expect(result).toEqual({
-        ...defaultContextValue.copyJobState,
-        migrationType: CopyJobMigrationType.Offline,
-      });
-    });
-
-    it("should call setCopyJobState when online radio button is clicked", () => {
-      (useCopyJobContext as jest.Mock).mockReturnValue({
-        ...defaultContextValue,
-        copyJobState: {
-          ...defaultContextValue.copyJobState,
-          migrationType: CopyJobMigrationType.Offline,
-        },
-      });
-
-      render(<MigrationType />);
-
-      const onlineRadio = screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.online.title });
-      fireEvent.click(onlineRadio);
-
-      expect(mockSetCopyJobState).toHaveBeenCalledWith(expect.any(Function));
-
-      const updateFunction = mockSetCopyJobState.mock.calls[0][0];
-      const result = updateFunction({
-        ...defaultContextValue.copyJobState,
-        migrationType: CopyJobMigrationType.Offline,
-      });
-
-      expect(result).toEqual({
-        ...defaultContextValue.copyJobState,
-        migrationType: CopyJobMigrationType.Online,
-      });
-    });
-  });
-
-  describe("Accessibility", () => {
-    it("should have proper ARIA attributes", () => {
-      render(<MigrationType />);
-
-      const choiceGroup = screen.getByRole("radiogroup");
-      expect(choiceGroup).toBeInTheDocument();
-      expect(choiceGroup).toHaveAttribute("aria-labelledby", "migrationTypeChoiceGroup");
-    });
-
-    it("should have proper radio button labels", () => {
-      render(<MigrationType />);
-
-      expect(
-        screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.offline.title }),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.online.title }),
-      ).toBeInTheDocument();
-    });
-  });
-
-  describe("Edge Cases", () => {
-    it("should handle undefined migration type gracefully", () => {
-      (useCopyJobContext as jest.Mock).mockReturnValue({
-        ...defaultContextValue,
-        copyJobState: {
-          ...defaultContextValue.copyJobState,
-          migrationType: undefined,
-        },
-      });
-
-      const { container } = render(<MigrationType />);
-
-      expect(container.querySelector("[data-test='migration-type']")).toBeInTheDocument();
-      expect(
-        screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.offline.title }),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByRole("radio", { name: ContainerCopyMessages.migrationTypeOptions.online.title }),
-      ).toBeInTheDocument();
-    });
-
-    it("should handle null copyJobState gracefully", () => {
-      (useCopyJobContext as jest.Mock).mockReturnValue({
-        ...defaultContextValue,
-        copyJobState: null,
-      });
-
-      const { container } = render(<MigrationType />);
-
-      expect(container.querySelector("[data-test='migration-type']")).toBeInTheDocument();
-    });
-  });
-});
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationType.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationType.tsx
@@ -1,77 +0,0 @@
-/* eslint-disable react/prop-types */
-/* eslint-disable react/display-name */
-import { ChoiceGroup, IChoiceGroupOption, Stack, Text } from "@fluentui/react";
-import MarkdownRender from "@nteract/markdown";
-import { useCopyJobContext } from "Explorer/ContainerCopy/Context/CopyJobContext";
-import React from "react";
-import ContainerCopyMessages from "../../../../ContainerCopyMessages";
-import { CopyJobMigrationType } from "../../../../Enums/CopyJobEnums";
-
-interface MigrationTypeProps {}
-const options: IChoiceGroupOption[] = [
-  {
-    key: CopyJobMigrationType.Offline,
-    text: ContainerCopyMessages.migrationTypeOptions.offline.title,
-    styles: { root: { width: "33%" } },
-  },
-  {
-    key: CopyJobMigrationType.Online,
-    text: ContainerCopyMessages.migrationTypeOptions.online.title,
-    styles: { root: { width: "33%" } },
-  },
-];
-
-const choiceGroupStyles = {
-  flexContainer: { display: "flex" as const },
-  root: {
-    selectors: {
-      ".ms-ChoiceField": {
-        color: "var(--colorNeutralForeground1)",
-      },
-      ".ms-ChoiceField-field:hover .ms-ChoiceFieldLabel": {
-        color: "var(--colorNeutralForeground1)",
-      },
-    },
-  },
-};
-
-export const MigrationType: React.FC<MigrationTypeProps> = React.memo(() => {
-  const { copyJobState, setCopyJobState } = useCopyJobContext();
-  const handleChange = (_ev?: React.FormEvent, option?: IChoiceGroupOption) => {
-    if (option) {
-      setCopyJobState((prevState) => ({
-        ...prevState,
-        migrationType: option.key as CopyJobMigrationType,
-      }));
-    }
-  };
-
-  const selectedKey = copyJobState?.migrationType ?? "";
-  const selectedKeyLowercase = selectedKey.toLowerCase() as keyof typeof ContainerCopyMessages.migrationTypeOptions;
-  const selectedKeyContent = ContainerCopyMessages.migrationTypeOptions[selectedKeyLowercase];
-
-  return (
-    <Stack data-test="migration-type" className="migrationTypeContainer">
-      <Stack.Item>
-        <ChoiceGroup
-          selectedKey={selectedKey}
-          options={options}
-          onChange={handleChange}
-          ariaLabelledBy="migrationTypeChoiceGroup"
-          styles={choiceGroupStyles}
-        />
-      </Stack.Item>
-      {selectedKeyContent && (
-        <Stack.Item styles={{ root: { marginTop: 10 } }}>
-          <Text
-            variant="small"
-            className="migrationTypeDescription"
-            data-test={`migration-type-description-${selectedKeyLowercase}`}
-          >
-            <MarkdownRender source={selectedKeyContent.description} linkTarget="_blank" />
-          </Text>
-        </Stack.Item>
-      )}
-    </Stack>
-  );
-});
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationTypeCheckbox.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationTypeCheckbox.test.tsx
@@ -0,0 +1,72 @@
+import "@testing-library/jest-dom";
+import { render, screen } from "@testing-library/react";
+import React from "react";
+import { MigrationTypeCheckbox } from "./MigrationTypeCheckbox";
+
+describe("MigrationTypeCheckbox", () => {
+  const mockOnChange = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("Component Rendering", () => {
+    it("should render with default props (unchecked state)", () => {
+      const { container } = render(<MigrationTypeCheckbox checked={false} onChange={mockOnChange} />);
+
+      expect(container.firstChild).toMatchSnapshot();
+    });
+
+    it("should render in checked state", () => {
+      const { container } = render(<MigrationTypeCheckbox checked={true} onChange={mockOnChange} />);
+
+      expect(container.firstChild).toMatchSnapshot();
+    });
+
+    it("should display the correct label text", () => {
+      render(<MigrationTypeCheckbox checked={false} onChange={mockOnChange} />);
+
+      const checkbox = screen.getByRole("checkbox");
+      expect(checkbox).toBeInTheDocument();
+
+      const label = screen.getByText("Copy container in offline mode");
+      expect(label).toBeInTheDocument();
+    });
+
+    it("should have correct accessibility attributes when checked", () => {
+      render(<MigrationTypeCheckbox checked={true} onChange={mockOnChange} />);
+
+      const checkbox = screen.getByRole("checkbox");
+      expect(checkbox).toBeChecked();
+      expect(checkbox).toHaveAttribute("checked");
+    });
+  });
+
+  describe("FluentUI Integration", () => {
+    it("should render FluentUI Checkbox component correctly", () => {
+      render(<MigrationTypeCheckbox checked={false} onChange={mockOnChange} />);
+
+      const checkbox = screen.getByRole("checkbox");
+      expect(checkbox).toBeInTheDocument();
+      expect(checkbox).toHaveAttribute("type", "checkbox");
+    });
+
+    it("should render FluentUI Stack component correctly", () => {
+      render(<MigrationTypeCheckbox checked={false} onChange={mockOnChange} />);
+
+      const stackContainer = document.querySelector(".migrationTypeRow");
+      expect(stackContainer).toBeInTheDocument();
+    });
+
+    it("should apply FluentUI Stack horizontal alignment correctly", () => {
+      const { container } = render(<MigrationTypeCheckbox checked={false} onChange={mockOnChange} />);
+
+      const stackContainer = container.querySelector(".migrationTypeRow");
+      expect(stackContainer).toBeInTheDocument();
+    });
+  });
+});
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationTypeCheckbox.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/MigrationTypeCheckbox.tsx
@@ -0,0 +1,16 @@
+/* eslint-disable react/prop-types */
+/* eslint-disable react/display-name */
+import { Checkbox, Stack } from "@fluentui/react";
+import React from "react";
+import ContainerCopyMessages from "../../../../ContainerCopyMessages";
+
+interface MigrationTypeCheckboxProps {
+  checked: boolean;
+  onChange: (_ev?: React.FormEvent, checked?: boolean) => void;
+}
+
+export const MigrationTypeCheckbox: React.FC<MigrationTypeCheckboxProps> = React.memo(({ checked, onChange }) => (
+  <Stack horizontal horizontalAlign="space-between" className="migrationTypeRow">
+    <Checkbox label={ContainerCopyMessages.migrationTypeCheckboxLabel} checked={checked} onChange={onChange} />
+  </Stack>
+));
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx
@@ -17,11 +17,11 @@ export const SubscriptionDropdown: React.FC<SubscriptionDropdownProps> = React.m

  const updateCopyJobState = (newSubscription: Subscription) => {
    setCopyJobState((prevState) => {
-      if (prevState.target?.subscription?.subscriptionId !== newSubscription.subscriptionId) {
+      if (prevState.source?.subscription?.subscriptionId !== newSubscription.subscriptionId) {
        return {
          ...prevState,
-          target: {
-            ...prevState.target,
+          source: {
+            ...prevState.source,
            subscription: newSubscription,
            account: null,
          },
@@ -33,7 +33,7 @@ export const SubscriptionDropdown: React.FC<SubscriptionDropdownProps> = React.m

  useEffect(() => {
    if (subscriptions && subscriptions.length > 0) {
-      const currentSubscriptionId = copyJobState?.target?.subscription?.subscriptionId;
+      const currentSubscriptionId = copyJobState?.source?.subscription?.subscriptionId;
      const predefinedSubscriptionId = userContext.subscriptionId;
      const selectedSubscriptionId = currentSubscriptionId || predefinedSubscriptionId;

@@ -61,7 +61,7 @@ export const SubscriptionDropdown: React.FC<SubscriptionDropdownProps> = React.m
    }
  };

-  const selectedSubscriptionId = copyJobState?.target?.subscription?.subscriptionId;
+  const selectedSubscriptionId = copyJobState?.source?.subscription?.subscriptionId;

  return (
    <FieldRow label={ContainerCopyMessages.subscriptionDropdownLabel}>
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/snapshots/MigrationType.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/snapshots/MigrationType.test.tsx.snap
@@ -1,109 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`MigrationType Component Rendering should render migration type component with radio buttons 1`] = `
-<div>
-  <div
-    class="ms-Stack migrationTypeContainer css-109"
-    data-test="migration-type"
-  >
-    <div
-      class="ms-StackItem css-110"
-    >
-      <div
-        class="ms-ChoiceFieldGroup root-111"
-      >
-        <div
-          aria-labelledby="migrationTypeChoiceGroup"
-          role="radiogroup"
-        >
-          <div
-            class="ms-ChoiceFieldGroup-flexContainer flexContainer-112"
-          >
-            <div
-              class="ms-ChoiceField root-113"
-            >
-              <div
-                class="ms-ChoiceField-wrapper"
-              >
-                <input
-                  class="ms-ChoiceField-input input-114"
-                  id="ChoiceGroup0-offline"
-                  name="ChoiceGroup0"
-                  type="radio"
-                />
-                <label
-                  class="ms-ChoiceField-field field-115"
-                  for="ChoiceGroup0-offline"
-                >
-                  <span
-                    class="ms-ChoiceFieldLabel"
-                    id="ChoiceGroupLabel1-offline"
-                  >
-                    Offline mode
-                  </span>
-                </label>
-              </div>
-            </div>
-            <div
-              class="ms-ChoiceField root-113"
-            >
-              <div
-                class="ms-ChoiceField-wrapper"
-              >
-                <input
-                  checked=""
-                  class="ms-ChoiceField-input input-114"
-                  id="ChoiceGroup0-online"
-                  name="ChoiceGroup0"
-                  type="radio"
-                />
-                <label
-                  class="ms-ChoiceField-field is-checked field-120"
-                  for="ChoiceGroup0-online"
-                >
-                  <span
-                    class="ms-ChoiceFieldLabel"
-                    id="ChoiceGroupLabel1-online"
-                  >
-                    Online mode
-                  </span>
-                </label>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="ms-StackItem css-123"
-    >
-      <span
-        class="migrationTypeDescription css-124"
-        data-test="migration-type-description-online"
-      >
-        <div
-          class="markdown-body "
-        >
-          <p>
-            Online container copy jobs let you copy data from a source container to a destination Cosmos DB NoSQL API container using the 
-            <a
-              href="https://learn.microsoft.com/azure/cosmos-db/change-feed-modes?tabs=all-versions-and-deletes#all-versions-and-deletes-change-feed-mode-preview"
-              target="_blank"
-            >
-              All Versions and Delete
-            </a>
-             change feed. This allows updates to continue on the source while data is copied. A brief downtime is required at the end to safely switch over client applications to the destination container. Learn more about 
-            <a
-              href="https://learn.microsoft.com/azure/cosmos-db/container-copy?tabs=online-copy&pivots=api-nosql#getting-started"
-              target="_blank"
-            >
-              online copy jobs
-            </a>
-            .
-          </p>
-        </div>
-      </span>
-    </div>
-  </div>
-</div>
-`;
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/snapshots/MigrationTypeCheckbox.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/snapshots/MigrationTypeCheckbox.test.tsx.snap
@@ -0,0 +1,80 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MigrationTypeCheckbox Component Rendering should render in checked state 1`] = `
+<div
+  class="ms-Stack migrationTypeRow css-109"
+>
+  <div
+    class="ms-Checkbox is-checked is-enabled root-119"
+  >
+    <input
+      checked=""
+      class="input-111"
+      data-ktp-execute-target="true"
+      id="checkbox-1"
+      type="checkbox"
+    />
+    <label
+      class="ms-Checkbox-label label-112"
+      for="checkbox-1"
+    >
+      <div
+        class="ms-Checkbox-checkbox checkbox-120"
+        data-ktp-target="true"
+      >
+        <i
+          aria-hidden="true"
+          class="ms-Checkbox-checkmark checkmark-122"
+          data-icon-name="CheckMark"
+        >
+          
+        </i>
+      </div>
+      <span
+        class="ms-Checkbox-text text-115"
+      >
+        Copy container in offline mode
+      </span>
+    </label>
+  </div>
+</div>
+`;
+
+exports[`MigrationTypeCheckbox Component Rendering should render with default props (unchecked state) 1`] = `
+<div
+  class="ms-Stack migrationTypeRow css-109"
+>
+  <div
+    class="ms-Checkbox is-enabled root-110"
+  >
+    <input
+      class="input-111"
+      data-ktp-execute-target="true"
+      id="checkbox-0"
+      type="checkbox"
+    />
+    <label
+      class="ms-Checkbox-label label-112"
+      for="checkbox-0"
+    >
+      <div
+        class="ms-Checkbox-checkbox checkbox-113"
+        data-ktp-target="true"
+      >
+        <i
+          aria-hidden="true"
+          class="ms-Checkbox-checkmark checkmark-118"
+          data-icon-name="CheckMark"
+        >
+          
+        </i>
+      </div>
+      <span
+        class="ms-Checkbox-text text-115"
+      >
+        Copy container in offline mode
+      </span>
+    </label>
+  </div>
+</div>
+`;
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/SelectAccount.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/SelectAccount.test.tsx
@@ -1,5 +1,5 @@
 import "@testing-library/jest-dom";
-import { render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import React from "react";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
 import { CopyJobMigrationType } from "../../../Enums/CopyJobEnums";
@@ -18,8 +18,19 @@ jest.mock("./Components/AccountDropdown", () => ({
  AccountDropdown: jest.fn(() => <div data-testid="account-dropdown">Account Dropdown</div>),
 }));

-jest.mock("./Components/MigrationType", () => ({
-  MigrationType: jest.fn(() => <div data-testid="migration-type">Migration Type</div>),
+jest.mock("./Components/MigrationTypeCheckbox", () => ({
+  MigrationTypeCheckbox: jest.fn(({ checked, onChange }: { checked: boolean; onChange: () => void }) => (
+    <div data-testid="migration-type-checkbox">
+      <input
+        type="checkbox"
+        checked={checked}
+        onChange={onChange}
+        data-testid="migration-checkbox-input"
+        aria-label="Migration Type Checkbox"
+      />
+      Copy container in offline mode
+    </div>
+  )),
 }));

 describe("SelectAccount", () => {
@@ -30,18 +41,18 @@ describe("SelectAccount", () => {
      jobName: "",
      migrationType: CopyJobMigrationType.Online,
      source: {
-        subscriptionId: "",
-        account: null as any,
-        databaseId: "",
-        containerId: "",
-      },
-      target: {
        subscription: null as any,
        account: null as any,
        databaseId: "",
        containerId: "",
      },
-      sourceReadWriteAccessFromTarget: false,
+      target: {
+        subscriptionId: "",
+        account: null as any,
+        databaseId: "",
+        containerId: "",
+      },
+      sourceReadAccessFromTarget: false,
    },
    setCopyJobState: mockSetCopyJobState,
    flow: { currentScreen: "selectAccount" },
@@ -68,11 +79,11 @@ describe("SelectAccount", () => {
      expect(container.firstChild).toHaveAttribute("data-test", "Panel:SelectAccountContainer");
      expect(container.firstChild).toHaveClass("selectAccountContainer");

-      expect(screen.getByText(/Please select a destination account to copy to/i)).toBeInTheDocument();
+      expect(screen.getByText(/Please select a source account from which to copy/i)).toBeInTheDocument();

      expect(screen.getByTestId("subscription-dropdown")).toBeInTheDocument();
      expect(screen.getByTestId("account-dropdown")).toBeInTheDocument();
-      expect(screen.getByTestId("migration-type")).toBeInTheDocument();
+      expect(screen.getByTestId("migration-type-checkbox")).toBeInTheDocument();
    });

    it("should render correctly with snapshot", () => {
@@ -82,20 +93,78 @@ describe("SelectAccount", () => {
  });

  describe("Migration Type Functionality", () => {
-    it("should render migration type component", () => {
+    it("should display migration type checkbox as unchecked when migrationType is Online", () => {
+      (useCopyJobContext as jest.Mock).mockReturnValue({
+        ...defaultContextValue,
+        copyJobState: {
+          ...defaultContextValue.copyJobState,
+          migrationType: CopyJobMigrationType.Online,
+        },
+      });
+
      render(<SelectAccount />);

-      const migrationTypeComponent = screen.getByTestId("migration-type");
-      expect(migrationTypeComponent).toBeInTheDocument();
+      const checkbox = screen.getByTestId("migration-checkbox-input");
+      expect(checkbox).not.toBeChecked();
+    });
+
+    it("should display migration type checkbox as checked when migrationType is Offline", () => {
+      (useCopyJobContext as jest.Mock).mockReturnValue({
+        ...defaultContextValue,
+        copyJobState: {
+          ...defaultContextValue.copyJobState,
+          migrationType: CopyJobMigrationType.Offline,
+        },
+      });
+
+      render(<SelectAccount />);
+
+      const checkbox = screen.getByTestId("migration-checkbox-input");
+      expect(checkbox).toBeChecked();
+    });
+
+    it("should call setCopyJobState with Online migration type when checkbox is unchecked", () => {
+      (useCopyJobContext as jest.Mock).mockReturnValue({
+        ...defaultContextValue,
+        copyJobState: {
+          ...defaultContextValue.copyJobState,
+          migrationType: CopyJobMigrationType.Offline,
+        },
+      });
+
+      render(<SelectAccount />);
+
+      const checkbox = screen.getByTestId("migration-checkbox-input");
+      fireEvent.click(checkbox);
+
+      expect(mockSetCopyJobState).toHaveBeenCalledWith(expect.any(Function));
+
+      const updateFunction = mockSetCopyJobState.mock.calls[0][0];
+      const previousState = {
+        ...defaultContextValue.copyJobState,
+        migrationType: CopyJobMigrationType.Offline,
+      };
+      const result = updateFunction(previousState);
+
+      expect(result).toEqual({
+        ...previousState,
+        migrationType: CopyJobMigrationType.Online,
+      });
    });
  });

  describe("Performance and Optimization", () => {
-    it("should render without performance issues", () => {
+    it("should maintain referential equality of handler functions between renders", async () => {
      const { rerender } = render(<SelectAccount />);
+
+      const migrationCheckbox = (await import("./Components/MigrationTypeCheckbox")).MigrationTypeCheckbox as jest.Mock;
+      const firstRenderHandler = migrationCheckbox.mock.calls[migrationCheckbox.mock.calls.length - 1][0].onChange;
+
      rerender(<SelectAccount />);

-      expect(screen.getByTestId("migration-type")).toBeInTheDocument();
+      const secondRenderHandler = migrationCheckbox.mock.calls[migrationCheckbox.mock.calls.length - 1][0].onChange;
+
+      expect(firstRenderHandler).toBe(secondRenderHandler);
    });
  });
 });
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/SelectAccount.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/SelectAccount.tsx
@@ -1,20 +1,33 @@
 import { Stack, Text } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
+import { useCopyJobContext } from "../../../Context/CopyJobContext";
+import { CopyJobMigrationType } from "../../../Enums/CopyJobEnums";
 import { AccountDropdown } from "./Components/AccountDropdown";
-import { MigrationType } from "./Components/MigrationType";
+import { MigrationTypeCheckbox } from "./Components/MigrationTypeCheckbox";
 import { SubscriptionDropdown } from "./Components/SubscriptionDropdown";

 const SelectAccount = React.memo(() => {
+  const { copyJobState, setCopyJobState } = useCopyJobContext();
+
+  const handleMigrationTypeChange = (_ev?: React.FormEvent<HTMLElement>, checked?: boolean) => {
+    setCopyJobState((prevState) => ({
+      ...prevState,
+      migrationType: checked ? CopyJobMigrationType.Offline : CopyJobMigrationType.Online,
+    }));
+  };
+
+  const migrationTypeChecked = copyJobState?.migrationType === CopyJobMigrationType.Offline;
+
  return (
    <Stack data-test="Panel:SelectAccountContainer" className="selectAccountContainer" tokens={{ childrenGap: 15 }}>
-      <Text className="themeText">{ContainerCopyMessages.selectAccountDescription}</Text>
+      <Text>{ContainerCopyMessages.selectAccountDescription}</Text>

      <SubscriptionDropdown />

      <AccountDropdown />

-      <MigrationType />
+      <MigrationTypeCheckbox checked={migrationTypeChecked} onChange={handleMigrationTypeChange} />
    </Stack>
  );
 });
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/snapshots/SelectAccount.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/snapshots/SelectAccount.test.tsx.snap
@@ -6,9 +6,9 @@ exports[`SelectAccount Component Rendering should render correctly with snapshot
  data-test="Panel:SelectAccountContainer"
 >
  <span
-    class="themeText css-110"
+    class="css-110"
  >
-    Please select a destination account to copy to.
+    Please select a source account from which to copy.
  </span>
  <div
    data-testid="subscription-dropdown"
@@ -21,9 +21,14 @@ exports[`SelectAccount Component Rendering should render correctly with snapshot
    Account Dropdown
  </div>
  <div
-    data-testid="migration-type"
+    data-testid="migration-type-checkbox"
  >
-    Migration Type
+    <input
+      aria-label="Migration Type Checkbox"
+      data-testid="migration-checkbox-input"
+      type="checkbox"
+    />
+    Copy container in offline mode
  </div>
 </div>
 `;
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/Events/DropDownChangeHandler.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/Events/DropDownChangeHandler.test.tsx
@@ -7,9 +7,19 @@ import { dropDownChangeHandler } from "./DropDownChangeHandler";
 const createMockInitialState = (): CopyJobContextState => ({
  jobName: "test-job",
  migrationType: CopyJobMigrationType.Offline,
-  sourceReadWriteAccessFromTarget: false,
+  sourceReadAccessFromTarget: false,
  source: {
-    subscriptionId: "source-sub-id",
+    subscription: {
+      subscriptionId: "source-sub-id",
+      displayName: "Source Subscription",
+      state: "Enabled",
+      subscriptionPolicies: {
+        locationPlacementId: "test",
+        quotaId: "test",
+        spendingLimit: "Off",
+      },
+      authorizationSource: "test",
+    },
    account: {
      id: "source-account-id",
      name: "source-account",
@@ -40,17 +50,7 @@ const createMockInitialState = (): CopyJobContextState => ({
    containerId: "source-container",
  },
  target: {
-    subscription: {
-      subscriptionId: "target-sub-id",
-      displayName: "Target Subscription",
-      state: "Enabled",
-      subscriptionPolicies: {
-        locationPlacementId: "test",
-        quotaId: "test",
-        spendingLimit: "Off",
-      },
-      authorizationSource: "test",
-    },
+    subscriptionId: "target-sub-id",
    account: {
      id: "target-account-id",
      name: "target-account",
@@ -169,7 +169,7 @@ describe("dropDownChangeHandler", () => {

      expect(capturedState.source.databaseId).toBe("new-source-db");
      expect(capturedState.source.containerId).toBeUndefined();
-      expect(capturedState.source.subscriptionId).toEqual(initialState.source.subscriptionId);
+      expect(capturedState.source.subscription).toEqual(initialState.source.subscription);
      expect(capturedState.source.account).toEqual(initialState.source.account);
      expect(capturedState.target).toEqual(initialState.target);
    });
@@ -181,7 +181,7 @@ describe("dropDownChangeHandler", () => {

      expect(capturedState.jobName).toBe(initialState.jobName);
      expect(capturedState.migrationType).toBe(initialState.migrationType);
-      expect(capturedState.sourceReadWriteAccessFromTarget).toBe(initialState.sourceReadWriteAccessFromTarget);
+      expect(capturedState.sourceReadAccessFromTarget).toBe(initialState.sourceReadAccessFromTarget);
    });
  });

@@ -193,7 +193,7 @@ describe("dropDownChangeHandler", () => {

      expect(capturedState.source.containerId).toBe("new-source-container");
      expect(capturedState.source.databaseId).toBe(initialState.source.databaseId);
-      expect(capturedState.source.subscriptionId).toEqual(initialState.source.subscriptionId);
+      expect(capturedState.source.subscription).toEqual(initialState.source.subscription);
      expect(capturedState.source.account).toEqual(initialState.source.account);
      expect(capturedState.target).toEqual(initialState.target);
    });
@@ -215,7 +215,7 @@ describe("dropDownChangeHandler", () => {

      expect(capturedState.target.databaseId).toBe("new-target-db");
      expect(capturedState.target.containerId).toBeUndefined();
-      expect(capturedState.target.subscription).toEqual(initialState.target.subscription);
+      expect(capturedState.target.subscriptionId).toBe(initialState.target.subscriptionId);
      expect(capturedState.target.account).toEqual(initialState.target.account);
      expect(capturedState.source).toEqual(initialState.source);
    });
@@ -227,7 +227,7 @@ describe("dropDownChangeHandler", () => {

      expect(capturedState.jobName).toBe(initialState.jobName);
      expect(capturedState.migrationType).toBe(initialState.migrationType);
-      expect(capturedState.sourceReadWriteAccessFromTarget).toBe(initialState.sourceReadWriteAccessFromTarget);
+      expect(capturedState.sourceReadAccessFromTarget).toBe(initialState.sourceReadAccessFromTarget);
    });
  });

@@ -239,7 +239,7 @@ describe("dropDownChangeHandler", () => {

      expect(capturedState.target.containerId).toBe("new-target-container");
      expect(capturedState.target.databaseId).toBe(initialState.target.databaseId);
-      expect(capturedState.target.subscription).toEqual(initialState.target.subscription);
+      expect(capturedState.target.subscriptionId).toBe(initialState.target.subscriptionId);
      expect(capturedState.target.account).toEqual(initialState.target.account);
      expect(capturedState.source).toEqual(initialState.source);
    });
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.test.tsx
@@ -73,7 +73,7 @@ describe("SelectSourceAndTargetContainers", () => {
    jobName: "",
    migrationType: CopyJobMigrationType.Offline,
    source: {
-      subscriptionId: "test-subscription-id",
+      subscription: { subscriptionId: "test-subscription-id" },
      account: {
        id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDB/databaseAccounts/test-account",
        name: "test-account",
@@ -82,7 +82,7 @@ describe("SelectSourceAndTargetContainers", () => {
      containerId: "container1",
    },
    target: {
-      subscription: { subscriptionId: "test-subscription-id" },
+      subscriptionId: "test-subscription-id",
      account: {
        id: "/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.DocumentDB/databaseAccounts/test-account",
        name: "test-account",
@@ -90,7 +90,7 @@ describe("SelectSourceAndTargetContainers", () => {
      databaseId: "db2",
      containerId: "container2",
    },
-    sourceReadWriteAccessFromTarget: false,
+    sourceReadAccessFromTarget: false,
  };

  const mockMemoizedData = {
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx
@@ -47,12 +47,8 @@ const SelectSourceAndTargetContainers = ({ showAddCollectionPanel }: SelectSourc
  const onDropdownChange = dropDownChangeHandler(setCopyJobState);

  return (
-    <Stack
-      data-test="Panel:SelectSourceAndTargetContainers"
-      className="selectSourceAndTargetContainers"
-      tokens={{ childrenGap: 25 }}
-    >
-      <span className="themeText">{ContainerCopyMessages.selectSourceAndTargetContainersDescription}</span>
+    <Stack className="selectSourceAndTargetContainers" tokens={{ childrenGap: 25 }}>
+      <span>{ContainerCopyMessages.selectSourceAndTargetContainersDescription}</span>
      <DatabaseContainerSection
        heading={ContainerCopyMessages.sourceContainerSubHeading}
        databaseOptions={sourceDatabaseOptions}
@@ -63,7 +59,6 @@ const SelectSourceAndTargetContainers = ({ showAddCollectionPanel }: SelectSourc
        selectedContainer={source?.containerId}
        containerDisabled={!source?.databaseId}
        containerOnChange={onDropdownChange("sourceContainer")}
-        sectionType="source"
      />
      <DatabaseContainerSection
        heading={ContainerCopyMessages.targetContainerSubHeading}
@@ -76,7 +71,6 @@ const SelectSourceAndTargetContainers = ({ showAddCollectionPanel }: SelectSourc
        containerDisabled={!target?.databaseId}
        containerOnChange={onDropdownChange("targetContainer")}
        handleOnDemandCreateContainer={showAddCollectionPanel}
-        sectionType="target"
      />
    </Stack>
  );
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/DatabaseContainerSection.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/DatabaseContainerSection.test.tsx
@@ -32,7 +32,6 @@ describe("DatabaseContainerSection", () => {
    selectedContainer: "container1",
    containerDisabled: false,
    containerOnChange: mockContainerOnChange,
-    sectionType: "source",
  };

  beforeEach(() => {
@@ -293,7 +292,6 @@ describe("DatabaseContainerSection", () => {
        containerOptions: mockContainerOptions,
        selectedContainer: "container1",
        containerOnChange: mockContainerOnChange,
-        sectionType: "source",
      };

      render(<DatabaseContainerSection {...minimalProps} />);
@@ -395,7 +393,6 @@ describe("DatabaseContainerSection", () => {
        containerOptions: [{ key: "c1", text: "Container 1", data: { id: "c1" } }],
        selectedContainer: "c1",
        containerOnChange: jest.fn(),
-        sectionType: "source",
      };

      const { container } = render(<DatabaseContainerSection {...minimalProps} />);
@@ -414,7 +411,6 @@ describe("DatabaseContainerSection", () => {
        containerDisabled: false,
        containerOnChange: jest.fn(),
        handleOnDemandCreateContainer: jest.fn(),
-        sectionType: "target",
      };

      const { container } = render(<DatabaseContainerSection {...fullProps} />);
@@ -432,7 +428,6 @@ describe("DatabaseContainerSection", () => {
        selectedContainer: "container1",
        containerDisabled: true,
        containerOnChange: jest.fn(),
-        sectionType: "target",
      };

      const { container } = render(<DatabaseContainerSection {...disabledProps} />);
@@ -448,7 +443,6 @@ describe("DatabaseContainerSection", () => {
        containerOptions: [],
        selectedContainer: "",
        containerOnChange: jest.fn(),
-        sectionType: "target",
      };

      const { container } = render(<DatabaseContainerSection {...emptyOptionsProps} />);
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/DatabaseContainerSection.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/DatabaseContainerSection.tsx
@@ -15,7 +15,6 @@ export const DatabaseContainerSection = ({
  containerDisabled,
  containerOnChange,
  handleOnDemandCreateContainer,
-  sectionType,
 }: DatabaseContainerSectionProps) => (
  <Stack tokens={{ childrenGap: 15 }} className="databaseContainerSection">
    <label className="subHeading">{heading}</label>
@@ -28,7 +27,6 @@ export const DatabaseContainerSection = ({
        disabled={!!databaseDisabled}
        selectedKey={selectedDatabase}
        onChange={databaseOnChange}
-        data-test={`${sectionType}-databaseDropdown`}
      />
    </FieldRow>
    <FieldRow label={ContainerCopyMessages.containerDropdownLabel}>
@@ -41,14 +39,9 @@ export const DatabaseContainerSection = ({
          disabled={!!containerDisabled}
          selectedKey={selectedContainer}
          onChange={containerOnChange}
-          data-test={`${sectionType}-containerDropdown`}
        />
        {handleOnDemandCreateContainer && (
-          <ActionButton
-            className="create-container-link-btn"
-            style={{ color: "var(--colorBrandForeground1)" }}
-            onClick={() => handleOnDemandCreateContainer()}
-          >
+          <ActionButton className="create-container-link-btn" onClick={() => handleOnDemandCreateContainer()}>
            {ContainerCopyMessages.createContainerButtonLabel}
          </ActionButton>
        )}
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/snapshots/DatabaseContainerSection.test.tsx.snap
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/snapshots/DatabaseContainerSection.test.tsx.snap
@@ -37,7 +37,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with all pro
          class="ms-Dropdown is-required dropdown-112"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="target-databaseDropdown"
          id="Dropdown98"
          role="combobox"
          tabindex="0"
@@ -95,7 +94,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with all pro
            class="ms-Dropdown is-required dropdown-112"
            data-is-focusable="true"
            data-ktp-target="true"
-            data-test="target-containerDropdown"
            id="Dropdown99"
            role="combobox"
            tabindex="0"
@@ -184,7 +182,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with disable
          class="ms-Dropdown is-disabled is-required dropdown-143"
          data-is-focusable="false"
          data-ktp-target="true"
-          data-test="target-databaseDropdown"
          id="Dropdown103"
          role="combobox"
          tabindex="-1"
@@ -242,7 +239,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with disable
            class="ms-Dropdown is-disabled is-required dropdown-143"
            data-is-focusable="false"
            data-ktp-target="true"
-            data-test="target-containerDropdown"
            id="Dropdown104"
            role="combobox"
            tabindex="-1"
@@ -310,7 +306,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with empty o
          class="ms-Dropdown is-required dropdown-112"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="target-databaseDropdown"
          id="Dropdown105"
          role="combobox"
          tabindex="0"
@@ -368,7 +363,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with empty o
            class="ms-Dropdown is-required dropdown-112"
            data-is-focusable="true"
            data-ktp-target="true"
-            data-test="target-containerDropdown"
            id="Dropdown106"
            role="combobox"
            tabindex="0"
@@ -436,7 +430,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with minimal
          class="ms-Dropdown is-required dropdown-112"
          data-is-focusable="true"
          data-ktp-target="true"
-          data-test="source-databaseDropdown"
          id="Dropdown96"
          role="combobox"
          tabindex="0"
@@ -494,7 +487,6 @@ exports[`DatabaseContainerSection Snapshot Testing matches snapshot with minimal
            class="ms-Dropdown is-required dropdown-112"
            data-is-focusable="true"
            data-ktp-target="true"
-            data-test="source-containerDropdown"
            id="Dropdown97"
            role="combobox"
            tabindex="0"
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.test.tsx
@@ -69,15 +69,15 @@ describe("useSourceAndTargetData", () => {
  const mockCopyJobState: CopyJobContextState = {
    jobName: "test-job",
    migrationType: CopyJobMigrationType.Offline,
-    sourceReadWriteAccessFromTarget: false,
+    sourceReadAccessFromTarget: false,
    source: {
-      subscriptionId: "source-subscription-id",
+      subscription: mockSubscription,
      account: mockSourceAccount,
      databaseId: "source-db",
      containerId: "source-container",
    },
    target: {
-      subscription: mockSubscription,
+      subscriptionId: "target-subscription-id",
      account: mockTargetAccount,
      databaseId: "target-db",
      containerId: "target-container",
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCopyJobNavigation.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCopyJobNavigation.test.tsx
@@ -86,13 +86,13 @@ describe("useCopyJobNavigation", () => {
    jobName: "test-job",
    migrationType: CopyJobMigrationType.Offline,
    source: {
-      subscriptionId: "source-sub-id",
+      subscription: { subscriptionId: "source-sub-id" } as any,
      account: { id: "source-account-id", name: "Account-1" } as any,
      databaseId: "source-db",
      containerId: "source-container",
    },
    target: {
-      subscription: { subscriptionId: "target-sub-id" } as any,
+      subscriptionId: "target-sub-id",
      account: { id: "target-account-id", name: "Account-2" } as any,
      databaseId: "target-db",
      containerId: "target-container",
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.test.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.test.tsx
@@ -142,14 +142,14 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "test-sub",
+            subscription: { subscriptionId: "test-sub" } as any,
            account: { name: "test-account" } as any,
            databaseId: "",
            containerId: "",
          },
          target: {
-            subscription: { subscriptionId: "test-sub" } as any,
-            account: { name: "test-account" } as any,
+            subscriptionId: "",
+            account: null as any,
            databaseId: "",
            containerId: "",
          },
@@ -171,14 +171,14 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "",
-            account: null as any,
+            subscription: null as any,
+            account: { name: "test-account" } as any,
            databaseId: "",
            containerId: "",
          },
          target: {
-            subscription: null as any,
-            account: { name: "test-account" } as any,
+            subscriptionId: "",
+            account: null as any,
            databaseId: "",
            containerId: "",
          },
@@ -210,13 +210,13 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "",
+            subscription: null as any,
            account: null as any,
            databaseId: "source-db",
            containerId: "source-container",
          },
          target: {
-            subscription: null as any,
+            subscriptionId: "",
            account: null as any,
            databaseId: "target-db",
            containerId: "target-container",
@@ -240,13 +240,13 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "",
+            subscription: null as any,
            account: null as any,
            databaseId: "",
            containerId: "source-container",
          },
          target: {
-            subscription: null as any,
+            subscriptionId: "",
            account: null as any,
            databaseId: "target-db",
            containerId: "target-container",
@@ -288,13 +288,13 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "valid-job-name_123",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "",
+            subscription: null as any,
            account: null as any,
            databaseId: "",
            containerId: "",
          },
          target: {
-            subscription: null as any,
+            subscriptionId: "",
            account: null as any,
            databaseId: "",
            containerId: "",
@@ -318,13 +318,13 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "invalid job name with spaces!",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "",
+            subscription: null as any,
            account: null as any,
            databaseId: "",
            containerId: "",
          },
          target: {
-            subscription: null as any,
+            subscriptionId: "",
            account: null as any,
            databaseId: "",
            containerId: "",
@@ -348,13 +348,13 @@ describe("useCreateCopyJobScreensList", () => {
          jobName: "",
          migrationType: CopyJobMigrationType.Offline,
          source: {
-            subscriptionId: "",
+            subscription: null as any,
            account: null as any,
            databaseId: "",
            containerId: "",
          },
          target: {
-            subscription: null as any,
+            subscriptionId: "",
            account: null as any,
            databaseId: "",
            containerId: "",
--- a/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx
+++ b/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx
@@ -36,7 +36,7 @@ function useCreateCopyJobScreensList(goBack: () => void): Screen[] {
        component: <SelectAccount />,
        validations: [
          {
-            validate: (state: CopyJobContextState) => !!state?.target?.subscription && !!state?.target?.account,
+            validate: (state: CopyJobContextState) => !!state?.source?.subscription && !!state?.source?.account,
            message: "Please select a subscription and account to proceed",
          },
        ],
--- a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobActionMenu.test.tsx
+++ b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobActionMenu.test.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-conditional-expect */
 import "@testing-library/jest-dom";
 import { fireEvent, render, screen } from "@testing-library/react";
 import React from "react";
@@ -6,20 +5,6 @@ import { CopyJobActions, CopyJobMigrationType, CopyJobStatusType } from "../../E
 import { CopyJobType, HandleJobActionClickType } from "../../Types/CopyJobTypes";
 import CopyJobActionMenu from "./CopyJobActionMenu";

-const mockShowOkCancelModalDialog = jest.fn();
-const mockCloseDialog = jest.fn();
-const mockOpenDialog = jest.fn();
-
-jest.mock("../../../Controls/Dialog", () => ({
-  useDialog: {
-    getState: () => ({
-      showOkCancelModalDialog: mockShowOkCancelModalDialog,
-      closeDialog: mockCloseDialog,
-      openDialog: mockOpenDialog,
-    }),
-  },
-}));
-
 jest.mock("../../ContainerCopyMessages", () => ({
  __esModule: true,
  default: {
@@ -33,11 +18,6 @@ jest.mock("../../ContainerCopyMessages", () => ({
        cancel: "Cancel",
        complete: "Complete",
      },
-      dialog: {
-        heading: "Confirm Action",
-        confirmButtonText: "Confirm",
-        cancelButtonText: "Cancel",
-      },
    },
  },
 }));
@@ -70,9 +50,6 @@ describe("CopyJobActionMenu", () => {

  beforeEach(() => {
    jest.clearAllMocks();
-    mockShowOkCancelModalDialog.mockClear();
-    mockCloseDialog.mockClear();
-    mockOpenDialog.mockClear();
  });

  describe("Component Rendering", () => {
@@ -289,29 +266,7 @@ describe("CopyJobActionMenu", () => {
      expect(mockHandleClick).toHaveBeenCalledWith(job, CopyJobActions.pause, expect.any(Function));
    });

-    it("should show confirmation dialog when cancel action is clicked", () => {
-      const job = createMockJob({ Name: "Test Job", Status: CopyJobStatusType.InProgress });
-
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const cancelButton = screen.getByText("Cancel");
-      fireEvent.click(cancelButton);
-
-      expect(mockShowOkCancelModalDialog).toHaveBeenCalledWith(
-        "Confirm Action",
-        null,
-        "Confirm",
-        expect.any(Function),
-        "Cancel",
-        null,
-        expect.any(Object), // dialogBody content
-      );
-    });
-
-    it("should call handleClick when dialog is confirmed for cancel action", () => {
+    it("should call handleClick when cancel action is clicked", () => {
      const job = createMockJob({ Status: CopyJobStatusType.InProgress });

      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
@@ -322,9 +277,6 @@ describe("CopyJobActionMenu", () => {
      const cancelButton = screen.getByText("Cancel");
      fireEvent.click(cancelButton);

-      const [, , , onOkCallback] = mockShowOkCancelModalDialog.mock.calls[0];
-      onOkCallback();
-
      expect(mockHandleClick).toHaveBeenCalledWith(job, CopyJobActions.cancel, expect.any(Function));
    });

@@ -342,33 +294,7 @@ describe("CopyJobActionMenu", () => {
      expect(mockHandleClick).toHaveBeenCalledWith(job, CopyJobActions.resume, expect.any(Function));
    });

-    it("should show confirmation dialog when complete action is clicked", () => {
-      const job = createMockJob({
-        Name: "Test Online Job",
-        Status: CopyJobStatusType.InProgress,
-        Mode: CopyJobMigrationType.Online,
-      });
-
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const completeButton = screen.getByText("Complete");
-      fireEvent.click(completeButton);
-
-      expect(mockShowOkCancelModalDialog).toHaveBeenCalledWith(
-        "Confirm Action",
-        null,
-        "Confirm",
-        expect.any(Function),
-        "Cancel",
-        null,
-        expect.any(Object), // dialogBody content
-      );
-    });
-
-    it("should call handleClick when dialog is confirmed for complete action", () => {
+    it("should call handleClick when complete action is clicked", () => {
      const job = createMockJob({
        Status: CopyJobStatusType.InProgress,
        Mode: CopyJobMigrationType.Online,
@@ -382,87 +308,10 @@ describe("CopyJobActionMenu", () => {
      const completeButton = screen.getByText("Complete");
      fireEvent.click(completeButton);

-      const [, , , onOkCallback] = mockShowOkCancelModalDialog.mock.calls[0];
-      onOkCallback();
-
      expect(mockHandleClick).toHaveBeenCalledWith(job, CopyJobActions.complete, expect.any(Function));
    });
  });

-  describe("Dialog Body Content", () => {
-    it("should pass correct dialog body content for cancel action", () => {
-      const job = createMockJob({ Name: "MyTestJob", Status: CopyJobStatusType.InProgress });
-
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const cancelButton = screen.getByText("Cancel");
-      fireEvent.click(cancelButton);
-
-      expect(mockShowOkCancelModalDialog).toHaveBeenCalledWith(
-        "Confirm Action",
-        null,
-        "Confirm",
-        expect.any(Function),
-        "Cancel",
-        null,
-        expect.objectContaining({
-          props: expect.objectContaining({
-            tokens: expect.any(Object),
-            children: expect.any(Array),
-          }),
-        }),
-      );
-    });
-
-    it("should pass correct dialog body content for complete action", () => {
-      const job = createMockJob({
-        Name: "OnlineTestJob",
-        Status: CopyJobStatusType.InProgress,
-        Mode: CopyJobMigrationType.Online,
-      });
-
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const completeButton = screen.getByText("Complete");
-      fireEvent.click(completeButton);
-
-      expect(mockShowOkCancelModalDialog).toHaveBeenCalledWith(
-        "Confirm Action",
-        null,
-        "Confirm",
-        expect.any(Function),
-        "Cancel",
-        null,
-        expect.objectContaining({
-          props: expect.objectContaining({
-            tokens: expect.any(Object),
-            children: expect.any(Array),
-          }),
-        }),
-      );
-    });
-
-    it("should not show dialog body for actions without confirmation", () => {
-      const job = createMockJob({ Status: CopyJobStatusType.InProgress });
-
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const pauseButton = screen.getByText("Pause");
-      fireEvent.click(pauseButton);
-
-      expect(mockShowOkCancelModalDialog).not.toHaveBeenCalled();
-    });
-  });
-
  describe("Disabled States During Updates", () => {
    const TestComponentWrapper: React.FC<{
      job: CopyJobType;
@@ -490,13 +339,8 @@ describe("CopyJobActionMenu", () => {
      const pauseButton = screen.getByText("Pause");
      fireEvent.click(pauseButton);
      fireEvent.click(actionButton);
-
-      const pauseButtonAfterClick = screen.getByText("Pause").closest("button");
+      const pauseButtonAfterClick = screen.getByText("Pause");
      expect(pauseButtonAfterClick).toBeInTheDocument();
-      expect(pauseButtonAfterClick).toHaveAttribute("aria-disabled", "true");
-
-      const cancelButtonAfterClick = screen.getByText("Cancel").closest("button");
-      expect(cancelButtonAfterClick).toHaveAttribute("aria-disabled", "true");
    });

    it("should not disable actions for different jobs when one is updating", () => {
@@ -516,7 +360,23 @@ describe("CopyJobActionMenu", () => {
      expect(screen.getByText("Cancel")).toBeInTheDocument();
    });

-    it("should disable complete action when job is being updated", () => {
+    it("should properly handle multiple action types being disabled for the same job", () => {
+      const job = createMockJob({ Status: CopyJobStatusType.InProgress });
+      render(<TestComponentWrapper job={job} />);
+      const actionButton = screen.getByRole("button", { name: "Actions" });
+
+      fireEvent.click(actionButton);
+      fireEvent.click(screen.getByText("Pause"));
+
+      fireEvent.click(actionButton);
+      fireEvent.click(screen.getByText("Cancel"));
+
+      fireEvent.click(actionButton);
+      expect(screen.getByText("Pause")).toBeInTheDocument();
+      expect(screen.getByText("Cancel")).toBeInTheDocument();
+    });
+
+    it("should handle complete action disabled state for online jobs", () => {
      const job = createMockJob({
        Status: CopyJobStatusType.InProgress,
        Mode: CopyJobMigrationType.Online,
@@ -530,34 +390,8 @@ describe("CopyJobActionMenu", () => {
      const completeButton = screen.getByText("Complete");
      fireEvent.click(completeButton);

-      // Simulate dialog confirmation to trigger state update
-      const [, , , onOkCallback] = mockShowOkCancelModalDialog.mock.calls[0];
-      onOkCallback();
-
      fireEvent.click(actionButton);
-      const completeButtonAfterClick = screen.getByText("Complete").closest("button");
-      expect(completeButtonAfterClick).toBeInTheDocument();
-      expect(completeButtonAfterClick).toHaveAttribute("aria-disabled", "true");
-    });
-
-    it("should disable complete action when any other action is being performed", () => {
-      const job = createMockJob({
-        Status: CopyJobStatusType.InProgress,
-        Mode: CopyJobMigrationType.Online,
-      });
-
-      render(<TestComponentWrapper job={job} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const pauseButton = screen.getByText("Pause");
-      fireEvent.click(pauseButton);
-      fireEvent.click(actionButton);
-
-      const completeButtonAfterClick = screen.getByText("Complete").closest("button");
-      expect(completeButtonAfterClick).toBeInTheDocument();
-      expect(completeButtonAfterClick).toHaveAttribute("aria-disabled", "true");
+      expect(screen.getByText("Complete")).toBeInTheDocument();
    });
  });

@@ -628,7 +462,6 @@ describe("CopyJobActionMenu", () => {

      expect(actionButton).toHaveAttribute("aria-label", "Actions");
      expect(actionButton).toHaveAttribute("title", "Actions");
-      expect(actionButton).toHaveAttribute("role", "button");

      const moreIcon = actionButton.querySelector('[data-icon-name="More"]');
      expect(moreIcon || actionButton).toBeInTheDocument();
@@ -775,129 +608,4 @@ describe("CopyJobActionMenu", () => {
      }).not.toThrow();
    });
  });
-
-  describe("Complete Coverage Tests", () => {
-    it("should handle all possible dialog scenarios", () => {
-      const dialogTests = [
-        { action: CopyJobActions.cancel, status: CopyJobStatusType.InProgress, shouldShowDialog: true },
-        {
-          action: CopyJobActions.complete,
-          status: CopyJobStatusType.InProgress,
-          mode: CopyJobMigrationType.Online,
-          shouldShowDialog: true,
-        },
-        { action: CopyJobActions.pause, status: CopyJobStatusType.InProgress, shouldShowDialog: false },
-        { action: CopyJobActions.resume, status: CopyJobStatusType.Paused, shouldShowDialog: false },
-      ];
-
-      dialogTests.forEach(({ action, status, mode = CopyJobMigrationType.Offline, shouldShowDialog }, index) => {
-        jest.clearAllMocks();
-
-        const job = createMockJob({ Status: status, Mode: mode, Name: `DialogTestJob${index}` });
-        const { unmount } = render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-        const actionButton = screen.getByRole("button", { name: "Actions" });
-        fireEvent.click(actionButton);
-
-        const actionText = action.charAt(0).toUpperCase() + action.slice(1);
-        if (screen.queryByText(actionText)) {
-          fireEvent.click(screen.getByText(actionText));
-
-          if (shouldShowDialog) {
-            expect(mockShowOkCancelModalDialog).toHaveBeenCalled();
-          } else {
-            expect(mockShowOkCancelModalDialog).not.toHaveBeenCalled();
-            expect(mockHandleClick).toHaveBeenCalled();
-          }
-        }
-
-        unmount();
-      });
-    });
-
-    it("should verify component handles state updates correctly", () => {
-      const job = createMockJob({ Status: CopyJobStatusType.InProgress });
-      const stateUpdater = jest.fn();
-
-      const testHandleClick: HandleJobActionClickType = (job, action, setUpdatingJobAction) => {
-        setUpdatingJobAction({ jobName: job.Name, action });
-        stateUpdater(job.Name, action);
-      };
-
-      render(<CopyJobActionMenu job={job} handleClick={testHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const pauseButton = screen.getByText("Pause");
-      fireEvent.click(pauseButton);
-
-      expect(stateUpdater).toHaveBeenCalledWith(job.Name, CopyJobActions.pause);
-    });
-  });
-
-  describe("Full Integration Coverage", () => {
-    it("should test complete workflow for cancel action with dialog", () => {
-      const job = createMockJob({ Name: "Integration Test Job", Status: CopyJobStatusType.InProgress });
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      expect(actionButton).toHaveAttribute("data-test", "CopyJobActionMenu/Button:Integration Test Job");
-      fireEvent.click(actionButton);
-
-      const cancelButton = screen.getByText("Cancel");
-      fireEvent.click(cancelButton);
-
-      expect(mockShowOkCancelModalDialog).toHaveBeenCalledWith(
-        "Confirm Action", // title
-        null, // subText
-        "Confirm", // confirmLabel
-        expect.any(Function), // onOk
-        "Cancel", // cancelLabel
-        null, // onCancel
-        expect.any(Object), // contentHtml (dialogBody)
-      );
-
-      const onOkCallback = mockShowOkCancelModalDialog.mock.calls[0][3];
-      onOkCallback();
-
-      expect(mockHandleClick).toHaveBeenCalledWith(job, CopyJobActions.cancel, expect.any(Function));
-    });
-
-    it("should test complete workflow for complete action with dialog", () => {
-      const job = createMockJob({
-        Name: "Online Integration Job",
-        Status: CopyJobStatusType.Running,
-        Mode: CopyJobMigrationType.Online,
-      });
-
-      render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      const actionButton = screen.getByRole("button", { name: "Actions" });
-      fireEvent.click(actionButton);
-
-      const completeButton = screen.getByText("Complete");
-      fireEvent.click(completeButton);
-
-      expect(mockShowOkCancelModalDialog).toHaveBeenCalled();
-
-      const dialogContent = mockShowOkCancelModalDialog.mock.calls[0][6];
-      expect(dialogContent).toBeTruthy();
-
-      const onOkCallback = mockShowOkCancelModalDialog.mock.calls[0][3];
-      onOkCallback();
-
-      expect(mockHandleClick).toHaveBeenCalledWith(job, CopyJobActions.complete, expect.any(Function));
-    });
-
-    it("should maintain proper component lifecycle", () => {
-      const job = createMockJob({ Status: CopyJobStatusType.InProgress });
-      const { rerender, unmount } = render(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-
-      rerender(<CopyJobActionMenu job={job} handleClick={mockHandleClick} />);
-      expect(screen.getByRole("button", { name: "Actions" })).toBeInTheDocument();
-
-      expect(() => unmount()).not.toThrow();
-    });
-  });
 });
--- a/Show More
+++ b/Show More