Enable CI workflow for hotfix and release branch PRs.

This reverts commit abf4b3bd0f.

Co-authored-by: nishthaAhujaa <nishtha17354@iiittd.ac.in>

.github/workflows/ci.yml

@@ -8,6 +8,8 @@ on:
   pull_request:
     branches:
       - master
+      - hotfix/**
+      - release/**
 permissions:
   id-token: write
   contents: read

.vscode/settings.json

@@ -24,14 +24,5 @@
     "source.organizeImports": "explicit"
   },
   "typescript.preferences.importModuleSpecifier": "non-relative",
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
-  }
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }

package-lock.json

@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@azure/arm-cosmosdb": "9.1.0",
-        "@azure/cosmos": "4.5.0",
+        "@azure/cosmos": "4.7.0",
         "@azure/cosmos-language-service": "0.0.5",
         "@azure/identity": "4.5.0",
         "@azure/msal-browser": "2.14.2",
@@ -391,9 +391,9 @@
       "license": "0BSD"
     },
     "node_modules/@azure/cosmos": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.5.0.tgz",
-      "integrity": "sha512-JsTh4twb6FcwP7rJwxQiNZQ/LGtuF6gmciaxY9Rnp6/A325Lhsw/SH4R2ArpT0yCvozbZpweIwdPfUkXVBtp5w==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.7.0.tgz",
+      "integrity": "sha512-a8OV7E41u/ZDaaaDAFdqTTiJ7c82jZc/+ot3XzNCIIilR25NBB+1ixzWQOAgP8SHRUIKfaUl6wAPdTuiG9I66A==",
       "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.1.2",

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.5.0",
+    "@azure/cosmos": "4.7.0",
     "@azure/cosmos-language-service": "0.0.5",
     "@azure/identity": "4.5.0",
     "@azure/msal-browser": "2.14.2",
@@ -248,4 +248,4 @@
     "printWidth": 120,
     "endOfLine": "auto"
   }
-}
+}

src/Common/Constants.ts

@@ -90,6 +90,10 @@ export class CapabilityNames {
   public static readonly EnableServerless: string = "EnableServerless";
   public static readonly EnableNoSQLVectorSearch: string = "EnableNoSQLVectorSearch";
   public static readonly EnableNoSQLFullTextSearch: string = "EnableNoSQLFullTextSearch";
+  public static readonly EnableDataMasking: string = "EnableDataMasking";
+  public static readonly EnableDynamicDataMasking: string = "EnableDynamicDataMasking";
+  public static readonly EnableNoSQLFullTextSearchPreviewFeatures: string = "EnableNoSQLFullTextSearchPreviewFeatures";
+  public static readonly EnableOnlineCopyFeature: string = "EnableOnlineCopyFeature";
 }
 
 export enum CapacityMode {

src/Common/Pager/Pager.css

@@ -0,0 +1,13 @@
+.pager-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 16px;
+  gap: 16px;
+}
+
+.pager-container > div {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}

src/Common/Pager/index.tsx

@@ -0,0 +1,111 @@
+import { IconButton, Text } from "@fluentui/react";
+import * as React from "react";
+import "./Pager.css";
+
+export interface PagerProps {
+  startIndex: number;
+  totalCount: number;
+  pageSize: number;
+  onLoadPage: (startIndex: number, pageSize: number) => void;
+  disabled?: boolean;
+  showFirstLast?: boolean;
+  showItemCount?: boolean;
+  className?: string;
+}
+
+const iconButtonStyles = {
+  root: {
+    backgroundColor: "transparent",
+  },
+  rootHovered: {
+    backgroundColor: "transparent",
+  },
+  rootPressed: {
+    backgroundColor: "transparent",
+  },
+  rootDisabled: {
+    backgroundColor: "transparent",
+  },
+  rootFocused: {
+    backgroundColor: "transparent",
+    outline: "none",
+  },
+};
+
+const Pager: React.FC<PagerProps> = ({
+  startIndex,
+  totalCount,
+  pageSize,
+  onLoadPage,
+  disabled = false,
+  showFirstLast = true,
+  showItemCount = true,
+  className,
+}) => {
+  // Calculate current page and total pages from startIndex
+  const currentPage = Math.floor(startIndex / pageSize) + 1;
+  const totalPages = Math.ceil(totalCount / pageSize);
+  const endIndex = Math.min(startIndex + pageSize, totalCount);
+
+  const handleFirstPage = () => onLoadPage(0, pageSize);
+  const handlePreviousPage = () => onLoadPage(startIndex - pageSize, pageSize);
+  const handleNextPage = () => onLoadPage(startIndex + pageSize, pageSize);
+  const handleLastPage = () => onLoadPage((totalPages - 1) * pageSize, pageSize);
+
+  if (totalCount === 0) {
+    return null;
+  }
+
+  return (
+    <div className={className || "pager-container"}>
+      {showItemCount && (
+        <Text>
+          Showing {startIndex + 1} - {endIndex} of {totalCount} items
+        </Text>
+      )}
+      <div>
+        {showFirstLast && (
+          <IconButton
+            iconProps={{ iconName: "DoubleChevronLeft" }}
+            title="First page"
+            ariaLabel="Go to first page"
+            onClick={handleFirstPage}
+            disabled={disabled || currentPage === 1}
+            styles={iconButtonStyles}
+          />
+        )}
+        <IconButton
+          iconProps={{ iconName: "ChevronLeft" }}
+          title="Previous page"
+          ariaLabel="Go to previous page"
+          onClick={handlePreviousPage}
+          disabled={disabled || currentPage === 1}
+          styles={iconButtonStyles}
+        />
+        <Text>
+          Page {currentPage} of {totalPages}
+        </Text>
+        <IconButton
+          iconProps={{ iconName: "ChevronRight" }}
+          title="Next page"
+          ariaLabel="Go to next page"
+          onClick={handleNextPage}
+          disabled={disabled || currentPage === totalPages}
+          styles={iconButtonStyles}
+        />
+        {showFirstLast && (
+          <IconButton
+            iconProps={{ iconName: "DoubleChevronRight" }}
+            title="Last page"
+            ariaLabel="Go to last page"
+            onClick={handleLastPage}
+            disabled={disabled || currentPage === totalPages}
+            styles={iconButtonStyles}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default Pager;

src/Common/ShimmerTree/ShimmerTree.tsx

@@ -11,19 +11,11 @@ interface ShimmerTreeProps {
 }
 
 const ShimmerTree = ({ indentLevels, style = {} }: ShimmerTreeProps) => {
-  /**
-   * indentLevels - Array of indent levels for shimmer tree
-   * 0 - Root
-   * 1 - Level 1
-   * 2 - Level 2
-   * 3 - Level 3
-   * n - Level n
-   * */
   const renderShimmers = (indent: IndentLevel) => (
     <Shimmer
       key={Math.random()}
       shimmerElements={[
-        { type: ShimmerElementType.gap, width: `${indent.level * 20}px` }, // Indent for hierarchy
+        { type: ShimmerElementType.gap, width: `${indent.level * 20}px` },
         { type: ShimmerElementType.line, height: 16, width: indent.width || "100%" },
       ]}
       style={{ marginBottom: 8 }}

src/Common/dataAccess/updateDocument.ts

@@ -1,5 +1,6 @@
 import { Item, RequestOptions } from "@azure/cosmos";
 import { HttpHeaders } from "Common/Constants";
+import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { CollectionBase } from "../../Contracts/ViewModels";
 import DocumentId from "../../Explorer/Tree/DocumentId";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
@@ -23,10 +24,17 @@ export const updateDocument = async (
             [HttpHeaders.partitionKey]: documentId.partitionKeyValue,
           }
         : {};
+
+    // If user has chosen to ignore partition key on update, pass null instead of actual partition key value
+    const ignorePartitionKeyOnDocumentUpdateFlag = LocalStorageUtility.getEntryBoolean(
+      StorageKey.IgnorePartitionKeyOnDocumentUpdate,
+    );
+    const partitionKey = ignorePartitionKeyOnDocumentUpdateFlag ? undefined : getPartitionKeyValue(documentId);
+
     const response = await client()
       .database(collection.databaseId)
       .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
+      .item(documentId.id(), partitionKey)
       .replace(newDocument, options);
 
     logConsoleInfo(`Successfully updated ${entityName} ${documentId.id()}`);

src/Contracts/DataModels.ts

@@ -210,6 +210,7 @@ export interface Collection extends Resource {
   geospatialConfig?: GeospatialConfig;
   vectorEmbeddingPolicy?: VectorEmbeddingPolicy;
   fullTextPolicy?: FullTextPolicy;
+  dataMaskingPolicy?: DataMaskingPolicy;
   schema?: ISchema;
   requestSchema?: () => void;
   computedProperties?: ComputedProperties;
@@ -274,6 +275,17 @@ export interface ComputedProperty {
 
 export type ComputedProperties = ComputedProperty[];
 
+export interface DataMaskingPolicy {
+  includedPaths: Array<{
+    path: string;
+    strategy: string;
+    startPosition: number;
+    length: number;
+  }>;
+  excludedPaths: string[];
+  isPolicyEnabled: boolean;
+}
+
 export interface MaterializedView {
   id: string;
   _rid: string;

src/Contracts/MessageTypes.ts

@@ -49,4 +49,5 @@ export enum MessageTypes {
   Ready, // unused. Can be removed if the portal uses the same list of enums.
   OpenCESCVAFeedbackBlade,
   ActivateTab,
+  OpenContainerCopyFeedbackBlade,
 }

src/Contracts/ViewModels.ts

@@ -140,6 +140,7 @@ export interface Collection extends CollectionBase {
   requestSchema?: () => void;
   vectorEmbeddingPolicy: ko.Observable<DataModels.VectorEmbeddingPolicy>;
   fullTextPolicy: ko.Observable<DataModels.FullTextPolicy>;
+  dataMaskingPolicy: ko.Observable<DataModels.DataMaskingPolicy>;
   indexingPolicy: ko.Observable<DataModels.IndexingPolicy>;
   uniqueKeyPolicy: DataModels.UniqueKeyPolicy;
   usageSizeInKB: ko.Observable<number>;

src/Explorer/ContainerCopy/Actions/CopyJobActions.tsx

@@ -23,9 +23,10 @@ import {
   getAccountDetailsFromResourceId,
 } from "../CopyJobUtils";
 import CreateCopyJobScreensProvider from "../CreateCopyJob/Screens/CreateCopyJobScreensProvider";
-import { CopyJobActions, CopyJobStatusType } from "../Enums";
+import { CopyJobActions, CopyJobStatusType } from "../Enums/CopyJobEnums";
+import CopyJobDetails from "../MonitorCopyJobs/Components/CopyJobDetails";
 import { MonitorCopyJobsRefState } from "../MonitorCopyJobs/MonitorCopyJobRefState";
-import { CopyJobContextState, CopyJobError, CopyJobErrorType, CopyJobType } from "../Types";
+import { CopyJobContextState, CopyJobError, CopyJobErrorType, CopyJobType } from "../Types/CopyJobTypes";
 
 export const openCreateCopyJobPanel = () => {
   const sidePanelState = useSidePanel.getState();
@@ -37,15 +38,25 @@ export const openCreateCopyJobPanel = () => {
   );
 };
 
+export const openCopyJobDetailsPanel = (job: CopyJobType) => {
+  const sidePanelState = useSidePanel.getState();
+  sidePanelState.setPanelHasConsole(false);
+  sidePanelState.openSidePanel(
+    ContainerCopyMessages.copyJobDetailsPanelTitle(job.Name),
+    <CopyJobDetails job={job} />,
+    "650px",
+  );
+};
+
 let copyJobsAbortController: AbortController | null = null;
 
 export const getCopyJobs = async (): Promise<CopyJobType[]> => {
-  // Abort previous request if still in-flight
-  if (copyJobsAbortController) {
-    copyJobsAbortController.abort();
-  }
-  copyJobsAbortController = new AbortController();
   try {
+    if (copyJobsAbortController) {
+      copyJobsAbortController.abort();
+    }
+    copyJobsAbortController = new AbortController();
+
     const { subscriptionId, resourceGroup, accountName } = getAccountDetailsFromResourceId(
       userContext.databaseAccount?.id || "",
     );
@@ -96,6 +107,8 @@ export const getCopyJobs = async (): Promise<CopyJobType[]> => {
           ID: (index + 1).toString(),
           Mode: job.properties.mode,
           Name: job.properties.jobName,
+          Source: job.properties.source,
+          Destination: job.properties.destination,
           Status: convertToCamelCase(job.properties.status) as CopyJobType["Status"],
           CompletionPercentage: calculateCompletionPercentage(job.properties.processedCount, job.properties.totalCount),
           Duration: convertTime(job.properties.duration),
@@ -106,9 +119,15 @@ export const getCopyJobs = async (): Promise<CopyJobType[]> => {
       });
     return formattedJobs;
   } catch (error) {
-    const errorContent = JSON.stringify(error.content || error);
-    console.error(`Error fetching copy jobs: ${errorContent}`);
-    throw error;
+    const errorContent = JSON.stringify(error.content || error.message || error);
+    if (errorContent.includes("signal is aborted without reason")) {
+      throw {
+        message:
+          "Please wait for the current fetch request to complete. The previous copy job fetch request was aborted.",
+      };
+    } else {
+      throw error;
+    }
   }
 };
 

src/Explorer/ContainerCopy/CommandBar/CopyJobCommandBar.tsx

@@ -3,7 +3,7 @@ import React from "react";
 import { StyleConstants } from "../../../Common/StyleConstants";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import * as CommandBarUtil from "../../Menus/CommandBar/CommandBarUtil";
-import { ContainerCopyProps } from "../Types";
+import { ContainerCopyProps } from "../Types/CopyJobTypes";
 import { getCommandBarButtons } from "./Utils";
 
 const backgroundColor = StyleConstants.BaseLight;

src/Explorer/ContainerCopy/CommandBar/Utils.ts

@@ -7,9 +7,9 @@ import Explorer from "../../Explorer";
 import * as Actions from "../Actions/CopyJobActions";
 import ContainerCopyMessages from "../ContainerCopyMessages";
 import { MonitorCopyJobsRefState } from "../MonitorCopyJobs/MonitorCopyJobRefState";
-import { CopyJobCommandBarBtnType } from "../Types";
+import { CopyJobCommandBarBtnType } from "../Types/CopyJobTypes";
 
-function getCopyJobBtns(): CopyJobCommandBarBtnType[] {
+function getCopyJobBtns(container: Explorer): CopyJobCommandBarBtnType[] {
   const monitorCopyJobsRef = MonitorCopyJobsRefState((state) => state.ref);
   const buttons: CopyJobCommandBarBtnType[] = [
     {
@@ -33,7 +33,9 @@ function getCopyJobBtns(): CopyJobCommandBarBtnType[] {
       iconSrc: FeedbackIcon,
       label: ContainerCopyMessages.feedbackButtonLabel,
       ariaLabel: ContainerCopyMessages.feedbackButtonAriaLabel,
-      onClick: () => {},
+      onClick: () => {
+        container.openContainerCopyFeedbackBlade();
+      },
     });
   }
   return buttons;
@@ -52,7 +54,6 @@ function btnMapper(config: CopyJobCommandBarBtnType): CommandButtonComponentProp
   };
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function getCommandBarButtons(_container: Explorer): CommandButtonComponentProps[] {
-  return getCopyJobBtns().map(btnMapper);
+export function getCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
+  return getCopyJobBtns(container).map(btnMapper);
 }

src/Explorer/ContainerCopy/ContainerCopyMessages.ts

@@ -11,8 +11,13 @@ export default {
   noCopyJobsTitle: "No copy jobs to show",
   createCopyJobButtonText: "Create a container copy job",
 
+  // Copy Job Details
+  copyJobDetailsPanelTitle: (jobName: string) => jobName || "Job Details",
+  errorTitle: "Error Details",
+  selectedContainers: "Selected Containers",
+
   // Create Copy Job Panel
-  createCopyJobPanelTitle: "Copy container",
+  createCopyJobPanelTitle: "Create copy job",
 
   // Select Account Screen
   selectAccountDescription: "Please select a source account from which to copy.",
@@ -44,58 +49,75 @@ export default {
   // Assign Permissions Screen
   assignPermissions: {
     description:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+      "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.",
   },
   toggleBtn: {
     onText: "On",
     offText: "Off",
   },
   addManagedIdentity: {
-    title: "System assigned managed identity enabled",
+    title: "System-assigned managed identity enabled.",
     description:
-      "Enable a system assigned managed identity for the destination account to allow the copy job to access it.",
+      "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.",
+    descriptionHrefText: "Learn more about Managed identities.",
+    descriptionHref: "https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/overview",
     toggleLabel: "System assigned managed identity",
-    managedIdentityTooltip:
-      "A system assigned managed identity is restricted to one per resource and is tied to the lifecycle of this resource. 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.",
+    tooltip: {
+      content: "Learn more about",
+      hrefText: "Managed Identities.",
+      href: "https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/overview",
+    },
     userAssignedIdentityTooltip: "You can select an existing user assigned identity or create a new one.",
     userAssignedIdentityLabel: "You may also select a user assigned managed identity.",
     createUserAssignedIdentityLink: "Create User Assigned Managed Identity",
     enablementTitle: "Enable system assigned managed identity",
-    enablementDescription: (identityName: string) =>
-      identityName
-        ? `'${identityName}' will be registered with Microsoft Entra ID. Once it is registered, '${identityName}' can be granted permissions to access resources protected by Microsoft Entra ID. Do you want to enable the system assigned managed identity for '${identityName}'?`
+    enablementDescription: (accountName: string) =>
+      accountName
+        ? `Enable system-assigned managed identity on the ${accountName}. To confirm, click the "Yes" button. `
         : "",
   },
   defaultManagedIdentity: {
-    title: "System assigned managed identity enabled as default",
-    description:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
-    tooltip:
-      "A system assigned managed identity is restricted to one per resource and is tied to the lifecycle of this resource. 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.",
+    title: "System-assigned managed identity set as default.",
+    description: (accountName: string) =>
+      `Set the system-assigned managed identity as default for "${accountName}" by switching it on.`,
+    tooltip: {
+      content: "Learn more about",
+      hrefText: "Default Managed Identities.",
+      href: "https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/overview",
+    },
     popoverTitle: "System assigned managed identity set as default",
-    popoverDescription:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco.",
+    popoverDescription: (accountName: string) =>
+      `Assign the system-assigned managed identity as the default for "${accountName}". To confirm, click the "Yes" button. `,
   },
   readPermissionAssigned: {
-    title: "Read permission assigned to default identity",
+    title: "Read permissions assigned to the default identity.",
     description:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
-    tooltip:
-      "A system assigned managed identity is restricted to one per resource and is tied to the lifecycle of this resource. 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.",
-    popoverTitle: "Read permission assigned to default identity",
+      "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 permissions.",
+      href: "https://learn.microsoft.com/azure/cosmos-db/nosql/how-to-connect-role-based-access-control",
+    },
+    popoverTitle: "Read permissions assigned to default identity.",
     popoverDescription:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco.",
+      "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",
-    description:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+    description: (accessName: string) =>
+      `To facilitate online container copy jobs, please update your "${accessName}" backup policy from periodic to continuous backup. Enabling continuous backup is required for this functionality.`,
+    tooltip: {
+      content: "Learn more about",
+      hrefText: "Continuous Backup",
+      href: "https://learn.microsoft.com/en-us/azure/cosmos-db/continuous-backup-restore-introduction",
+    },
     buttonText: "Enable Point In Time Restore",
   },
   onlineCopyEnabled: {
     title: "Online copy enabled",
-    description:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+    description: (accountName: string) => `Use Azure CLI to enable Online copy on "${accountName}".`,
+    hrefText: "Learn more about online copy jobs",
+    href: "https://learn.microsoft.com/en-us/azure/cosmos-db/container-copy?tabs=online-copy&pivots=api-nosql#enable-online-copy",
     buttonText: "Enable Online Copy",
   },
   MonitorJobs: {

src/Explorer/ContainerCopy/ContainerCopyPanel.tsx

@@ -1,9 +1,9 @@
-import { MonitorCopyJobsRefState } from "Explorer/ContainerCopy/MonitorCopyJobs/MonitorCopyJobRefState";
 import React, { useEffect } from "react";
 import CopyJobCommandBar from "./CommandBar/CopyJobCommandBar";
 import "./containerCopyStyles.less";
+import { MonitorCopyJobsRefState } from "./MonitorCopyJobs/MonitorCopyJobRefState";
 import MonitorCopyJobs, { MonitorCopyJobsRef } from "./MonitorCopyJobs/MonitorCopyJobs";
-import { ContainerCopyProps } from "./Types";
+import { ContainerCopyProps } from "./Types/CopyJobTypes";
 
 const ContainerCopyPanel: React.FC<ContainerCopyProps> = ({ container }) => {
   const monitorCopyJobsRef = React.useRef<MonitorCopyJobsRef>();

src/Explorer/ContainerCopy/Context/CopyJobContext.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { userContext } from "UserContext";
-import { CopyJobMigrationType } from "../Enums";
-import { CopyJobContextProviderType, CopyJobContextState, CopyJobFlowType } from "../Types";
+import { CopyJobMigrationType } from "../Enums/CopyJobEnums";
+import { CopyJobContextProviderType, CopyJobContextState, CopyJobFlowType } from "../Types/CopyJobTypes";
 
 export const CopyJobContext = React.createContext<CopyJobContextProviderType>(null);
 export const useCopyJobContext = (): CopyJobContextProviderType => {

src/Explorer/ContainerCopy/CopyJobUtils.ts

@@ -1,5 +1,5 @@
 import { DatabaseAccount } from "Contracts/DataModels";
-import { CopyJobErrorType } from "./Types";
+import { CopyJobErrorType } from "./Types/CopyJobTypes";
 
 const azurePortalMpacEndpoint = "https://ms.portal.azure.com/";
 
@@ -49,7 +49,7 @@ export function convertTime(timeStr: string): string | null {
   const timeParts = timeStr.split(":").map(Number);
 
   if (timeParts.length !== 3 || timeParts.some(isNaN)) {
-    return null; // Return null for invalid format
+    return null;
   }
   const formatPart = (value: number, unit: string) => {
     if (unit === "seconds") {
@@ -67,7 +67,7 @@ export function convertTime(timeStr: string): string | null {
     .filter(Boolean)
     .join(", ");
 
-  return formattedTimeParts || "0 seconds"; // Return "0 seconds" if all parts are zero
+  return formattedTimeParts || "0 seconds";
 }
 
 export function formatUTCDateTime(utcStr: string): { formattedDateTime: string; timestamp: number } | null {

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddManagedIdentity.tsx

@@ -1,20 +1,22 @@
 import { Link, Stack, Text, Toggle } from "@fluentui/react";
-import React, { useMemo } from "react";
+import React from "react";
 import { updateSystemIdentity } from "../../../../../Utils/arm/identityUtils";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
-import { buildResourceLink } from "../../../CopyJobUtils";
 import InfoTooltip from "../Components/InfoTooltip";
 import PopoverMessage from "../Components/PopoverContainer";
 import useManagedIdentity from "./hooks/useManagedIdentity";
 import { PermissionSectionConfig } from "./hooks/usePermissionsSection";
 import useToggle from "./hooks/useToggle";
 
-const managedIdentityTooltip = ContainerCopyMessages.addManagedIdentity.managedIdentityTooltip;
-const userAssignedTooltip = ContainerCopyMessages.addManagedIdentity.userAssignedIdentityTooltip;
-
-const textStyle = { display: "flex", alignItems: "center" };
-
+const managedIdentityTooltip = (
+  <Text>
+    {ContainerCopyMessages.addManagedIdentity.tooltip.content} &nbsp;
+    <Link href={ContainerCopyMessages.addManagedIdentity.tooltip.href} target="_blank" rel="noopener noreferrer">
+      {ContainerCopyMessages.addManagedIdentity.tooltip.hrefText}
+    </Link>
+  </Text>
+);
 type AddManagedIdentityProps = Partial<PermissionSectionConfig>;
 
 const AddManagedIdentity: React.FC<AddManagedIdentityProps> = () => {
@@ -22,35 +24,22 @@ const AddManagedIdentity: React.FC<AddManagedIdentityProps> = () => {
   const [systemAssigned, onToggle] = useToggle(false);
   const { loading, handleAddSystemIdentity } = useManagedIdentity(updateSystemIdentity);
 
-  const manageIdentityLink = useMemo(() => {
-    const { target } = copyJobState;
-    const resourceUri = buildResourceLink(target.account);
-    return target?.account?.id ? `${resourceUri}/ManagedIdentitiesBlade` : "#";
-  }, [copyJobState]);
-
   return (
     <Stack className="addManagedIdentityContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
+      <Text>
+        {ContainerCopyMessages.addManagedIdentity.description}&ensp;
+        <Link href={ContainerCopyMessages.addManagedIdentity.descriptionHref} target="_blank" rel="noopener noreferrer">
+          {ContainerCopyMessages.addManagedIdentity.descriptionHrefText}
+        </Link>{" "}
+        &nbsp;
+        <InfoTooltip content={managedIdentityTooltip} />
+      </Text>
       <Toggle
-        label={
-          <Text className="toggle-label" style={textStyle}>
-            {ContainerCopyMessages.addManagedIdentity.toggleLabel}&nbsp;
-            <InfoTooltip content={managedIdentityTooltip} />
-          </Text>
-        }
         checked={systemAssigned}
         onText={ContainerCopyMessages.toggleBtn.onText}
         offText={ContainerCopyMessages.toggleBtn.offText}
         onChange={onToggle}
       />
-      <Text className="user-assigned-label" style={textStyle}>
-        {ContainerCopyMessages.addManagedIdentity.userAssignedIdentityLabel}&nbsp;
-        <InfoTooltip content={userAssignedTooltip} />
-      </Text>
-      <div style={{ marginTop: 8 }}>
-        <Link href={manageIdentityLink} target="_blank" rel="noopener noreferrer">
-          {ContainerCopyMessages.addManagedIdentity.createUserAssignedIdentityLink}
-        </Link>
-      </div>
       <PopoverMessage
         isLoading={loading}
         visible={systemAssigned}

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AddReadPermissionToDefaultIdentity.tsx

@@ -1,4 +1,4 @@
-import { Stack, Toggle } from "@fluentui/react";
+import { Link, Stack, Text, Toggle } from "@fluentui/react";
 import React, { useCallback } from "react";
 import { assignRole } from "../../../../../Utils/arm/RbacUtils";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
@@ -9,10 +9,17 @@ import PopoverMessage from "../Components/PopoverContainer";
 import { PermissionSectionConfig } from "./hooks/usePermissionsSection";
 import useToggle from "./hooks/useToggle";
 
-const TooltipContent = ContainerCopyMessages.readPermissionAssigned.tooltip;
-type AddManagedIdentityProps = Partial<PermissionSectionConfig>;
+const TooltipContent = (
+  <Text>
+    {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>;
 
-const AddReadPermissionToDefaultIdentity: React.FC<AddManagedIdentityProps> = () => {
+const AddReadPermissionToDefaultIdentity: React.FC<AddReadPermissionToDefaultIdentityProps> = () => {
   const [loading, setLoading] = React.useState(false);
   const { copyJobState, setCopyJobState } = useCopyJobContext();
   const [readPermissionAssigned, onToggle] = useToggle(false);
@@ -49,10 +56,10 @@ const AddReadPermissionToDefaultIdentity: React.FC<AddManagedIdentityProps> = ()
 
   return (
     <Stack className="defaultManagedIdentityContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
-      <div className="toggle-label">
-        {ContainerCopyMessages.readPermissionAssigned.description} &nbsp;
+      <Text className="toggle-label">
+        {ContainerCopyMessages.readPermissionAssigned.description}&ensp;
         <InfoTooltip content={TooltipContent} />
-      </div>
+      </Text>
       <Toggle
         checked={readPermissionAssigned}
         onText={ContainerCopyMessages.toggleBtn.onText}

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/AssignPermissions.tsx

@@ -3,10 +3,10 @@ import { Accordion, AccordionHeader, AccordionItem, AccordionPanel } from "@flue
 import React, { useEffect } from "react";
 import CheckmarkIcon from "../../../../../../images/successfulPopup.svg";
 import WarningIcon from "../../../../../../images/warning.svg";
-import ShimmerTree, { IndentLevel } from "../../../../../Common/ShimmerTree";
+import ShimmerTree, { IndentLevel } from "../../../../../Common/ShimmerTree/ShimmerTree";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
-import { CopyJobMigrationType } from "../../../Enums";
+import { CopyJobMigrationType } from "../../../Enums/CopyJobEnums";
 import usePermissionSections, { PermissionSectionConfig } from "./hooks/usePermissionsSection";
 
 const PermissionSection: React.FC<PermissionSectionConfig> = ({ id, title, Component, completed, disabled }) => (

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/DefaultManagedIdentity.tsx

@@ -1,24 +1,33 @@
-import { Stack, Toggle } from "@fluentui/react";
+import { Link, Stack, Text, Toggle } from "@fluentui/react";
 import React from "react";
 import { updateDefaultIdentity } from "../../../../../Utils/arm/identityUtils";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
+import { useCopyJobContext } from "../../../Context/CopyJobContext";
 import InfoTooltip from "../Components/InfoTooltip";
 import PopoverMessage from "../Components/PopoverContainer";
 import useManagedIdentity from "./hooks/useManagedIdentity";
 import { PermissionSectionConfig } from "./hooks/usePermissionsSection";
 import useToggle from "./hooks/useToggle";
 
-const managedIdentityTooltip = ContainerCopyMessages.defaultManagedIdentity.tooltip;
+const managedIdentityTooltip = (
+  <Text>
+    {ContainerCopyMessages.defaultManagedIdentity.tooltip.content} &nbsp;
+    <Link href={ContainerCopyMessages.defaultManagedIdentity.tooltip.href} target="_blank" rel="noopener noreferrer">
+      {ContainerCopyMessages.defaultManagedIdentity.tooltip.hrefText}
+    </Link>
+  </Text>
+);
 type AddManagedIdentityProps = Partial<PermissionSectionConfig>;
 
 const DefaultManagedIdentity: React.FC<AddManagedIdentityProps> = () => {
+  const { copyJobState } = useCopyJobContext();
   const [defaultSystemAssigned, onToggle] = useToggle(false);
   const { loading, handleAddSystemIdentity } = useManagedIdentity(updateDefaultIdentity);
 
   return (
     <Stack className="defaultManagedIdentityContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
       <div className="toggle-label">
-        {ContainerCopyMessages.defaultManagedIdentity.description} &nbsp;
+        {ContainerCopyMessages.defaultManagedIdentity.description(copyJobState?.target?.account.name)} &nbsp;
         <InfoTooltip content={managedIdentityTooltip} />
       </div>
       <Toggle
@@ -39,7 +48,7 @@ const DefaultManagedIdentity: React.FC<AddManagedIdentityProps> = () => {
         onCancel={() => onToggle(null, false)}
         onPrimary={handleAddSystemIdentity}
       >
-        {ContainerCopyMessages.defaultManagedIdentity.popoverDescription}
+        {ContainerCopyMessages.defaultManagedIdentity.popoverDescription(copyJobState?.target?.account.name)}
       </PopoverMessage>
     </Stack>
   );

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/OnlineCopyEnabled.tsx

@@ -1,26 +1,129 @@
-import { PrimaryButton, Stack } from "@fluentui/react";
+import { Link, PrimaryButton, Stack } from "@fluentui/react";
+import { DatabaseAccount } from "Contracts/DataModels";
 import React from "react";
+import { fetchDatabaseAccount } from "Utils/arm/databaseAccountUtils";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
-import { buildResourceLink } from "../../../CopyJobUtils";
-import { PermissionSectionConfig } from "./hooks/usePermissionsSection";
-import useWindowOpenMonitor from "./hooks/useWindowOpenMonitor";
+import { getAccountDetailsFromResourceId } from "../../../CopyJobUtils";
+import { AccountValidatorFn } from "../../../Types/CopyJobTypes";
 
-type AddManagedIdentityProps = Partial<PermissionSectionConfig>;
-const OnlineCopyEnabled: React.FC<AddManagedIdentityProps> = () => {
-  const { copyJobState: { source } = {} } = useCopyJobContext();
-  const sourceAccountLink = buildResourceLink(source?.account);
-  const onlineCopyUrl = `${sourceAccountLink}/Features`;
-  const onWindowClosed = () => {
-    // eslint-disable-next-line no-console
-    console.log("Online copy window closed");
+const validatorFn: AccountValidatorFn = (prev: DatabaseAccount, next: DatabaseAccount) => {
+  const prevCapabilities = prev?.properties?.capabilities ?? [];
+  const nextCapabilities = next?.properties?.capabilities ?? [];
+
+  return JSON.stringify(prevCapabilities) !== JSON.stringify(nextCapabilities);
+};
+
+const OnlineCopyEnabled: React.FC = () => {
+  const [loading, setLoading] = React.useState(false);
+  const [showRefreshButton, setShowRefreshButton] = React.useState(false);
+  const intervalRef = React.useRef<NodeJS.Timeout | null>(null);
+  const timeoutRef = React.useRef<NodeJS.Timeout | null>(null);
+  const { copyJobState: { source } = {}, setCopyJobState } = useCopyJobContext();
+  const selectedSourceAccount = source?.account;
+  const {
+    subscriptionId: sourceSubscriptionId,
+    resourceGroup: sourceResourceGroup,
+    accountName: sourceAccountName,
+  } = getAccountDetailsFromResourceId(selectedSourceAccount?.id);
+
+  const handleFetchAccount = async () => {
+    try {
+      const account = await fetchDatabaseAccount(sourceSubscriptionId, sourceResourceGroup, sourceAccountName);
+      if (account && validatorFn(selectedSourceAccount, account)) {
+        setCopyJobState((prevState) => ({
+          ...prevState,
+          source: { ...prevState.source, account: account },
+        }));
+        setLoading(false);
+      }
+    } catch (error) {
+      console.error("Error fetching source account after enabling online copy:", error);
+      setLoading(false);
+    }
   };
-  const openWindowAndMonitor = useWindowOpenMonitor(onlineCopyUrl, onWindowClosed);
+
+  const clearIntervalAndShowRefresh = () => {
+    if (intervalRef.current) {
+      clearInterval(intervalRef.current);
+      intervalRef.current = null;
+    }
+    setShowRefreshButton(true);
+  };
+
+  const handleRefresh = () => {
+    setLoading(true);
+    handleFetchAccount();
+  };
+
+  React.useEffect(() => {
+    intervalRef.current = setInterval(() => {
+      handleFetchAccount();
+    }, 30 * 1000);
+
+    timeoutRef.current = setTimeout(
+      () => {
+        clearIntervalAndShowRefresh();
+      },
+      15 * 60 * 1000,
+    );
+
+    return () => {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+        intervalRef.current = null;
+      }
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = null;
+      }
+    };
+  }, []);
 
   return (
     <Stack className="onlineCopyContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
-      <div className="toggle-label">{ContainerCopyMessages.onlineCopyEnabled.description}</div>
-      <PrimaryButton text={ContainerCopyMessages.onlineCopyEnabled.buttonText} onClick={openWindowAndMonitor} />
+      <Stack.Item className="info-message">
+        {ContainerCopyMessages.onlineCopyEnabled.description(source?.account?.name || "")}&ensp;
+        <Link href={ContainerCopyMessages.onlineCopyEnabled.href} target="_blank" rel="noopener noreferrer">
+          {ContainerCopyMessages.onlineCopyEnabled.hrefText}
+        </Link>
+      </Stack.Item>
+      <Stack.Item>
+        <pre style={{ backgroundColor: "#f5f5f5", padding: "10px", borderRadius: "4px", overflow: "auto" }}>
+          <code>
+            {`# Set shell variables
+$resourceGroupName = <azure_resource_group>
+$accountName = <azure_cosmos_db_account_name>
+$EnableOnlineContainerCopy = "EnableOnlineContainerCopy"
+
+# List down existing capabilities of your account
+$cosmosdb = az cosmosdb show --resource-group $resourceGroupName --name $accountName
+
+$capabilities = (($cosmosdb | ConvertFrom-Json).capabilities)
+
+# Append EnableOnlineContainerCopy capability in the list of capabilities
+$capabilitiesToAdd = @()
+foreach ($item in $capabilities) {
+  $capabilitiesToAdd += $item.name
+}
+$capabilitiesToAdd += $EnableOnlineContainerCopy
+
+# Update Cosmos DB account
+az cosmosdb update --capabilities $capabilitiesToAdd -n $accountName -g $resourceGroupName`}
+          </code>
+        </pre>
+      </Stack.Item>
+      {showRefreshButton && (
+        <Stack.Item>
+          <PrimaryButton
+            className="fullWidth"
+            text={ContainerCopyMessages.refreshButtonLabel}
+            iconProps={{ iconName: "Refresh" }}
+            onClick={handleRefresh}
+            disabled={loading}
+          />
+        </Stack.Item>
+      )}
     </Stack>
   );
 };

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/PointInTimeRestore.tsx

@@ -1,53 +1,133 @@
-import { PrimaryButton, Stack } from "@fluentui/react";
-import React, { useCallback, useState } from "react";
+import { Link, PrimaryButton, Stack, Text } from "@fluentui/react";
+import { DatabaseAccount } from "Contracts/DataModels";
+import React, { useEffect, useRef, useState } from "react";
 import { fetchDatabaseAccount } from "Utils/arm/databaseAccountUtils";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
 import { buildResourceLink, getAccountDetailsFromResourceId } from "../../../CopyJobUtils";
-import { PermissionSectionConfig } from "./hooks/usePermissionsSection";
-import useWindowOpenMonitor from "./hooks/useWindowOpenMonitor";
+import { AccountValidatorFn } from "../../../Types/CopyJobTypes";
+import InfoTooltip from "../Components/InfoTooltip";
 
-type AddManagedIdentityProps = Partial<PermissionSectionConfig>;
-const PointInTimeRestore: React.FC<AddManagedIdentityProps> = () => {
-  const [loading, setLoading] = useState<boolean>(false);
+const tooltipContent = (
+  <Text>
+    {ContainerCopyMessages.pointInTimeRestore.tooltip.content} &nbsp;
+    <Link href={ContainerCopyMessages.pointInTimeRestore.tooltip.href} target="_blank" rel="noopener noreferrer">
+      {ContainerCopyMessages.pointInTimeRestore.tooltip.hrefText}
+    </Link>
+  </Text>
+);
+
+const validatorFn: AccountValidatorFn = (prev: DatabaseAccount, next: DatabaseAccount) => {
+  const prevBackupPolicy = prev?.properties?.backupPolicy?.type ?? "";
+  const nextBackupPolicy = next?.properties?.backupPolicy?.type ?? "";
+
+  return prevBackupPolicy !== nextBackupPolicy;
+};
+
+const PointInTimeRestore: React.FC = () => {
+  const [loading, setLoading] = useState(false);
+  const [showRefreshButton, setShowRefreshButton] = useState(false);
+  const intervalRef = useRef<NodeJS.Timeout | null>(null);
+  const timeoutRef = useRef<NodeJS.Timeout | null>(null);
   const { copyJobState: { source } = {}, setCopyJobState } = useCopyJobContext();
   const sourceAccountLink = buildResourceLink(source?.account);
-  const pitrUrl = `${sourceAccountLink}/backupRestore`;
+  const featureUrl = `${sourceAccountLink}/backupRestore`;
+  const selectedSourceAccount = source?.account;
+  const {
+    subscriptionId: sourceSubscriptionId,
+    resourceGroup: sourceResourceGroup,
+    accountName: sourceAccountName,
+  } = getAccountDetailsFromResourceId(selectedSourceAccount?.id);
 
-  const onWindowClosed = useCallback(async () => {
+  useEffect(() => {
+    return () => {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+        intervalRef.current = null;
+      }
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = null;
+      }
+    };
+  }, []);
+
+  const handleFetchAccount = async () => {
     try {
-      const selectedSourceAccount = source?.account;
-      const {
-        subscriptionId: sourceSubscriptionId,
-        resourceGroup: sourceResourceGroup,
-        accountName: sourceAccountName,
-      } = getAccountDetailsFromResourceId(selectedSourceAccount?.id);
-
-      setLoading(true);
       const account = await fetchDatabaseAccount(sourceSubscriptionId, sourceResourceGroup, sourceAccountName);
-      if (account) {
+      if (account && validatorFn(selectedSourceAccount, account)) {
         setCopyJobState((prevState) => ({
           ...prevState,
           source: { ...prevState.source, account: account },
         }));
+        setLoading(false);
       }
     } catch (error) {
-      console.error("Error fetching database account after PITR window closed:", error);
-    } finally {
+      console.error("Error fetching source account after Point-in-Time Restore:", error);
       setLoading(false);
     }
-  }, []);
-  const openWindowAndMonitor = useWindowOpenMonitor(pitrUrl, onWindowClosed);
+  };
+
+  const clearIntervalAndShowRefresh = () => {
+    if (intervalRef.current) {
+      clearInterval(intervalRef.current);
+      intervalRef.current = null;
+    }
+    setLoading(false);
+    setShowRefreshButton(true);
+  };
+
+  const handleRefresh = () => {
+    setLoading(true);
+    handleFetchAccount();
+  };
+
+  const openWindowAndMonitor = () => {
+    setLoading(true);
+    setShowRefreshButton(false);
+    window.open(featureUrl, "_blank");
+
+    intervalRef.current = setInterval(() => {
+      handleFetchAccount();
+    }, 30 * 1000);
+
+    timeoutRef.current = setTimeout(
+      () => {
+        clearIntervalAndShowRefresh();
+      },
+      15 * 60 * 1000,
+    );
+  };
 
   return (
     <Stack className="pointInTimeRestoreContainer" tokens={{ childrenGap: 15, padding: "0 0 0 20px" }}>
-      <div className="toggle-label">{ContainerCopyMessages.pointInTimeRestore.description}</div>
-      <PrimaryButton
-        text={loading ? "" : ContainerCopyMessages.pointInTimeRestore.buttonText}
-        {...(loading ? { iconProps: { iconName: "SyncStatusSolid" } } : {})}
-        disabled={loading}
-        onClick={openWindowAndMonitor}
-      />
+      <Stack.Item className="toggle-label">
+        {ContainerCopyMessages.pointInTimeRestore.description(source.account?.name ?? "")}
+        {tooltipContent && (
+          <>
+            {" "}
+            <InfoTooltip content={tooltipContent} />
+          </>
+        )}
+      </Stack.Item>
+      <Stack.Item>
+        {showRefreshButton ? (
+          <PrimaryButton
+            className="fullWidth"
+            text={ContainerCopyMessages.refreshButtonLabel}
+            iconProps={{ iconName: "Refresh" }}
+            onClick={handleRefresh}
+          />
+        ) : (
+          <PrimaryButton
+            className="fullWidth"
+            text={loading ? "" : ContainerCopyMessages.pointInTimeRestore.buttonText}
+            {...(loading ? { iconProps: { iconName: "SyncStatusSolid" } } : {})}
+            disabled={loading}
+            onClick={openWindowAndMonitor}
+          />
+        )}
+      </Stack.Item>
     </Stack>
   );
 };

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/usePermissionsSection.tsx

@@ -1,9 +1,15 @@
 import { useEffect, useMemo, useRef, useState } from "react";
+import { CapabilityNames } from "../../../../../../Common/Constants";
 import { fetchRoleAssignments, fetchRoleDefinitions, RoleDefinitionType } from "../../../../../../Utils/arm/RbacUtils";
 import ContainerCopyMessages from "../../../../ContainerCopyMessages";
 import { getAccountDetailsFromResourceId } from "../../../../CopyJobUtils";
-import { BackupPolicyType, CopyJobMigrationType, DefaultIdentityType, IdentityType } from "../../../../Enums";
-import { CopyJobContextState } from "../../../../Types";
+import {
+  BackupPolicyType,
+  CopyJobMigrationType,
+  DefaultIdentityType,
+  IdentityType,
+} from "../../../../Enums/CopyJobEnums";
+import { CopyJobContextState } from "../../../../Types/CopyJobTypes";
 import { useCopyJobPrerequisitesCache } from "../../../Utils/useCopyJobPrerequisitesCache";
 import AddManagedIdentity from "../AddManagedIdentity";
 import AddReadPermissionToDefaultIdentity from "../AddReadPermissionToDefaultIdentity";
@@ -20,7 +26,6 @@ export interface PermissionSectionConfig {
   validate?: (state: CopyJobContextState) => boolean | Promise<boolean>;
 }
 
-// Section IDs for maintainability
 export const SECTION_IDS = {
   addManagedIdentity: "addManagedIdentity",
   defaultManagedIdentity: "defaultManagedIdentity",
@@ -96,9 +101,12 @@ const PERMISSION_SECTIONS_FOR_ONLINE_JOBS: PermissionSectionConfig[] = [
     title: ContainerCopyMessages.onlineCopyEnabled.title,
     Component: OnlineCopyEnabled,
     disabled: true,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    validate: (_state: CopyJobContextState) => {
-      return false;
+    validate: (state: CopyJobContextState) => {
+      const accountCapabilities = state?.source?.account?.properties?.capabilities ?? [];
+      const onlineCopyCapability = accountCapabilities.find(
+        (capability) => capability.name === CapabilityNames.EnableOnlineCopyFeature,
+      );
+      return !!onlineCopyCapability;
     },
   },
 ];
@@ -123,17 +131,20 @@ export function checkTargetHasReaderRoleOnSource(roleDefinitions: RoleDefinition
  * Memoizes derived values for performance and decouples logic for testability.
  */
 const usePermissionSections = (state: CopyJobContextState): PermissionSectionConfig[] => {
+  const sourceAccountId = state?.source?.account?.id || "";
+  const targetAccountId = state?.target?.account?.id || "";
+
   const { validationCache, setValidationCache } = useCopyJobPrerequisitesCache();
   const [permissionSections, setPermissionSections] = useState<PermissionSectionConfig[] | null>(null);
   const isValidatingRef = useRef(false);
 
   const sectionToValidate = useMemo(() => {
-    const baseSections = [...PERMISSION_SECTIONS_CONFIG];
+    const baseSections = sourceAccountId === targetAccountId ? [] : [...PERMISSION_SECTIONS_CONFIG];
     if (state.migrationType === CopyJobMigrationType.Online) {
       return [...baseSections, ...PERMISSION_SECTIONS_FOR_ONLINE_JOBS];
     }
     return baseSections;
-  }, [state.migrationType]);
+  }, [sourceAccountId, targetAccountId, state.migrationType]);
 
   const memoizedValidationCache = useMemo(() => {
     if (state.migrationType === CopyJobMigrationType.Offline) {
@@ -156,17 +167,15 @@ const usePermissionSections = (state: CopyJobContextState): PermissionSectionCon
       for (let i = 0; i < sectionToValidate.length; i++) {
         const section = sectionToValidate[i];
 
-        // Check if this section was already validated and passed
         if (newValidationCache.has(section.id) && newValidationCache.get(section.id) === true) {
           result.push({ ...section, completed: true });
           continue;
         }
-        // We've reached the first non-cached section - validate it
         if (section.validate) {
           const isValid = await section.validate(state);
           newValidationCache.set(section.id, isValid);
           result.push({ ...section, completed: isValid });
-          // Stop validation if current section failed
+
           if (!isValid) {
             for (let j = i + 1; j < sectionToValidate.length; j++) {
               result.push({ ...sectionToValidate[j], completed: false });
@@ -174,7 +183,6 @@ const usePermissionSections = (state: CopyJobContextState): PermissionSectionCon
             break;
           }
         } else {
-          // Section has no validate method
           newValidationCache.set(section.id, false);
           result.push({ ...section, completed: false });
         }

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/useToggle.tsx

@@ -3,7 +3,7 @@ import { useCallback, useState } from "react";
 const useToggle = (initialState = false) => {
   const [state, setState] = useState<boolean>(initialState);
   const onToggle = useCallback((_, checked?: boolean) => {
-    setState(!!checked);
+    setState(checked);
   }, []);
   return [state, onToggle] as const;
 };

src/Explorer/ContainerCopy/CreateCopyJob/Screens/AssignPermissions/hooks/useWindowOpenMonitor.tsx

@@ -1,31 +0,0 @@
-import { useEffect, useRef } from "react";
-
-const useWindowOpenMonitor = (url: string, onClose?: () => void, intervalMs = 500) => {
-  const intervalRef = useRef<NodeJS.Timeout | null>(null);
-
-  const openWindowAndMonitor = () => {
-    const newWindow = window.open(url, "_blank");
-    intervalRef.current = setInterval(() => {
-      if (newWindow?.closed) {
-        clearInterval(intervalRef.current!);
-        intervalRef.current = null;
-        if (onClose) {
-          onClose();
-        }
-      }
-    }, intervalMs);
-  };
-
-  useEffect(() => {
-    return () => {
-      if (intervalRef.current) {
-        clearInterval(intervalRef.current);
-        intervalRef.current = null;
-      }
-    };
-  }, []);
-
-  return openWindowAndMonitor;
-};
-
-export default useWindowOpenMonitor;

src/Explorer/ContainerCopy/CreateCopyJob/Screens/Components/InfoTooltip.tsx

@@ -2,7 +2,7 @@ import { Image, ITooltipHostStyles, TooltipHost } from "@fluentui/react";
 import React from "react";
 import InfoIcon from "../../../../../../images/Info.svg";
 
-const InfoTooltip: React.FC<{ content?: string }> = ({ content }) => {
+const InfoTooltip: React.FC<{ content?: string | JSX.Element }> = ({ content }) => {
   if (!content) {
     return null;
   }

src/Explorer/ContainerCopy/CreateCopyJob/Screens/CreateCopyJobScreens.tsx

@@ -1,4 +1,4 @@
-import { Stack } from "@fluentui/react";
+import { MessageBar, MessageBarType, Stack } from "@fluentui/react";
 import React from "react";
 import { useCopyJobNavigation } from "../Utils/useCopyJobNavigation";
 import NavigationControls from "./Components/NavigationControls";
@@ -12,11 +12,28 @@ const CreateCopyJobScreens: React.FC = () => {
     handlePrevious,
     handleCancel,
     primaryBtnText,
+    error,
+    setError,
   } = useCopyJobNavigation();
 
   return (
     <Stack verticalAlign="space-between" className="createCopyJobScreensContainer">
-      <Stack.Item className="createCopyJobScreensContent">{currentScreen?.component}</Stack.Item>
+      <Stack.Item className="createCopyJobScreensContent">
+        {error && (
+          <MessageBar
+            className="createCopyJobErrorMessageBar"
+            messageBarType={MessageBarType.blocked}
+            isMultiline={false}
+            onDismiss={() => setError(null)}
+            dismissButtonAriaLabel="Close"
+            truncated={true}
+            overflowButtonAriaLabel="See more"
+          >
+            {error}
+          </MessageBar>
+        )}
+        {currentScreen?.component}
+      </Stack.Item>
       <Stack.Item className="createCopyJobScreensFooter">
         <NavigationControls
           primaryBtnText={primaryBtnText}

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx

@@ -3,7 +3,7 @@
 import { Dropdown } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../../../ContainerCopyMessages";
-import { DropdownOptionType } from "../../../../Types";
+import { DropdownOptionType } from "../../../../Types/CopyJobTypes";
 import FieldRow from "../../Components/FieldRow";
 
 interface AccountDropdownProps {

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx

@@ -3,7 +3,7 @@
 import { Dropdown } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../../../ContainerCopyMessages";
-import { DropdownOptionType } from "../../../../Types";
+import { DropdownOptionType } from "../../../../Types/CopyJobTypes";
 import FieldRow from "../../Components/FieldRow";
 
 interface SubscriptionDropdownProps {

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/SelectAccount.tsx

@@ -1,12 +1,13 @@
 /* eslint-disable react/display-name */
 import { Stack } from "@fluentui/react";
 import React from "react";
+import { apiType } from "UserContext";
 import { DatabaseAccount, Subscription } from "../../../../../Contracts/DataModels";
 import { useDatabaseAccounts } from "../../../../../hooks/useDatabaseAccounts";
 import { useSubscriptions } from "../../../../../hooks/useSubscriptions";
 import ContainerCopyMessages from "../../../ContainerCopyMessages";
 import { useCopyJobContext } from "../../../Context/CopyJobContext";
-import { CopyJobMigrationType } from "../../../Enums";
+import { CopyJobMigrationType } from "../../../Enums/CopyJobEnums";
 import { AccountDropdown } from "./Components/AccountDropdown";
 import { MigrationTypeCheckbox } from "./Components/MigrationTypeCheckbox";
 import { SubscriptionDropdown } from "./Components/SubscriptionDropdown";
@@ -18,9 +19,7 @@ const SelectAccount = React.memo(() => {
 
   const subscriptions: Subscription[] = useSubscriptions();
   const allAccounts: DatabaseAccount[] = useDatabaseAccounts(selectedSubscriptionId);
-  const sqlApiOnlyAccounts: DatabaseAccount[] = allAccounts?.filter(
-    (account) => account.type === "SQL" || account.kind === "GlobalDocumentDB",
-  );
+  const sqlApiOnlyAccounts: DatabaseAccount[] = allAccounts?.filter((account) => apiType(account) === "SQL");
 
   const { subscriptionOptions, accountOptions } = useDropdownOptions(subscriptions, sqlApiOnlyAccounts);
   const { handleSelectSourceAccount, handleMigrationTypeChange } = useEventHandlers(setCopyJobState);

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Utils/selectAccountUtils.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { DatabaseAccount, Subscription } from "../../../../../../Contracts/DataModels";
-import { CopyJobMigrationType } from "../../../../Enums";
-import { CopyJobContextProviderType, CopyJobContextState, DropdownOptionType } from "../../../../Types";
+import { CopyJobMigrationType } from "../../../../Enums/CopyJobEnums";
+import { CopyJobContextProviderType, CopyJobContextState, DropdownOptionType } from "../../../../Types/CopyJobTypes";
 
 export function useDropdownOptions(
   subscriptions: Subscription[],
@@ -45,7 +45,7 @@ export function useEventHandlers(setCopyJobState: setCopyJobStateType) {
             source: {
               ...prevState.source,
               subscription: data || null,
-              account: null, // reset on subscription change
+              account: null,
             },
           };
         }

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/Events/DropDownChangeHandler.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { CopyJobContextState, DropdownOptionType } from "../../../../Types";
+import { CopyJobContextState, DropdownOptionType } from "../../../../Types/CopyJobTypes";
 
 export function dropDownChangeHandler(setCopyJobState: React.Dispatch<React.SetStateAction<CopyJobContextState>>) {
   return (type: "sourceDatabase" | "sourceContainer" | "targetDatabase" | "targetContainer") =>

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx

@@ -14,13 +14,11 @@ const SelectSourceAndTargetContainers = () => {
   const { source, target, sourceDbParams, sourceContainerParams, targetDbParams, targetContainerParams } =
     useMemoizedSourceAndTargetData(copyJobState);
 
-  // Custom hooks
   const sourceDatabases = useDatabases(...sourceDbParams) || [];
   const sourceContainers = useDataContainers(...sourceContainerParams) || [];
   const targetDatabases = useDatabases(...targetDbParams) || [];
   const targetContainers = useDataContainers(...targetContainerParams) || [];
 
-  // Memoize option objects for dropdowns
   const sourceDatabaseOptions = React.useMemo(
     () => sourceDatabases.map((db: DatabaseModel) => ({ key: db.name, text: db.name, data: db })),
     [sourceDatabases],

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/components/DatabaseContainerSection.tsx

@@ -1,7 +1,7 @@
 import { Dropdown, Stack } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../../../ContainerCopyMessages";
-import { DatabaseContainerSectionProps } from "../../../../Types";
+import { DatabaseContainerSectionProps } from "../../../../Types/CopyJobTypes";
 import FieldRow from "../../Components/FieldRow";
 
 export const DatabaseContainerSection = ({

src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { getAccountDetailsFromResourceId } from "../../../CopyJobUtils";
-import { CopyJobContextState, DatabaseParams, DataContainerParams } from "../../../Types";
+import { CopyJobContextState, DatabaseParams, DataContainerParams } from "../../../Types/CopyJobTypes";
 
 export function useMemoizedSourceAndTargetData(copyJobState: CopyJobContextState) {
   const { source, target } = copyJobState ?? {};

src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCopyJobNavigation.ts

@@ -1,7 +1,8 @@
-import { useCallback, useMemo, useReducer } from "react";
+import { useCallback, useMemo, useReducer, useState } from "react";
 import { useSidePanel } from "../../../../hooks/useSidePanel";
 import { submitCreateCopyJob } from "../../Actions/CopyJobActions";
 import { useCopyJobContext } from "../../Context/CopyJobContext";
+import { CopyJobMigrationType } from "../../Enums/CopyJobEnums";
 import { useCopyJobPrerequisitesCache } from "./useCopyJobPrerequisitesCache";
 import { SCREEN_KEYS, useCreateCopyJobScreensList } from "./useCreateCopyJobScreensList";
 
@@ -31,6 +32,8 @@ function navigationReducer(state: NavigationState, action: Action): NavigationSt
 }
 
 export function useCopyJobNavigation() {
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
   const { copyJobState, resetCopyJobState } = useCopyJobContext();
   const screens = useCreateCopyJobScreensList();
   const { validationCache: cache } = useCopyJobPrerequisitesCache();
@@ -40,9 +43,13 @@ export function useCopyJobNavigation() {
   const currentScreen = screens.find((screen) => screen.key === currentScreenKey);
 
   const isPrimaryDisabled = useMemo(() => {
+    if (isLoading) {
+      return true;
+    }
     const context = currentScreenKey === SCREEN_KEYS.AssignPermissions ? cache : copyJobState;
     return !currentScreen?.validations.every((v) => v.validate(context));
-  }, [currentScreen.key, copyJobState, cache]);
+  }, [currentScreen.key, copyJobState, cache, isLoading]);
+
   const primaryBtnText = useMemo(() => {
     if (currentScreenKey === SCREEN_KEYS.PreviewCopyJob) {
       return "Copy";
@@ -58,9 +65,63 @@ export function useCopyJobNavigation() {
     useSidePanel.getState().closeSidePanel();
   }, []);
 
+  const getContainerIdentifiers = (container: typeof copyJobState.source | typeof copyJobState.target) => ({
+    accountId: container?.account?.id || "",
+    databaseId: container?.databaseId || "",
+    containerId: container?.containerId || "",
+  });
+
+  const isSameAccount = (
+    sourceIds: ReturnType<typeof getContainerIdentifiers>,
+    targetIds: ReturnType<typeof getContainerIdentifiers>,
+  ) => sourceIds.accountId === targetIds.accountId;
+
+  const areContainersIdentical = () => {
+    const { source, target } = copyJobState;
+    const sourceIds = getContainerIdentifiers(source);
+    const targetIds = getContainerIdentifiers(target);
+
+    return (
+      isSameAccount(sourceIds, targetIds) &&
+      sourceIds.databaseId === targetIds.databaseId &&
+      sourceIds.containerId === targetIds.containerId
+    );
+  };
+
+  const shouldNotShowPermissionScreen = () => {
+    const { source, target, migrationType } = copyJobState;
+    return (
+      migrationType === CopyJobMigrationType.Offline &&
+      isSameAccount(getContainerIdentifiers(source), getContainerIdentifiers(target))
+    );
+  };
+
+  const handleCopyJobSubmission = async () => {
+    try {
+      setIsLoading(true);
+      await submitCreateCopyJob(copyJobState, handleCancel);
+    } catch (error: unknown) {
+      const errorMessage =
+        error instanceof Error
+          ? error.message || "Failed to create copy job. Please try again later."
+          : "Failed to create copy job. Please try again later.";
+      setError(errorMessage);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
   const handlePrimary = useCallback(() => {
+    if (currentScreenKey === SCREEN_KEYS.SelectSourceAndTargetContainers && areContainersIdentical()) {
+      setError("Source and destination containers cannot be the same. Please select different containers to proceed.");
+      return;
+    }
+
+    setError(null);
     const transitions = {
-      [SCREEN_KEYS.SelectAccount]: SCREEN_KEYS.AssignPermissions,
+      [SCREEN_KEYS.SelectAccount]: shouldNotShowPermissionScreen()
+        ? SCREEN_KEYS.SelectSourceAndTargetContainers
+        : SCREEN_KEYS.AssignPermissions,
       [SCREEN_KEYS.AssignPermissions]: SCREEN_KEYS.SelectSourceAndTargetContainers,
       [SCREEN_KEYS.SelectSourceAndTargetContainers]: SCREEN_KEYS.PreviewCopyJob,
     };
@@ -69,9 +130,9 @@ export function useCopyJobNavigation() {
     if (nextScreen) {
       dispatch({ type: "NEXT", nextScreen });
     } else if (currentScreenKey === SCREEN_KEYS.PreviewCopyJob) {
-      submitCreateCopyJob(copyJobState, handleCancel);
+      handleCopyJobSubmission();
     }
-  }, [currentScreenKey, copyJobState]);
+  }, [currentScreenKey, copyJobState, areContainersIdentical, handleCopyJobSubmission]);
 
   const handlePrevious = useCallback(() => {
     dispatch({ type: "PREVIOUS" });
@@ -85,5 +146,7 @@ export function useCopyJobNavigation() {
     handlePrevious,
     handleCancel,
     primaryBtnText,
+    error,
+    setError,
   };
 }

src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx

@@ -1,9 +1,9 @@
 import React from "react";
-import { CopyJobContextState } from "../../Types";
-import AssignPermissions from "../Screens/AssignPermissions";
-import PreviewCopyJob from "../Screens/PreviewCopyJob";
-import SelectAccount from "../Screens/SelectAccount";
-import SelectSourceAndTargetContainers from "../Screens/SelectSourceAndTargetContainers";
+import { CopyJobContextState } from "../../Types/CopyJobTypes";
+import AssignPermissions from "../Screens/AssignPermissions/AssignPermissions";
+import PreviewCopyJob from "../Screens/PreviewCopyJob/PreviewCopyJob";
+import SelectAccount from "../Screens/SelectAccount/SelectAccount";
+import SelectSourceAndTargetContainers from "../Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers";
 
 const SCREEN_KEYS = {
   SelectAccount: "SelectAccount",

src/Explorer/ContainerCopy/Enums/CopyJobEnums.ts

@@ -3,15 +3,14 @@ export enum CopyJobMigrationType {
   Online = "online",
 }
 
-// all checks will happen
 export enum IdentityType {
-  SystemAssigned = "systemassigned", // "SystemAssigned"
-  UserAssigned = "userassigned", // "UserAssigned"
-  None = "none", // "None"
+  SystemAssigned = "systemassigned",
+  UserAssigned = "userassigned",
+  None = "none",
 }
 
 export enum DefaultIdentityType {
-  SystemAssignedIdentity = "systemassignedidentity", // "SystemAssignedIdentity"
+  SystemAssignedIdentity = "systemassignedidentity",
 }
 
 export enum BackupPolicyType {

src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobActionMenu.tsx

@@ -1,38 +1,45 @@
 import { IconButton, IContextualMenuProps } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../ContainerCopyMessages";
-import { CopyJobActions, CopyJobMigrationType, CopyJobStatusType } from "../../Enums";
-import { CopyJobType } from "../../Types";
+import { CopyJobActions, CopyJobMigrationType, CopyJobStatusType } from "../../Enums/CopyJobEnums";
+import { CopyJobType, HandleJobActionClickType } from "../../Types/CopyJobTypes";
 
 interface CopyJobActionMenuProps {
   job: CopyJobType;
-  handleClick: (job: CopyJobType, action: string) => void;
+  handleClick: HandleJobActionClickType;
 }
 
 const CopyJobActionMenu: React.FC<CopyJobActionMenuProps> = ({ job, handleClick }) => {
+  const [updatingJobAction, setUpdatingJobAction] = React.useState<{ jobName: string; action: string } | null>(null);
   if ([CopyJobStatusType.Completed, CopyJobStatusType.Cancelled].includes(job.Status)) {
     return null;
   }
 
   const getMenuItems = (): IContextualMenuProps["items"] => {
+    const isThisJobUpdating = updatingJobAction?.jobName === job.Name;
+    const updatingAction = updatingJobAction?.action;
+
     const baseItems = [
       {
         key: CopyJobActions.pause,
         text: ContainerCopyMessages.MonitorJobs.Actions.pause,
         iconProps: { iconName: "Pause" },
-        onClick: () => handleClick(job, CopyJobActions.pause),
+        onClick: () => handleClick(job, CopyJobActions.pause, setUpdatingJobAction),
+        disabled: isThisJobUpdating && updatingAction === CopyJobActions.pause,
       },
       {
         key: CopyJobActions.cancel,
         text: ContainerCopyMessages.MonitorJobs.Actions.cancel,
         iconProps: { iconName: "Cancel" },
-        onClick: () => handleClick(job, CopyJobActions.cancel),
+        onClick: () => handleClick(job, CopyJobActions.cancel, setUpdatingJobAction),
+        disabled: isThisJobUpdating && updatingAction === CopyJobActions.cancel,
       },
       {
         key: CopyJobActions.resume,
         text: ContainerCopyMessages.MonitorJobs.Actions.resume,
         iconProps: { iconName: "Play" },
-        onClick: () => handleClick(job, CopyJobActions.resume),
+        onClick: () => handleClick(job, CopyJobActions.resume, setUpdatingJobAction),
+        disabled: isThisJobUpdating && updatingAction === CopyJobActions.resume,
       },
     ];
 
@@ -53,7 +60,8 @@ const CopyJobActionMenu: React.FC<CopyJobActionMenuProps> = ({ job, handleClick
           key: CopyJobActions.complete,
           text: ContainerCopyMessages.MonitorJobs.Actions.complete,
           iconProps: { iconName: "CheckMark" },
-          onClick: () => handleClick(job, CopyJobActions.complete),
+          onClick: () => handleClick(job, CopyJobActions.complete, setUpdatingJobAction),
+          disabled: isThisJobUpdating && updatingAction === CopyJobActions.complete,
         });
       }
       return filteredItems;

src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobColumns.tsx

@@ -1,79 +1,80 @@
 import { IColumn } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../ContainerCopyMessages";
-import { CopyJobType } from "../../Types";
+import { CopyJobType, HandleJobActionClickType } from "../../Types/CopyJobTypes";
 import CopyJobActionMenu from "./CopyJobActionMenu";
 import CopyJobStatusWithIcon from "./CopyJobStatusWithIcon";
 
 export const getColumns = (
   handleSort: (columnKey: string) => void,
-  handleActionClick: (job: CopyJobType, action: string) => void,
+  handleActionClick: HandleJobActionClickType,
   sortedColumnKey: string | undefined,
   isSortedDescending: boolean,
 ): IColumn[] => [
-    {
-      key: "LastUpdatedTime",
-      name: ContainerCopyMessages.MonitorJobs.Columns.lastUpdatedTime,
-      fieldName: "LastUpdatedTime",
-      minWidth: 140,
-      maxWidth: 300,
-      isResizable: true,
-      isSorted: sortedColumnKey === "timestamp",
-      isSortedDescending: isSortedDescending,
-      onColumnClick: () => handleSort("timestamp"),
-    },
-    {
-      key: "Name",
-      name: ContainerCopyMessages.MonitorJobs.Columns.name,
-      fieldName: "Name",
-      minWidth: 140,
-      maxWidth: 300,
-      isResizable: true,
-      isSorted: sortedColumnKey === "Name",
-      isSortedDescending: isSortedDescending,
-      onColumnClick: () => handleSort("Name"),
-    },
-    {
-      key: "Mode",
-      name: ContainerCopyMessages.MonitorJobs.Columns.mode,
-      fieldName: "Mode",
-      minWidth: 90,
-      maxWidth: 200,
-      isResizable: true,
-      isSorted: sortedColumnKey === "Mode",
-      isSortedDescending: isSortedDescending,
-      onColumnClick: () => handleSort("Mode"),
-    },
-    {
-      key: "CompletionPercentage",
-      name: ContainerCopyMessages.MonitorJobs.Columns.completionPercentage,
-      fieldName: "CompletionPercentage",
-      minWidth: 110,
-      maxWidth: 200,
-      isResizable: true,
-      isSorted: sortedColumnKey === "CompletionPercentage",
-      isSortedDescending: isSortedDescending,
-      onRender: (job: CopyJobType) => `${job.CompletionPercentage}%`,
-      onColumnClick: () => handleSort("CompletionPercentage"),
-    },
-    {
-      key: "CopyJobStatus",
-      name: ContainerCopyMessages.MonitorJobs.Columns.status,
-      fieldName: "Status",
-      minWidth: 130,
-      maxWidth: 200,
-      isResizable: true,
-      isSorted: sortedColumnKey === "Status",
-      isSortedDescending: isSortedDescending,
-      onRender: (job: CopyJobType) => <CopyJobStatusWithIcon status={job.Status} />,
-      onColumnClick: () => handleSort("Status"),
-    },
-    {
-      key: "Actions",
-      name: "",
-      minWidth: 80,
-      maxWidth: 200,
-      isResizable: true,
-      onRender: (job: CopyJobType) => <CopyJobActionMenu job={job} handleClick={handleActionClick} />,
-    },
-  ];
+  {
+    key: "LastUpdatedTime",
+    name: ContainerCopyMessages.MonitorJobs.Columns.lastUpdatedTime,
+    fieldName: "LastUpdatedTime",
+    minWidth: 140,
+    maxWidth: 300,
+    isResizable: true,
+    isSorted: sortedColumnKey === "timestamp",
+    isSortedDescending: isSortedDescending,
+    onColumnClick: () => handleSort("timestamp"),
+  },
+  {
+    key: "Name",
+    name: ContainerCopyMessages.MonitorJobs.Columns.name,
+    fieldName: "Name",
+    minWidth: 140,
+    maxWidth: 300,
+    isResizable: true,
+    isSorted: sortedColumnKey === "Name",
+    isSortedDescending: isSortedDescending,
+    onColumnClick: () => handleSort("Name"),
+    onRender: (job: CopyJobType) => <span className="jobNameLink">{job.Name}</span>,
+  },
+  {
+    key: "Mode",
+    name: ContainerCopyMessages.MonitorJobs.Columns.mode,
+    fieldName: "Mode",
+    minWidth: 90,
+    maxWidth: 200,
+    isResizable: true,
+    isSorted: sortedColumnKey === "Mode",
+    isSortedDescending: isSortedDescending,
+    onColumnClick: () => handleSort("Mode"),
+  },
+  {
+    key: "CompletionPercentage",
+    name: ContainerCopyMessages.MonitorJobs.Columns.completionPercentage,
+    fieldName: "CompletionPercentage",
+    minWidth: 110,
+    maxWidth: 200,
+    isResizable: true,
+    isSorted: sortedColumnKey === "CompletionPercentage",
+    isSortedDescending: isSortedDescending,
+    onRender: (job: CopyJobType) => `${job.CompletionPercentage}%`,
+    onColumnClick: () => handleSort("CompletionPercentage"),
+  },
+  {
+    key: "CopyJobStatus",
+    name: ContainerCopyMessages.MonitorJobs.Columns.status,
+    fieldName: "Status",
+    minWidth: 130,
+    maxWidth: 200,
+    isResizable: true,
+    isSorted: sortedColumnKey === "Status",
+    isSortedDescending: isSortedDescending,
+    onRender: (job: CopyJobType) => <CopyJobStatusWithIcon status={job.Status} />,
+    onColumnClick: () => handleSort("Status"),
+  },
+  {
+    key: "Actions",
+    name: "",
+    minWidth: 80,
+    maxWidth: 200,
+    isResizable: true,
+    onRender: (job: CopyJobType) => <CopyJobActionMenu job={job} handleClick={handleActionClick} />,
+  },
+];

src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobDetails.tsx

@@ -0,0 +1,118 @@
+import { DetailsList, DetailsListLayoutMode, IColumn, Stack, Text } from "@fluentui/react";
+import React, { memo } from "react";
+import ContainerCopyMessages from "../../ContainerCopyMessages";
+import { CopyJobStatusType } from "../../Enums/CopyJobEnums";
+import { CopyJobType } from "../../Types/CopyJobTypes";
+import CopyJobStatusWithIcon from "./CopyJobStatusWithIcon";
+
+interface CopyJobDetailsProps {
+  job: CopyJobType;
+}
+
+const sectionCss = {
+  verticalAlign: { display: "flex", flexDirection: "column" } as React.CSSProperties,
+  headingText: { marginBottom: "10px" } as React.CSSProperties,
+};
+
+const commonProps = {
+  minWidth: 100,
+  maxWidth: 130,
+  styles: {
+    root: {
+      whiteSpace: "normal",
+      lineHeight: "1.2",
+      wordBreak: "break-word",
+    },
+  },
+};
+
+const getCopyJobDetailsListColumns = (): IColumn[] => {
+  return [
+    {
+      key: "sourcedbcol",
+      name: ContainerCopyMessages.sourceDatabaseLabel,
+      fieldName: "sourceDatabaseName",
+      ...commonProps,
+    },
+    {
+      key: "sourcecol",
+      name: ContainerCopyMessages.sourceContainerLabel,
+      fieldName: "sourceContainerName",
+      ...commonProps,
+    },
+    {
+      key: "targetdbcol",
+      name: ContainerCopyMessages.targetDatabaseLabel,
+      fieldName: "targetDatabaseName",
+      ...commonProps,
+    },
+    {
+      key: "targetcol",
+      name: ContainerCopyMessages.targetContainerLabel,
+      fieldName: "targetContainerName",
+      ...commonProps,
+    },
+    {
+      key: "statuscol",
+      name: ContainerCopyMessages.MonitorJobs.Columns.status,
+      fieldName: "jobStatus",
+      onRender: ({ jobStatus }: { jobStatus: CopyJobStatusType }) => <CopyJobStatusWithIcon status={jobStatus} />,
+      ...commonProps,
+    },
+  ];
+};
+
+const CopyJobDetails: React.FC<CopyJobDetailsProps> = ({ job }) => {
+  const selectedContainers = [
+    {
+      sourceContainerName: job?.Source?.containerName || "N/A",
+      sourceDatabaseName: job?.Source?.databaseName || "N/A",
+      targetContainerName: job?.Destination?.containerName || "N/A",
+      targetDatabaseName: job?.Destination?.databaseName || "N/A",
+      jobStatus: job?.Status || "",
+    },
+  ];
+
+  return (
+    <Stack className="copyJobDetailsContainer" tokens={{ childrenGap: 15 }} data-testid="copy-job-details">
+      {job.Error ? (
+        <Stack.Item data-testid="error-stack" style={sectionCss.verticalAlign}>
+          <Text className="bold" style={sectionCss.headingText}>
+            {ContainerCopyMessages.errorTitle}
+          </Text>
+          <Text as="pre" style={{ whiteSpace: "pre-wrap" }}>
+            {job.Error.message}
+          </Text>
+        </Stack.Item>
+      ) : null}
+      <Stack.Item data-testid="selectedcollection-stack">
+        <Stack tokens={{ childrenGap: 15 }}>
+          <Stack.Item style={sectionCss.verticalAlign}>
+            <Text className="bold">{ContainerCopyMessages.MonitorJobs.Columns.lastUpdatedTime}</Text>
+            <Text>{job.LastUpdatedTime}</Text>
+          </Stack.Item>
+          <Stack.Item style={sectionCss.verticalAlign}>
+            <Text className="bold">{ContainerCopyMessages.sourceAccountLabel}</Text>
+            <Text>{job.Source?.remoteAccountName}</Text>
+          </Stack.Item>
+          <Stack.Item style={sectionCss.verticalAlign}>
+            <Text className="bold">{ContainerCopyMessages.MonitorJobs.Columns.mode}</Text>
+            <Text>{job.Mode}</Text>
+          </Stack.Item>
+        </Stack>
+      </Stack.Item>
+      <Stack.Item style={sectionCss.verticalAlign}>
+        <DetailsList
+          items={selectedContainers}
+          layoutMode={DetailsListLayoutMode.justified}
+          checkboxVisibility={2}
+          columns={getCopyJobDetailsListColumns()}
+        />
+      </Stack.Item>
+    </Stack>
+  );
+};
+
+export default memo(CopyJobDetails, (prevProps, nextProps) => {
+  return prevProps.job.ID === nextProps.job.ID && prevProps.job.Error === nextProps.job.Error;
+});

src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobStatusWithIcon.tsx

@@ -1,7 +1,7 @@
-import { FontIcon, getTheme, mergeStyles, mergeStyleSets, Stack, Text } from "@fluentui/react";
+import { FontIcon, getTheme, mergeStyles, mergeStyleSets, Spinner, SpinnerSize, Stack, Text } from "@fluentui/react";
 import React from "react";
 import ContainerCopyMessages from "../../ContainerCopyMessages";
-import { CopyJobStatusType } from "../../Enums";
+import { CopyJobStatusType } from "../../Enums/CopyJobEnums";
 
 const theme = getTheme();
 
@@ -24,11 +24,8 @@ const classNames = mergeStyleSets({
   unknown: [{ color: theme.semanticColors.bodySubtext }, iconClass],
 });
 
-const iconMap: Record<CopyJobStatusType, string> = {
-  [CopyJobStatusType.Pending]: "StatusCircleRing",
-  [CopyJobStatusType.InProgress]: "ProgressRingDots",
-  [CopyJobStatusType.Running]: "ProgressRingDots",
-  [CopyJobStatusType.Partitioning]: "ProgressRingDots",
+const iconMap: Partial<Record<CopyJobStatusType, string>> = {
+  [CopyJobStatusType.Pending]: "Clock",
   [CopyJobStatusType.Paused]: "CirclePause",
   [CopyJobStatusType.Skipped]: "StatusCircleBlock2",
   [CopyJobStatusType.Cancelled]: "StatusErrorFull",
@@ -39,13 +36,24 @@ const iconMap: Record<CopyJobStatusType, string> = {
 
 const CopyJobStatusWithIcon: React.FC<{ status: CopyJobStatusType }> = ({ status }) => {
   const statusText = ContainerCopyMessages.MonitorJobs.Status[status] || "Unknown";
+
+  const isSpinnerStatus = [
+    CopyJobStatusType.Running,
+    CopyJobStatusType.InProgress,
+    CopyJobStatusType.Partitioning,
+  ].includes(status);
+
   return (
     <Stack horizontal verticalAlign="center">
-      <FontIcon
-        aria-label={status}
-        iconName={iconMap[status] || "UnknownSolid"}
-        className={classNames[status] || classNames.unknown}
-      />
+      {isSpinnerStatus ? (
+        <Spinner size={SpinnerSize.small} style={{ marginRight: "8px" }} />
+      ) : (
+        <FontIcon
+          aria-label={status}
+          iconName={iconMap[status] || "UnknownSolid"}
+          className={classNames[status] || classNames.unknown}
+        />
+      )}
       <Text>{statusText}</Text>
     </Stack>
   );

src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx

@@ -12,30 +12,33 @@ import {
   StickyPositionType,
 } from "@fluentui/react";
 import React, { useEffect } from "react";
-import { CopyJobType } from "../../Types";
+import Pager from "../../../../Common/Pager";
+import { openCopyJobDetailsPanel } from "../../Actions/CopyJobActions";
+import { CopyJobType, HandleJobActionClickType } from "../../Types/CopyJobTypes";
 import { getColumns } from "./CopyJobColumns";
 
 interface CopyJobsListProps {
   jobs: CopyJobType[];
-  handleActionClick: (job: CopyJobType, action: string) => void;
+  handleActionClick: HandleJobActionClickType;
   pageSize?: number;
 }
 
 const styles = {
-  container: { height: "calc(100vh - 15em)" } as React.CSSProperties,
+  container: { height: "calc(100vh - 25em)" } as React.CSSProperties,
   stackItem: { position: "relative", marginBottom: "20px" } as React.CSSProperties,
 };
 
-const PAGE_SIZE = 100; // Number of items per page
+const PAGE_SIZE = 10;
 
 const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pageSize = PAGE_SIZE }) => {
-  const [startIndex] = React.useState(0);
+  const [startIndex, setStartIndex] = React.useState(0);
   const [sortedJobs, setSortedJobs] = React.useState<CopyJobType[]>(jobs);
   const [sortedColumnKey, setSortedColumnKey] = React.useState<string | undefined>(undefined);
   const [isSortedDescending, setIsSortedDescending] = React.useState<boolean>(false);
 
   useEffect(() => {
     setSortedJobs(jobs);
+    setStartIndex(0);
   }, [jobs]);
 
   const handleSort = (columnKey: string) => {
@@ -52,6 +55,7 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
     setSortedJobs(sorted);
     setSortedColumnKey(columnKey);
     setIsSortedDescending(isDescending);
+    setStartIndex(0);
   };
 
   const columns: IColumn[] = React.useMemo(
@@ -60,8 +64,7 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
   );
 
   const _handleRowClick = React.useCallback((job: CopyJobType) => {
-    // eslint-disable-next-line no-console
-    console.log("Row clicked:", job);
+    openCopyJobDetailsPanel(job);
   }, []);
 
   const _onRenderRow = React.useCallback((props: any) => {
@@ -72,8 +75,6 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
     );
   }, []);
 
-  // const totalCount = jobs.length;
-
   return (
     <div style={styles.container}>
       <Stack verticalFill={true}>
@@ -95,6 +96,21 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
             />
           </ScrollablePane>
         </Stack.Item>
+        {sortedJobs.length > pageSize && (
+          <Stack.Item>
+            <Pager
+              disabled={false}
+              startIndex={startIndex}
+              totalCount={sortedJobs.length}
+              pageSize={pageSize}
+              onLoadPage={(startIdx /* pageSize */) => {
+                setStartIndex(startIdx);
+              }}
+              showFirstLast={true}
+              showItemCount={true}
+            />
+          </Stack.Item>
+        )}
       </Stack>
     </div>
   );

src/Explorer/ContainerCopy/MonitorCopyJobs/MonitorCopyJobs.tsx

@@ -1,15 +1,15 @@
 /* eslint-disable react/display-name */
 import { MessageBar, MessageBarType, Stack } from "@fluentui/react";
-import ShimmerTree, { IndentLevel } from "Common/ShimmerTree";
+import ShimmerTree, { IndentLevel } from "Common/ShimmerTree/ShimmerTree";
 import React, { forwardRef, useEffect, useImperativeHandle } from "react";
 import { getCopyJobs, updateCopyJobStatus } from "../Actions/CopyJobActions";
 import { convertToCamelCase } from "../CopyJobUtils";
-import { CopyJobStatusType } from "../Enums";
+import { CopyJobStatusType } from "../Enums/CopyJobEnums";
 import CopyJobsNotFound from "../MonitorCopyJobs/Components/CopyJobs.NotFound";
-import { CopyJobType } from "../Types";
+import { CopyJobType, JobActionUpdatorType } from "../Types/CopyJobTypes";
 import CopyJobsList from "./Components/CopyJobsList";
 
-const FETCH_INTERVAL_MS = 30 * 1000; // Interval time in milliseconds (30 seconds)
+const FETCH_INTERVAL_MS = 30 * 1000;
 
 interface MonitorCopyJobsProps {}
 
@@ -18,27 +18,26 @@ export interface MonitorCopyJobsRef {
 }
 
 const MonitorCopyJobs = forwardRef<MonitorCopyJobsRef, MonitorCopyJobsProps>((_props, ref) => {
-  const [loading, setLoading] = React.useState(true); // Start with loading as true
+  const [loading, setLoading] = React.useState(true);
   const [error, setError] = React.useState<string | null>(null);
   const [jobs, setJobs] = React.useState<CopyJobType[]>([]);
-  const isUpdatingRef = React.useRef(false); // Use ref to track updating state
-  const isFirstFetchRef = React.useRef(true); // Use ref to track the first fetch
+  const isUpdatingRef = React.useRef(false);
+  const isFirstFetchRef = React.useRef(true);
 
   const indentLevels = React.useMemo<IndentLevel[]>(() => Array(7).fill({ level: 0, width: "100%" }), []);
 
   const fetchJobs = React.useCallback(async () => {
     if (isUpdatingRef.current) {
       return;
-    } // Skip if an update is in progress
+    }
     try {
       if (isFirstFetchRef.current) {
         setLoading(true);
-      } // Show loading spinner only for the first fetch
+      }
       setError(null);
 
       const response = await getCopyJobs();
       setJobs((prevJobs) => {
-        // Only update jobs if they are different
         const isSame = JSON.stringify(prevJobs) === JSON.stringify(response);
         return isSame ? prevJobs : response;
       });
@@ -46,8 +45,8 @@ const MonitorCopyJobs = forwardRef<MonitorCopyJobsRef, MonitorCopyJobsProps>((_p
       setError(error.message || "Failed to load copy jobs. Please try again later.");
     } finally {
       if (isFirstFetchRef.current) {
-        setLoading(false); // Hide loading spinner after the first fetch
-        isFirstFetchRef.current = false; // Mark the first fetch as complete
+        setLoading(false);
+        isFirstFetchRef.current = false;
       }
     }
   }, []);
@@ -69,28 +68,33 @@ const MonitorCopyJobs = forwardRef<MonitorCopyJobsRef, MonitorCopyJobsProps>((_p
     },
   }));
 
-  const handleActionClick = React.useCallback(async (job: CopyJobType, action: string) => {
-    try {
-      isUpdatingRef.current = true; // Mark as updating
-      const updatedCopyJob = await updateCopyJobStatus(job, action);
-      if (updatedCopyJob) {
-        setJobs((prevJobs) =>
-          prevJobs.map((prevJob) =>
-            prevJob.Name === updatedCopyJob.properties.jobName
-              ? {
-                  ...prevJob,
-                  Status: convertToCamelCase(updatedCopyJob.properties.status) as CopyJobStatusType,
-                }
-              : prevJob,
-          ),
-        );
+  const handleActionClick = React.useCallback(
+    async (job: CopyJobType, action: string, setUpdatingJobAction: JobActionUpdatorType) => {
+      try {
+        isUpdatingRef.current = true;
+        setUpdatingJobAction({ jobName: job.Name, action });
+        const updatedCopyJob = await updateCopyJobStatus(job, action);
+        if (updatedCopyJob) {
+          setJobs((prevJobs) =>
+            prevJobs.map((prevJob) =>
+              prevJob.Name === updatedCopyJob.properties.jobName
+                ? {
+                    ...prevJob,
+                    Status: convertToCamelCase(updatedCopyJob.properties.status) as CopyJobStatusType,
+                  }
+                : prevJob,
+            ),
+          );
+        }
+      } catch (error) {
+        setError(error.message || "Failed to update copy job status. Please try again later.");
+      } finally {
+        isUpdatingRef.current = false;
+        setUpdatingJobAction(null);
       }
-    } catch (error) {
-      setError(error.message || "Failed to update copy job status. Please try again later.");
-    } finally {
-      isUpdatingRef.current = false; // Mark as not updating
-    }
-  }, []);
+    },
+    [],
+  );
 
   const memoizedJobsList = React.useMemo(() => {
     if (loading) {

src/Explorer/ContainerCopy/Types/CopyJobTypes.ts

@@ -1,8 +1,9 @@
 import { DatabaseAccount, Subscription } from "Contracts/DataModels";
 import React from "react";
 import { ApiType } from "UserContext";
+import { CosmosSqlDataTransferDataSourceSink } from "../../../Utils/arm/generatedClients/dataTransferService/types";
 import Explorer from "../../Explorer";
-import { CopyJobMigrationType, CopyJobStatusType } from "../Enums";
+import { CopyJobMigrationType, CopyJobStatusType } from "../Enums/CopyJobEnums";
 
 export interface ContainerCopyProps {
   container: Explorer;
@@ -53,14 +54,12 @@ export interface CopyJobContextState {
   jobName: string;
   migrationType: CopyJobMigrationType;
   sourceReadAccessFromTarget?: boolean;
-  // source details
   source: {
     subscription: Subscription;
     account: DatabaseAccount;
     databaseId: string;
     containerId: string;
   };
-  // target details
   target: {
     subscriptionId: string;
     account: DatabaseAccount;
@@ -91,6 +90,8 @@ export type CopyJobType = {
   LastUpdatedTime: string;
   timestamp: number;
   Error?: CopyJobErrorType;
+  Source: CosmosSqlDataTransferDataSourceSink;
+  Destination: CosmosSqlDataTransferDataSourceSink;
 };
 
 export interface CopyJobErrorType {
@@ -130,3 +131,13 @@ export type DataTransferJobType = {
     };
   };
 };
+
+export type JobActionUpdatorType = React.Dispatch<React.SetStateAction<{ jobName: string; action: string } | null>>;
+
+export type HandleJobActionClickType = (
+  job: CopyJobType,
+  action: string,
+  setUpdatingJobAction: JobActionUpdatorType,
+) => void;
+
+export type AccountValidatorFn = (prev: DatabaseAccount, next: DatabaseAccount) => boolean;

src/Explorer/ContainerCopy/containerCopyStyles.less

@@ -19,9 +19,7 @@
 .createCopyJobScreensContainer {
   height: 100%;
   padding: 1em 1.5em;
-  .bold {
-    font-weight: 600;
-  }
+  
   label {
     padding: 0;
   }
@@ -74,6 +72,9 @@
     transform: translate(0%, -9%);
     position: absolute;
   }
+  .createCopyJobErrorMessageBar {
+    margin-bottom: 2em;
+  }
 }
 
 .monitorCopyJobs {
@@ -114,6 +115,12 @@
         min-height: 48px;
         display: flex;
         align-items: center;
+
+        .jobNameLink {
+          color: @LinkColor;
+          text-decoration: underline;
+          cursor: pointer;
+        }
       }
     }
   }
@@ -126,3 +133,28 @@
     }
   }
 }
+
+.copyJobDetailsContainer {
+  padding: 1em 0 0 2em;
+
+  .ms-DetailsList {
+    width: 100%;
+    .ms-DetailsHeader-cellTitle, .ms-DetailsRow-cell {
+      padding-left: 0;
+    }
+    .ms-DetailsRow-cell {
+      font-size: @DefaultFontSize;
+      color: @BaseHigh;
+    }
+  }
+}
+
+.bold {
+  font-weight: 600;
+}
+
+.fullWidth {
+  width: 100%;
+  display: flex;
+    justify-content: center;
+}

src/Explorer/Controls/FullTextSeach/FullTextPoliciesComponent.tsx

@@ -12,6 +12,7 @@ import {
 import { FullTextIndex, FullTextPath, FullTextPolicy } from "Contracts/DataModels";
 import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import * as React from "react";
+import { isFullTextSearchPreviewFeaturesEnabled } from "Utils/CapabilityUtils";
 
 export interface FullTextPoliciesComponentProps {
   fullTextPolicy: FullTextPolicy;
@@ -22,6 +23,7 @@ export interface FullTextPoliciesComponentProps {
   ) => void;
   discardChanges?: boolean;
   onChangesDiscarded?: () => void;
+  englishOnly?: boolean;
 }
 
 export interface FullTextPolicyData {
@@ -66,6 +68,7 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
   onFullTextPathChange,
   discardChanges,
   onChangesDiscarded,
+  englishOnly,
 }): JSX.Element => {
   const getFullTextPathError = (path: string, index?: number): string => {
     let error = "";
@@ -87,6 +90,7 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
     if (!fullTextPolicy) {
       fullTextPolicy = { defaultLanguage: getFullTextLanguageOptions()[0].key as never, fullTextPaths: [] };
     }
+
     return fullTextPolicy.fullTextPaths.map((fullTextPath: FullTextPath) => ({
       ...fullTextPath,
       pathError: getFullTextPathError(fullTextPath.path),
@@ -166,7 +170,7 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
         <Dropdown
           required={true}
           styles={dropdownStyles}
-          options={getFullTextLanguageOptions()}
+          options={getFullTextLanguageOptions(englishOnly)}
           selectedKey={defaultLanguage}
           onChange={(_event: React.FormEvent<HTMLDivElement>, option: IDropdownOption) =>
             setDefaultLanguage(option.key as never)
@@ -211,7 +215,7 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
                   <Dropdown
                     required={true}
                     styles={dropdownStyles}
-                    options={getFullTextLanguageOptions()}
+                    options={getFullTextLanguageOptions(englishOnly)}
                     selectedKey={fullTextPolicy.language}
                     onChange={(_event: React.FormEvent<HTMLDivElement>, option: IDropdownOption) =>
                       onFullTextPathPolicyChange(index, option)
@@ -229,11 +233,30 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
   );
 };
 
-export const getFullTextLanguageOptions = (): IDropdownOption[] => {
-  return [
+export const getFullTextLanguageOptions = (englishOnly?: boolean): IDropdownOption[] => {
+  const multiLanguageSupportEnabled: boolean = isFullTextSearchPreviewFeaturesEnabled() && !englishOnly;
+  const fullTextLanguageOptions: IDropdownOption[] = [
     {
       key: "en-US",
       text: "English (US)",
     },
+    ...(multiLanguageSupportEnabled
+      ? [
+          {
+            key: "fr-FR",
+            text: "French",
+          },
+          {
+            key: "de-DE",
+            text: "German",
+          },
+          {
+            key: "es-ES",
+            text: "Spanish",
+          },
+        ]
+      : []),
   ];
+
+  return fullTextLanguageOptions;
 };

src/Explorer/Controls/Settings/SettingsComponent.test.tsx

@@ -24,6 +24,11 @@ jest.mock("../../../Common/dataAccess/updateCollection", () => ({
     changeFeedPolicy: undefined,
     analyticalStorageTtl: undefined,
     geospatialConfig: undefined,
+    dataMaskingPolicy: {
+      includedPaths: [],
+      excludedPaths: ["/excludedPath"],
+      isPolicyEnabled: true,
+    },
     indexes: [],
   }),
 }));
@@ -92,7 +97,6 @@ describe("SettingsComponent", () => {
     const settingsComponentInstance = wrapper.instance() as SettingsComponent;
     expect(settingsComponentInstance.hasProvisioningTypeChanged()).toEqual(false);
     wrapper.setState({
-      userCanChangeProvisioningTypes: true,
       isAutoPilotSelected: true,
       wasAutopilotOriginallySet: false,
       autoPilotThroughput: 1000,
@@ -286,4 +290,157 @@ describe("SettingsComponent", () => {
 
     expect(wrapper.state("isThroughputBucketsSaveable")).toBe(false);
   });
+
+  it("should handle data masking policy updates correctly", async () => {
+    updateUserContext({
+      apiType: "SQL",
+      authType: AuthType.AAD,
+    });
+
+    const wrapper = shallow(<SettingsComponent {...baseProps} />);
+    const settingsComponentInstance = wrapper.instance() as SettingsComponent;
+
+    wrapper.setState({
+      dataMaskingContent: {
+        includedPaths: [],
+        excludedPaths: ["/excludedPath"],
+        isPolicyEnabled: true,
+      },
+      dataMaskingContentBaseline: {
+        includedPaths: [],
+        excludedPaths: [],
+        isPolicyEnabled: false,
+      },
+      isDataMaskingDirty: true,
+    });
+
+    await settingsComponentInstance.onSaveClick();
+
+    // The test needs to match what onDataMaskingContentChange returns
+    expect(updateCollection).toHaveBeenCalled();
+
+    expect(wrapper.state("isDataMaskingDirty")).toBe(false);
+    expect(wrapper.state("dataMaskingContentBaseline")).toEqual({
+      includedPaths: [],
+      excludedPaths: ["/excludedPath"],
+      isPolicyEnabled: true,
+    });
+  });
+
+  it("should validate data masking policy content", () => {
+    const wrapper = shallow(<SettingsComponent {...baseProps} />);
+    const settingsComponentInstance = wrapper.instance() as SettingsComponent;
+
+    // Test with invalid data structure
+    // Use invalid data type for testing validation
+    type InvalidPolicy = Omit<DataModels.DataMaskingPolicy, "includedPaths"> & { includedPaths: string };
+    const invalidPolicy: InvalidPolicy = {
+      includedPaths: "invalid",
+      excludedPaths: [],
+      isPolicyEnabled: false,
+    };
+    // Use type assertion since we're deliberately testing with invalid data
+    settingsComponentInstance["onDataMaskingContentChange"](invalidPolicy as unknown as DataModels.DataMaskingPolicy);
+
+    // State should update with the content but also set validation errors
+    expect(wrapper.state("dataMaskingContent")).toEqual({
+      includedPaths: "invalid",
+      excludedPaths: [],
+      isPolicyEnabled: false,
+    });
+    expect(wrapper.state("dataMaskingValidationErrors")).toEqual(["includedPaths must be an array"]);
+
+    // Test with valid data
+    const validPolicy = {
+      includedPaths: [
+        {
+          path: "/path1",
+          strategy: "mask",
+          startPosition: 0,
+          length: 4,
+        },
+      ],
+      excludedPaths: ["/excludedPath"],
+      isPolicyEnabled: true,
+    };
+
+    settingsComponentInstance["onDataMaskingContentChange"](validPolicy);
+
+    // State should update with valid data and no validation errors
+    expect(wrapper.state("dataMaskingContent")).toEqual(validPolicy);
+    expect(wrapper.state("dataMaskingValidationErrors")).toEqual([]);
+  });
+
+  it("should handle data masking discard correctly", () => {
+    const wrapper = shallow(<SettingsComponent {...baseProps} />);
+    const settingsComponentInstance = wrapper.instance() as SettingsComponent;
+
+    const baselinePolicy = {
+      includedPaths: [
+        {
+          path: "/basePath",
+          strategy: "mask",
+          startPosition: 0,
+          length: 4,
+        },
+      ],
+      excludedPaths: ["/excludedPath1"],
+      isPolicyEnabled: false,
+    };
+
+    const modifiedPolicy = {
+      includedPaths: [
+        {
+          path: "/newPath",
+          strategy: "mask",
+          startPosition: 1,
+          length: 5,
+        },
+      ],
+      excludedPaths: ["/excludedPath2"],
+      isPolicyEnabled: true,
+    };
+
+    // Set initial state
+    wrapper.setState({
+      dataMaskingContent: modifiedPolicy,
+      dataMaskingContentBaseline: baselinePolicy,
+      isDataMaskingDirty: true,
+    });
+
+    // Call revert
+    settingsComponentInstance.onRevertClick();
+
+    // Verify state is reset
+    expect(wrapper.state("dataMaskingContent")).toEqual(baselinePolicy);
+    expect(wrapper.state("isDataMaskingDirty")).toBe(false);
+    expect(wrapper.state("shouldDiscardDataMasking")).toBe(true);
+  });
+
+  it("should disable save button when data masking has validation errors", () => {
+    const wrapper = shallow(<SettingsComponent {...baseProps} />);
+    const settingsComponentInstance = wrapper.instance() as SettingsComponent;
+
+    // Initially, save button should be disabled
+    expect(settingsComponentInstance.isSaveSettingsButtonEnabled()).toBe(false);
+
+    // Make data masking dirty with valid data
+    wrapper.setState({
+      isDataMaskingDirty: true,
+      dataMaskingValidationErrors: [],
+    });
+    expect(settingsComponentInstance.isSaveSettingsButtonEnabled()).toBe(true);
+
+    // Add validation errors - save should be disabled
+    wrapper.setState({
+      dataMaskingValidationErrors: ["includedPaths must be an array"],
+    });
+    expect(settingsComponentInstance.isSaveSettingsButtonEnabled()).toBe(false);
+
+    // Clear validation errors - save should be enabled again
+    wrapper.setState({
+      dataMaskingValidationErrors: [],
+    });
+    expect(settingsComponentInstance.isSaveSettingsButtonEnabled()).toBe(true);
+  });
 });

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -15,7 +15,7 @@ import {
 } from "Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent";
 import { useDatabases } from "Explorer/useDatabases";
 import { isFabricNative } from "Platform/Fabric/FabricUtil";
-import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import { isCapabilityEnabled, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { isRunningOnPublicCloud } from "Utils/CloudUtils";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
@@ -47,6 +47,7 @@ import {
   ConflictResolutionComponent,
   ConflictResolutionComponentProps,
 } from "./SettingsSubComponents/ConflictResolutionComponent";
+import { DataMaskingComponent, DataMaskingComponentProps } from "./SettingsSubComponents/DataMaskingComponent";
 import {
   GlobalSecondaryIndexComponent,
   GlobalSecondaryIndexComponentProps,
@@ -151,6 +152,12 @@ export interface SettingsComponentState {
   conflictResolutionPolicyProcedureBaseline: string;
   isConflictResolutionDirty: boolean;
 
+  dataMaskingContent: DataModels.DataMaskingPolicy;
+  dataMaskingContentBaseline: DataModels.DataMaskingPolicy;
+  shouldDiscardDataMasking: boolean;
+  isDataMaskingDirty: boolean;
+  dataMaskingValidationErrors: string[];
+
   selectedTab: SettingsV2TabTypes;
 }
 
@@ -258,6 +265,12 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       shouldDiscardComputedProperties: false,
       isComputedPropertiesDirty: false,
 
+      dataMaskingContent: undefined,
+      dataMaskingContentBaseline: undefined,
+      shouldDiscardDataMasking: false,
+      isDataMaskingDirty: false,
+      dataMaskingValidationErrors: [],
+
       conflictResolutionPolicyMode: undefined,
       conflictResolutionPolicyModeBaseline: undefined,
       conflictResolutionPolicyPath: undefined,
@@ -334,7 +347,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   };
 
   public isSaveSettingsButtonEnabled = (): boolean => {
-    if (this.isOfferReplacePending()) {
+    if (this.isOfferReplacePending() || this.props.settingsTab.isExecuting()) {
       return false;
     }
 
@@ -342,6 +355,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       return false;
     }
 
+    if (this.state.dataMaskingValidationErrors.length > 0) {
+      return false;
+    }
+
     return (
       this.state.isScaleSaveable ||
       this.state.isSubSettingsSaveable ||
@@ -349,12 +366,16 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.state.isIndexingPolicyDirty ||
       this.state.isConflictResolutionDirty ||
       this.state.isComputedPropertiesDirty ||
+      this.state.isDataMaskingDirty ||
       (!!this.state.currentMongoIndexes && this.state.isMongoIndexingPolicySaveable) ||
       this.state.isThroughputBucketsSaveable
     );
   };
 
   public isDiscardSettingsButtonEnabled = (): boolean => {
+    if (this.props.settingsTab.isExecuting()) {
+      return false;
+    }
     return (
       this.state.isScaleDiscardable ||
       this.state.isSubSettingsDiscardable ||
@@ -362,6 +383,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.state.isIndexingPolicyDirty ||
       this.state.isConflictResolutionDirty ||
       this.state.isComputedPropertiesDirty ||
+      this.state.isDataMaskingDirty ||
       (!!this.state.currentMongoIndexes && this.state.isMongoIndexingPolicyDiscardable) ||
       this.state.isThroughputBucketsSaveable
     );
@@ -417,7 +439,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         : this.saveDatabaseSettings(startKey));
     } catch (error) {
       this.props.settingsTab.isExecutionError(true);
-      console.error(error);
       traceFailure(
         Action.SettingsV2Updated,
         {
@@ -434,8 +455,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     } finally {
       this.props.settingsTab.isExecuting(false);
 
-      // Send message to Fabric no matter success or failure.
-      // In case of failure, saveCollectionSettings might have partially succeeded and Fabric needs to refresh
       if (isFabricNative() && this.isCollectionSettingsTab) {
         sendMessage({
           type: FabricMessageTypes.ContainerUpdated,
@@ -446,6 +465,9 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   };
 
   public onRevertClick = (): void => {
+    if (this.props.settingsTab.isExecuting()) {
+      return;
+    }
     trace(Action.SettingsV2Discarded, ActionModifiers.Mark, {
       message: "Settings Discarded",
     });
@@ -486,6 +508,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       computedPropertiesContent: this.state.computedPropertiesContentBaseline,
       shouldDiscardComputedProperties: true,
       isComputedPropertiesDirty: false,
+      dataMaskingContent: this.state.dataMaskingContentBaseline,
+      shouldDiscardDataMasking: true,
+      isDataMaskingDirty: false,
+      dataMaskingValidationErrors: [],
     });
   };
 
@@ -648,6 +674,36 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   private onComputedPropertiesDirtyChange = (isComputedPropertiesDirty: boolean): void =>
     this.setState({ isComputedPropertiesDirty: isComputedPropertiesDirty });
 
+  private onDataMaskingContentChange = (newDataMasking: DataModels.DataMaskingPolicy): void => {
+    if (!newDataMasking.excludedPaths) {
+      newDataMasking.excludedPaths = [];
+    }
+    if (!newDataMasking.includedPaths) {
+      newDataMasking.includedPaths = [];
+    }
+
+    const validationErrors = [];
+    if (!Array.isArray(newDataMasking.includedPaths)) {
+      validationErrors.push("includedPaths must be an array");
+    }
+    if (!Array.isArray(newDataMasking.excludedPaths)) {
+      validationErrors.push("excludedPaths must be an array");
+    }
+    if (typeof newDataMasking.isPolicyEnabled !== "boolean") {
+      validationErrors.push("isPolicyEnabled must be a boolean");
+    }
+
+    this.setState({
+      dataMaskingContent: newDataMasking,
+      dataMaskingValidationErrors: validationErrors,
+    });
+  };
+
+  private resetShouldDiscardDataMasking = (): void => this.setState({ shouldDiscardDataMasking: false });
+
+  private onDataMaskingDirtyChange = (isDataMaskingDirty: boolean): void =>
+    this.setState({ isDataMaskingDirty: isDataMaskingDirty });
+
   private calculateTotalThroughputUsed = (): void => {
     this.totalThroughputUsed = 0;
     (useDatabases.getState().databases || []).forEach(async (database) => {
@@ -772,6 +828,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     const fullTextPolicy: DataModels.FullTextPolicy =
       this.collection.fullTextPolicy && this.collection.fullTextPolicy();
     const indexingPolicyContent = this.collection.indexingPolicy();
+    const dataMaskingContent: DataModels.DataMaskingPolicy = {
+      includedPaths: this.collection.dataMaskingPolicy?.()?.includedPaths || [],
+      excludedPaths: this.collection.dataMaskingPolicy?.()?.excludedPaths || [],
+      isPolicyEnabled: this.collection.dataMaskingPolicy?.()?.isPolicyEnabled ?? true,
+    };
     const conflictResolutionPolicy: DataModels.ConflictResolutionPolicy =
       this.collection.conflictResolutionPolicy && this.collection.conflictResolutionPolicy();
     const conflictResolutionPolicyMode = parseConflictResolutionMode(conflictResolutionPolicy?.mode);
@@ -824,11 +885,14 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       geospatialConfigTypeBaseline: geoSpatialConfigType,
       computedPropertiesContent: computedPropertiesContent,
       computedPropertiesContentBaseline: computedPropertiesContent,
+      dataMaskingContent: dataMaskingContent,
+      dataMaskingContentBaseline: dataMaskingContent,
     };
   };
 
   private getTabsButtons = (): CommandButtonComponentProps[] => {
     const buttons: CommandButtonComponentProps[] = [];
+    const isExecuting = this.props.settingsTab.isExecuting();
     if (this.saveSettingsButton.isVisible()) {
       const label = "Save";
       buttons.push({
@@ -838,7 +902,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         commandButtonLabel: label,
         ariaLabel: label,
         hasPopup: false,
-        disabled: !this.saveSettingsButton.isEnabled(),
+        disabled: isExecuting || !this.saveSettingsButton.isEnabled(),
       });
     }
 
@@ -847,11 +911,16 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       buttons.push({
         iconSrc: DiscardIcon,
         iconAlt: label,
-        onCommandClick: this.onRevertClick,
+        onCommandClick: () => {
+          if (isExecuting) {
+            return;
+          }
+          this.onRevertClick();
+        },
         commandButtonLabel: label,
         ariaLabel: label,
         hasPopup: false,
-        disabled: !this.discardSettingsChangesButton.isEnabled(),
+        disabled: isExecuting || !this.discardSettingsChangesButton.isEnabled(),
       });
     }
     return buttons;
@@ -949,7 +1018,8 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.state.isContainerPolicyDirty ||
       this.state.isIndexingPolicyDirty ||
       this.state.isConflictResolutionDirty ||
-      this.state.isComputedPropertiesDirty
+      this.state.isComputedPropertiesDirty ||
+      this.state.isDataMaskingDirty
     ) {
       let defaultTtl: number;
       switch (this.state.timeToLive) {
@@ -972,6 +1042,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
 
       newCollection.fullTextPolicy = this.state.fullTextPolicy;
 
+      // Only send data masking policy if it was modified (dirty)
+      if (this.state.isDataMaskingDirty && isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking)) {
+        newCollection.dataMaskingPolicy = this.state.dataMaskingContent;
+      }
+
       newCollection.indexingPolicy = this.state.indexingPolicyContent;
 
       newCollection.changeFeedPolicy =
@@ -1017,13 +1092,18 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         await this.refreshIndexTransformationProgress();
       }
 
+      // Update collection object with new data
+      this.collection.dataMaskingPolicy(updatedCollection.dataMaskingPolicy);
+
       this.setState({
+        dataMaskingContentBaseline: this.state.dataMaskingContent,
         isSubSettingsSaveable: false,
         isSubSettingsDiscardable: false,
         isContainerPolicyDirty: false,
         isIndexingPolicyDirty: false,
         isConflictResolutionDirty: false,
         isComputedPropertiesDirty: false,
+        isDataMaskingDirty: false,
       });
     }
 
@@ -1353,6 +1433,31 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       });
     }
 
+    // Check if DDM should be enabled
+    const shouldEnableDDM = (): boolean => {
+      const hasDataMaskingCapability = isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking);
+      const isSqlAccount = userContext.apiType === "SQL";
+
+      return isSqlAccount && hasDataMaskingCapability; // Only show for SQL accounts with DDM capability
+    };
+
+    if (shouldEnableDDM()) {
+      const dataMaskingComponentProps: DataMaskingComponentProps = {
+        shouldDiscardDataMasking: this.state.shouldDiscardDataMasking,
+        resetShouldDiscardDataMasking: this.resetShouldDiscardDataMasking,
+        dataMaskingContent: this.state.dataMaskingContent,
+        dataMaskingContentBaseline: this.state.dataMaskingContentBaseline,
+        onDataMaskingContentChange: this.onDataMaskingContentChange,
+        onDataMaskingDirtyChange: this.onDataMaskingDirtyChange,
+        validationErrors: this.state.dataMaskingValidationErrors,
+      };
+
+      tabs.push({
+        tab: SettingsV2TabTypes.DataMaskingTab,
+        content: <DataMaskingComponent {...dataMaskingComponentProps} />,
+      });
+    }
+
     if (this.throughputBucketsEnabled && !hasDatabaseSharedThroughput(this.collection) && this.offer) {
       tabs.push({
         tab: SettingsV2TabTypes.ThroughputBucketsTab,

src/Explorer/Controls/Settings/SettingsRenderUtils.test.tsx

@@ -69,13 +69,111 @@ describe("SettingsUtils functions", () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it("should return correct price breakdown for a manual RU setting of 500, 1 region, multimaster disabled", () => {
-    const prices = getRuPriceBreakdown(500, "", 1, false, false);
-    expect(prices.hourlyPrice).toBe(0.04);
-    expect(prices.dailyPrice).toBe(0.96);
-    expect(prices.monthlyPrice).toBe(29.2);
-    expect(prices.pricePerRu).toBe(0.00008);
-    expect(prices.currency).toBe("USD");
-    expect(prices.currencySign).toBe("$");
+  describe("getRuPriceBreakdown", () => {
+    it("should return correct price breakdown for a manual RU setting of 500, 1 region, multimaster disabled", () => {
+      const prices = getRuPriceBreakdown(500, "", 1, false, false);
+      expect(prices.hourlyPrice).toBe(0.04);
+      expect(prices.dailyPrice).toBe(0.96);
+      expect(prices.monthlyPrice).toBe(29.2);
+      expect(prices.pricePerRu).toBe(0.00008);
+      expect(prices.currency).toBe("USD");
+      expect(prices.currencySign).toBe("$");
+    });
+
+    it("should return correct price breakdown for autoscale", () => {
+      const prices = getRuPriceBreakdown(1000, "", 1, false, true);
+      // For autoscale, the baseline RU is 10% of max RU
+      expect(prices.hourlyPrice).toBe(0.12); // Higher because autoscale pricing is different
+      expect(prices.dailyPrice).toBe(2.88); // hourlyPrice * 24
+      expect(prices.monthlyPrice).toBe(87.6); // hourlyPrice * 730
+      expect(prices.pricePerRu).toBe(0.00012); // Autoscale price per RU
+      expect(prices.currency).toBe("USD");
+      expect(prices.currencySign).toBe("$");
+    });
+
+    it("should return correct price breakdown for multimaster", () => {
+      const prices = getRuPriceBreakdown(500, "", 2, true, false);
+      // For multimaster with 2 regions, price is multiplied by 4
+      expect(prices.hourlyPrice).toBe(0.16); // Base price * 4
+      expect(prices.dailyPrice).toBe(3.84); // hourlyPrice * 24
+      expect(prices.monthlyPrice).toBe(116.8); // hourlyPrice * 730
+      expect(prices.pricePerRu).toBe(0.00016); // Base price per RU * 2 (regions) * 2 (multimaster)
+      expect(prices.currency).toBe("USD");
+      expect(prices.currencySign).toBe("$");
+    });
+  });
+
+  describe("message formatting", () => {
+    it("should format throughput apply delayed message correctly", () => {
+      const message = getThroughputApplyDelayedMessage(false, 1000, "RU/s", "testDb", "testColl", 2000);
+      const wrapper = shallow(message);
+      const text = wrapper.text();
+      expect(text).toContain("testDb");
+      expect(text).toContain("testColl");
+      expect(text).toContain("Current manual throughput: 1000 RU/s");
+      expect(text).toContain("Target manual throughput: 2000");
+    });
+
+    it("should format autoscale throughput message correctly", () => {
+      const message = getThroughputApplyDelayedMessage(true, 1000, "RU/s", "testDb", "testColl", 2000);
+      const wrapper = shallow(message);
+      const text = wrapper.text();
+      expect(text).toContain("Current autoscale throughput: 100 - 1000 RU/s");
+      expect(text).toContain("Target autoscale throughput: 200 - 2000 RU/s");
+    });
+  });
+
+  describe("estimated spending element", () => {
+    // Mock Stack component since we're using shallow rendering
+    const mockStack = ({ children }: { children: React.ReactNode }) => <div>{children}</div>;
+
+    beforeEach(() => {
+      jest.mock("@fluentui/react", () => ({
+        ...jest.requireActual("@fluentui/react"),
+        Stack: mockStack,
+      }));
+    });
+
+    afterEach(() => {
+      jest.resetModules();
+    });
+
+    it("should render correct spending info for manual throughput", () => {
+      const costElement = <div>Cost</div>;
+      const priceBreakdown: PriceBreakdown = {
+        hourlyPrice: 1.0,
+        dailyPrice: 24.0,
+        monthlyPrice: 730.0,
+        pricePerRu: 0.0001,
+        currency: "USD",
+        currencySign: "$",
+      };
+
+      const element = getEstimatedSpendingElement(costElement, 1000, 1, priceBreakdown, false);
+      const wrapper = shallow(element);
+      const spendElement = wrapper.find("#throughputSpendElement");
+
+      expect(spendElement.find("span").at(0).text()).toBe("1 region");
+      expect(spendElement.find("span").at(1).text()).toBe("1000 RU/s");
+      expect(spendElement.find("span").at(2).text()).toBe("$0.0001/RU");
+    });
+
+    it("should render correct spending info for autoscale throughput", () => {
+      const costElement = <div>Cost</div>;
+      const priceBreakdown: PriceBreakdown = {
+        hourlyPrice: 1.0,
+        dailyPrice: 24.0,
+        monthlyPrice: 730.0,
+        pricePerRu: 0.0001,
+        currency: "USD",
+        currencySign: "$",
+      };
+
+      const element = getEstimatedSpendingElement(costElement, 1000, 1, priceBreakdown, true);
+      const wrapper = shallow(element);
+      const spendElement = wrapper.find("#throughputSpendElement");
+
+      expect(spendElement.find("span").at(1).text()).toBe("100 RU/s - 1000 RU/s");
+    });
   });
 });

src/Explorer/Controls/Settings/SettingsRenderUtils.tsx

@@ -61,7 +61,7 @@ export interface PriceBreakdown {
   currencySign: string;
 }
 
-export type editorType = "indexPolicy" | "computedProperties";
+export type editorType = "indexPolicy" | "computedProperties" | "dataMasking";
 
 export const infoAndToolTipTextStyle: ITextStyles = { root: { fontSize: 14, color: "windowtext" } };
 
@@ -170,6 +170,14 @@ export const messageBarStyles: Partial<IMessageBarStyles> = {
   text: { fontSize: 14 },
 };
 
+export const unsavedEditorMessageBarStyles: Partial<IMessageBarStyles> = {
+  root: {
+    marginTop: "5px",
+    padding: "8px 12px",
+  },
+  text: { fontSize: 14 },
+};
+
 export const throughputUnit = "RU/s";
 
 export function onRenderRow(props: IDetailsRowProps): JSX.Element {
@@ -259,7 +267,12 @@ export const ttlWarning: JSX.Element = (
 export const unsavedEditorWarningMessage = (editor: editorType): JSX.Element => (
   <Text styles={infoAndToolTipTextStyle}>
     You have not saved the latest changes made to your{" "}
-    {editor === "indexPolicy" ? "indexing policy" : "computed properties"}. Please click save to confirm the changes.
+    {editor === "indexPolicy"
+      ? "indexing policy"
+      : editor === "dataMasking"
+      ? "data masking policy"
+      : "computed properties"}
+    . Please click save to confirm the changes.
   </Text>
 );
 

src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.test.tsx

@@ -0,0 +1,210 @@
+import { MessageBar, MessageBarType } from "@fluentui/react";
+import { mount } from "enzyme";
+import React from "react";
+import * as DataModels from "../../../../Contracts/DataModels";
+import { DataMaskingComponent } from "./DataMaskingComponent";
+
+const mockGetValue = jest.fn();
+const mockSetValue = jest.fn();
+const mockOnDidChangeContent = jest.fn();
+const mockGetModel = jest.fn(() => ({
+  getValue: mockGetValue,
+  setValue: mockSetValue,
+  onDidChangeContent: mockOnDidChangeContent,
+}));
+
+const mockEditor = {
+  getModel: mockGetModel,
+  dispose: jest.fn(),
+};
+
+jest.mock("../../../LazyMonaco", () => ({
+  loadMonaco: jest.fn(() =>
+    Promise.resolve({
+      editor: {
+        create: jest.fn(() => mockEditor),
+      },
+    }),
+  ),
+}));
+
+jest.mock("../../../../Utils/CapabilityUtils", () => ({
+  isCapabilityEnabled: jest.fn().mockReturnValue(true),
+}));
+
+describe("DataMaskingComponent", () => {
+  const mockProps = {
+    shouldDiscardDataMasking: false,
+    resetShouldDiscardDataMasking: jest.fn(),
+    dataMaskingContent: undefined as DataModels.DataMaskingPolicy,
+    dataMaskingContentBaseline: undefined as DataModels.DataMaskingPolicy,
+    onDataMaskingContentChange: jest.fn(),
+    onDataMaskingDirtyChange: jest.fn(),
+    validationErrors: [] as string[],
+  };
+
+  const samplePolicy: DataModels.DataMaskingPolicy = {
+    includedPaths: [
+      {
+        path: "/test",
+        strategy: "Default",
+        startPosition: 0,
+        length: -1,
+      },
+    ],
+    excludedPaths: [],
+    isPolicyEnabled: false,
+  };
+
+  let changeContentCallback: () => void;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockGetValue.mockReturnValue(JSON.stringify(samplePolicy));
+    mockOnDidChangeContent.mockImplementation((callback) => {
+      changeContentCallback = callback;
+    });
+  });
+
+  it("renders without crashing", async () => {
+    const wrapper = mount(<DataMaskingComponent {...mockProps} />);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+    expect(wrapper.exists()).toBeTruthy();
+  });
+
+  it("displays warning message when content is dirty", async () => {
+    const wrapper = mount(
+      <DataMaskingComponent
+        {...mockProps}
+        dataMaskingContent={samplePolicy}
+        dataMaskingContentBaseline={{ ...samplePolicy, isPolicyEnabled: true }}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Verify editor div is rendered
+    const editorDiv = wrapper.find(".settingsV2Editor");
+    expect(editorDiv.exists()).toBeTruthy();
+
+    // Warning message should be visible when content is dirty
+    const messageBar = wrapper.find(MessageBar);
+    expect(messageBar.exists()).toBeTruthy();
+    expect(messageBar.prop("messageBarType")).toBe(MessageBarType.warning);
+  });
+
+  it("updates content and dirty state on valid JSON input", async () => {
+    const wrapper = mount(<DataMaskingComponent {...mockProps} />);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Simulate valid JSON input by setting mock return value and triggering callback
+    const validJson = JSON.stringify(samplePolicy);
+    mockGetValue.mockReturnValue(validJson);
+    changeContentCallback();
+
+    expect(mockProps.onDataMaskingContentChange).toHaveBeenCalledWith(samplePolicy);
+    expect(mockProps.onDataMaskingDirtyChange).toHaveBeenCalledWith(true);
+  });
+
+  it("doesn't update content on invalid JSON input", async () => {
+    const wrapper = mount(<DataMaskingComponent {...mockProps} />);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Simulate invalid JSON input
+    const invalidJson = "{invalid:json}";
+    mockGetValue.mockReturnValue(invalidJson);
+    changeContentCallback();
+
+    expect(mockProps.onDataMaskingContentChange).not.toHaveBeenCalled();
+  });
+
+  it("resets content when shouldDiscardDataMasking is true", async () => {
+    const baselinePolicy = { ...samplePolicy, isPolicyEnabled: true };
+
+    const wrapper = mount(
+      <DataMaskingComponent
+        {...mockProps}
+        dataMaskingContent={samplePolicy}
+        dataMaskingContentBaseline={baselinePolicy}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Now update props to trigger shouldDiscardDataMasking
+    wrapper.setProps({ shouldDiscardDataMasking: true });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Check that reset was triggered
+    expect(mockProps.resetShouldDiscardDataMasking).toHaveBeenCalled();
+    expect(mockSetValue).toHaveBeenCalledWith(JSON.stringify(samplePolicy, undefined, 4));
+  });
+
+  it("recalculates dirty state when baseline changes", async () => {
+    const wrapper = mount(
+      <DataMaskingComponent
+        {...mockProps}
+        dataMaskingContent={samplePolicy}
+        dataMaskingContentBaseline={samplePolicy}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Update baseline to trigger componentDidUpdate
+    const newBaseline = { ...samplePolicy, isPolicyEnabled: true };
+    wrapper.setProps({ dataMaskingContentBaseline: newBaseline });
+
+    expect(mockProps.onDataMaskingDirtyChange).toHaveBeenCalledWith(true);
+  });
+
+  it("validates required fields in policy", async () => {
+    const wrapper = mount(<DataMaskingComponent {...mockProps} />);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // Test with missing required fields
+    const invalidPolicy: Record<string, unknown> = {
+      includedPaths: "not an array",
+      excludedPaths: [] as string[],
+      isPolicyEnabled: "not a boolean",
+    };
+
+    mockGetValue.mockReturnValue(JSON.stringify(invalidPolicy));
+    changeContentCallback();
+
+    // Parent callback should be called even with invalid data (parent will validate)
+    expect(mockProps.onDataMaskingContentChange).toHaveBeenCalledWith(invalidPolicy);
+  });
+
+  it("maintains dirty state after multiple content changes", async () => {
+    const wrapper = mount(
+      <DataMaskingComponent
+        {...mockProps}
+        dataMaskingContent={samplePolicy}
+        dataMaskingContentBaseline={samplePolicy}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    wrapper.update();
+
+    // First change
+    const modifiedPolicy1 = { ...samplePolicy, isPolicyEnabled: true };
+    mockGetValue.mockReturnValue(JSON.stringify(modifiedPolicy1));
+    changeContentCallback();
+    expect(mockProps.onDataMaskingDirtyChange).toHaveBeenCalledWith(true);
+
+    // Second change back to baseline
+    mockGetValue.mockReturnValue(JSON.stringify(samplePolicy));
+    changeContentCallback();
+    expect(mockProps.onDataMaskingDirtyChange).toHaveBeenCalledWith(false);
+  });
+});

src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.tsx

@@ -0,0 +1,162 @@
+import { MessageBar, MessageBarType, Stack } from "@fluentui/react";
+import * as monaco from "monaco-editor";
+import * as React from "react";
+import * as Constants from "../../../../Common/Constants";
+import * as DataModels from "../../../../Contracts/DataModels";
+import { isCapabilityEnabled } from "../../../../Utils/CapabilityUtils";
+import { loadMonaco } from "../../../LazyMonaco";
+import { titleAndInputStackProps, unsavedEditorWarningMessage } from "../SettingsRenderUtils";
+import { isDirty as isContentDirty } from "../SettingsUtils";
+
+export interface DataMaskingComponentProps {
+  shouldDiscardDataMasking: boolean;
+  resetShouldDiscardDataMasking: () => void;
+  dataMaskingContent: DataModels.DataMaskingPolicy;
+  dataMaskingContentBaseline: DataModels.DataMaskingPolicy;
+  onDataMaskingContentChange: (dataMasking: DataModels.DataMaskingPolicy) => void;
+  onDataMaskingDirtyChange: (isDirty: boolean) => void;
+  validationErrors: string[];
+}
+
+interface DataMaskingComponentState {
+  isDirty: boolean;
+  dataMaskingContentIsValid: boolean;
+}
+
+const emptyDataMaskingPolicy: DataModels.DataMaskingPolicy = {
+  includedPaths: [
+    {
+      path: "/",
+      strategy: "Default",
+      startPosition: 0,
+      length: -1,
+    },
+  ],
+  excludedPaths: [],
+  isPolicyEnabled: true,
+};
+
+export class DataMaskingComponent extends React.Component<DataMaskingComponentProps, DataMaskingComponentState> {
+  private dataMaskingDiv = React.createRef<HTMLDivElement>();
+  private dataMaskingEditor: monaco.editor.IStandaloneCodeEditor;
+  private shouldCheckComponentIsDirty = true;
+
+  constructor(props: DataMaskingComponentProps) {
+    super(props);
+    this.state = {
+      isDirty: false,
+      dataMaskingContentIsValid: true,
+    };
+  }
+
+  public componentDidUpdate(): void {
+    if (this.props.shouldDiscardDataMasking) {
+      this.resetDataMaskingEditor();
+      this.props.resetShouldDiscardDataMasking();
+    }
+    this.onComponentUpdate();
+  }
+
+  componentDidMount(): void {
+    this.resetDataMaskingEditor();
+    this.onComponentUpdate();
+  }
+
+  private onComponentUpdate = (): void => {
+    if (!this.shouldCheckComponentIsDirty) {
+      this.shouldCheckComponentIsDirty = true;
+      return;
+    }
+    this.props.onDataMaskingDirtyChange(this.IsComponentDirty());
+    this.shouldCheckComponentIsDirty = false;
+  };
+
+  public IsComponentDirty = (): boolean => {
+    if (
+      isContentDirty(this.props.dataMaskingContent, this.props.dataMaskingContentBaseline) &&
+      this.state.dataMaskingContentIsValid
+    ) {
+      return true;
+    }
+    return false;
+  };
+
+  private resetDataMaskingEditor = (): void => {
+    if (!this.dataMaskingEditor) {
+      this.createDataMaskingEditor();
+    } else {
+      const dataMaskingEditorModel = this.dataMaskingEditor.getModel();
+      const value: string = JSON.stringify(this.props.dataMaskingContent || emptyDataMaskingPolicy, undefined, 4);
+      dataMaskingEditorModel.setValue(value);
+    }
+    this.onComponentUpdate();
+  };
+
+  private async createDataMaskingEditor(): Promise<void> {
+    const value: string = JSON.stringify(this.props.dataMaskingContent || emptyDataMaskingPolicy, undefined, 4);
+    const monaco = await loadMonaco();
+    this.dataMaskingEditor = monaco.editor.create(this.dataMaskingDiv.current, {
+      value: value,
+      language: "json",
+      automaticLayout: true,
+      ariaLabel: "Data Masking Policy",
+      fontSize: 13,
+      minimap: { enabled: false },
+      wordWrap: "off",
+      scrollBeyondLastLine: false,
+      lineNumbers: "on",
+    });
+    if (this.dataMaskingEditor) {
+      const dataMaskingEditorModel = this.dataMaskingEditor.getModel();
+      dataMaskingEditorModel.onDidChangeContent(this.onEditorContentChange.bind(this));
+    }
+  }
+
+  private onEditorContentChange = (): void => {
+    const dataMaskingEditorModel = this.dataMaskingEditor.getModel();
+    try {
+      const newContent = JSON.parse(dataMaskingEditorModel.getValue()) as DataModels.DataMaskingPolicy;
+
+      // Always call parent's validation - it will handle validation and store errors
+      this.props.onDataMaskingContentChange(newContent);
+
+      const isDirty = isContentDirty(newContent, this.props.dataMaskingContentBaseline);
+      this.setState(
+        {
+          dataMaskingContentIsValid: this.props.validationErrors.length === 0,
+          isDirty,
+        },
+        () => {
+          this.props.onDataMaskingDirtyChange(isDirty);
+        },
+      );
+    } catch (e) {
+      // Invalid JSON - mark as invalid without propagating
+      this.setState({
+        dataMaskingContentIsValid: false,
+        isDirty: false,
+      });
+    }
+  };
+
+  public render(): JSX.Element {
+    if (!isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking)) {
+      return null;
+    }
+
+    const isDirty = this.IsComponentDirty();
+    return (
+      <Stack {...titleAndInputStackProps}>
+        {isDirty && (
+          <MessageBar messageBarType={MessageBarType.warning}>{unsavedEditorWarningMessage("dataMasking")}</MessageBar>
+        )}
+        {this.props.validationErrors.length > 0 && (
+          <MessageBar messageBarType={MessageBarType.error}>
+            Validation failed: {this.props.validationErrors.join(", ")}
+          </MessageBar>
+        )}
+        <div className="settingsV2Editor" tabIndex={0} ref={this.dataMaskingDiv}></div>
+      </Stack>
+    );
+  }
+}

src/Explorer/Controls/Settings/SettingsUtils.test.tsx

@@ -5,7 +5,12 @@ import {
   getMongoIndexType,
   getMongoIndexTypeText,
   getMongoNotification,
+  getPartitionKeyName,
+  getPartitionKeyPlaceHolder,
+  getPartitionKeySubtext,
+  getPartitionKeyTooltipText,
   getSanitizedInputValue,
+  getTabTitle,
   hasDatabaseSharedThroughput,
   isDirty,
   isIndexTransforming,
@@ -14,6 +19,7 @@ import {
   MongoWildcardPlaceHolder,
   parseConflictResolutionMode,
   parseConflictResolutionProcedure,
+  SettingsV2TabTypes,
   SingleFieldText,
   WildcardText,
 } from "./SettingsUtils";
@@ -50,14 +56,46 @@ describe("SettingsUtils", () => {
     expect(hasDatabaseSharedThroughput(newCollection)).toEqual(true);
   });
 
-  it("parseConflictResolutionMode", () => {
-    expect(parseConflictResolutionMode("custom")).toEqual(DataModels.ConflictResolutionMode.Custom);
-    expect(parseConflictResolutionMode("lastwriterwins")).toEqual(DataModels.ConflictResolutionMode.LastWriterWins);
+  describe("parseConflictResolutionMode", () => {
+    it("parses valid modes correctly", () => {
+      expect(parseConflictResolutionMode("custom")).toEqual(DataModels.ConflictResolutionMode.Custom);
+      expect(parseConflictResolutionMode("lastwriterwins")).toEqual(DataModels.ConflictResolutionMode.LastWriterWins);
+      expect(parseConflictResolutionMode("Custom")).toEqual(DataModels.ConflictResolutionMode.Custom);
+      expect(parseConflictResolutionMode("CUSTOM")).toEqual(DataModels.ConflictResolutionMode.Custom);
+      expect(parseConflictResolutionMode("LastWriterWins")).toEqual(DataModels.ConflictResolutionMode.LastWriterWins);
+    });
+
+    it("handles empty/undefined input", () => {
+      expect(parseConflictResolutionMode(undefined)).toBeUndefined();
+      expect(parseConflictResolutionMode(null)).toBeUndefined();
+      expect(parseConflictResolutionMode("")).toBeUndefined();
+    });
+
+    it("defaults to LastWriterWins for invalid inputs", () => {
+      expect(parseConflictResolutionMode("invalid")).toEqual(DataModels.ConflictResolutionMode.LastWriterWins);
+      expect(parseConflictResolutionMode("123")).toEqual(DataModels.ConflictResolutionMode.LastWriterWins);
+    });
   });
 
-  it("parseConflictResolutionProcedure", () => {
-    expect(parseConflictResolutionProcedure("/dbs/db/colls/coll/sprocs/conflictResSproc")).toEqual("conflictResSproc");
-    expect(parseConflictResolutionProcedure("conflictResSproc")).toEqual("conflictResSproc");
+  describe("parseConflictResolutionProcedure", () => {
+    it("extracts procedure name from valid paths", () => {
+      expect(parseConflictResolutionProcedure("/dbs/db/colls/coll/sprocs/conflictResSproc")).toEqual(
+        "conflictResSproc",
+      );
+      expect(parseConflictResolutionProcedure("conflictResSproc")).toEqual("conflictResSproc");
+      expect(parseConflictResolutionProcedure("/dbs/mydb/colls/mycoll/sprocs/myProc")).toEqual("myProc");
+    });
+
+    it("handles empty/undefined input", () => {
+      expect(parseConflictResolutionProcedure(undefined)).toBeUndefined();
+      expect(parseConflictResolutionProcedure(null)).toBeUndefined();
+      expect(parseConflictResolutionProcedure("")).toBeUndefined();
+    });
+
+    it("handles invalid path formats", () => {
+      expect(parseConflictResolutionProcedure("/invalid/path")).toBeUndefined();
+      expect(parseConflictResolutionProcedure("/dbs/db/colls/coll/wrongtype/name")).toBeUndefined();
+    });
   });
 
   describe("isDirty", () => {
@@ -68,68 +106,235 @@ describe("SettingsUtils", () => {
       excludedPaths: [],
     } as DataModels.IndexingPolicy;
 
-    it("works on all types", () => {
-      expect(isDirty("baseline", "baseline")).toEqual(false);
-      expect(isDirty(0, 0)).toEqual(false);
-      expect(isDirty(true, true)).toEqual(false);
-      expect(isDirty(undefined, undefined)).toEqual(false);
-      expect(isDirty(indexingPolicy, indexingPolicy)).toEqual(false);
+    describe("primitive types", () => {
+      it("handles strings", () => {
+        expect(isDirty("baseline", "baseline")).toBeFalsy();
+        expect(isDirty("baseline", "current")).toBeTruthy();
+        expect(isDirty("", "")).toBeFalsy();
+        expect(isDirty("test", "")).toBeTruthy();
+      });
 
-      expect(isDirty("baseline", "current")).toEqual(true);
-      expect(isDirty(0, 1)).toEqual(true);
-      expect(isDirty(true, false)).toEqual(true);
-      expect(isDirty(undefined, indexingPolicy)).toEqual(true);
-      expect(isDirty(indexingPolicy, { ...indexingPolicy, automatic: false })).toEqual(true);
+      it("handles numbers", () => {
+        expect(isDirty(0, 0)).toBeFalsy();
+        expect(isDirty(1, 1)).toBeFalsy();
+        expect(isDirty(0, 1)).toBeTruthy();
+        expect(isDirty(-1, 1)).toBeTruthy();
+      });
+
+      it("handles booleans", () => {
+        expect(isDirty(true, true)).toBeFalsy();
+        expect(isDirty(false, false)).toBeFalsy();
+        expect(isDirty(true, false)).toBeTruthy();
+      });
+
+      it("handles undefined and null", () => {
+        expect(isDirty(undefined, undefined)).toBeFalsy();
+        expect(isDirty(null, null)).toBeFalsy();
+        expect(isDirty(undefined, null)).toBeTruthy();
+        expect(isDirty(undefined, "value")).toBeTruthy();
+      });
+    });
+
+    describe("complex types", () => {
+      it("handles indexing policy", () => {
+        expect(isDirty(indexingPolicy, indexingPolicy)).toBeFalsy();
+        expect(isDirty(indexingPolicy, { ...indexingPolicy, automatic: false })).toBeTruthy();
+        expect(isDirty(indexingPolicy, { ...indexingPolicy, includedPaths: ["/path"] })).toBeTruthy();
+      });
+
+      it("handles array type policies", () => {
+        const computedProperties: DataModels.ComputedProperties = [
+          { name: "prop1", query: "SELECT * FROM c" },
+          { name: "prop2", query: "SELECT * FROM c" },
+        ];
+        const otherProperties: DataModels.ComputedProperties = [{ name: "prop1", query: "SELECT * FROM c" }];
+        expect(isDirty(computedProperties, computedProperties)).toBeFalsy();
+        expect(isDirty(computedProperties, otherProperties)).toBeTruthy();
+      });
+    });
+
+    describe("type mismatch handling", () => {
+      it("throws error for mismatched types", () => {
+        expect(() => isDirty("string", 123)).toThrow("current and baseline values are not of the same type");
+        expect(() => isDirty(true, "true")).toThrow("current and baseline values are not of the same type");
+        expect(() => isDirty(0, false)).toThrow("current and baseline values are not of the same type");
+      });
     });
   });
 
-  it("getSanitizedInputValue", () => {
+  describe("getSanitizedInputValue", () => {
     const max = 100;
-    expect(getSanitizedInputValue("", max)).toEqual(0);
-    expect(getSanitizedInputValue("999", max)).toEqual(100);
-    expect(getSanitizedInputValue("10", max)).toEqual(10);
+
+    it("handles empty or invalid inputs", () => {
+      expect(getSanitizedInputValue("", max)).toEqual(0);
+      expect(getSanitizedInputValue("abc", max)).toEqual(0);
+      expect(getSanitizedInputValue("!@#", max)).toEqual(0);
+      expect(getSanitizedInputValue(null, max)).toEqual(0);
+      expect(getSanitizedInputValue(undefined, max)).toEqual(0);
+    });
+
+    it("handles valid inputs within max", () => {
+      expect(getSanitizedInputValue("10", max)).toEqual(10);
+      expect(getSanitizedInputValue("50", max)).toEqual(50);
+      expect(getSanitizedInputValue("100", max)).toEqual(100);
+    });
+
+    it("handles inputs exceeding max", () => {
+      expect(getSanitizedInputValue("101", max)).toEqual(100);
+      expect(getSanitizedInputValue("999", max)).toEqual(100);
+      expect(getSanitizedInputValue("1000000", max)).toEqual(100);
+    });
+
+    it("handles inputs without max constraint", () => {
+      expect(getSanitizedInputValue("10")).toEqual(10);
+      expect(getSanitizedInputValue("1000")).toEqual(1000);
+      expect(getSanitizedInputValue("999999")).toEqual(999999);
+    });
+
+    it("handles negative numbers", () => {
+      expect(getSanitizedInputValue("-10", max)).toEqual(-10);
+      expect(getSanitizedInputValue("-999", max)).toEqual(-999);
+    });
   });
 
-  it("getMongoIndexType", () => {
-    expect(getMongoIndexType(["Single"])).toEqual(MongoIndexTypes.Single);
-    expect(getMongoIndexType(["Wildcard.$**"])).toEqual(MongoIndexTypes.Wildcard);
-    expect(getMongoIndexType(["Key1", "Key2"])).toEqual(undefined);
+  describe("getMongoIndexType", () => {
+    it("correctly identifies single field indexes", () => {
+      expect(getMongoIndexType(["Single"])).toEqual(MongoIndexTypes.Single);
+      expect(getMongoIndexType(["field1"])).toEqual(MongoIndexTypes.Single);
+      expect(getMongoIndexType(["name"])).toEqual(MongoIndexTypes.Single);
+    });
+
+    it("correctly identifies wildcard indexes", () => {
+      expect(getMongoIndexType(["Wildcard.$**"])).toEqual(MongoIndexTypes.Wildcard);
+      expect(getMongoIndexType(["field.$**"])).toEqual(MongoIndexTypes.Wildcard);
+      expect(getMongoIndexType(["nested.path.$**"])).toEqual(MongoIndexTypes.Wildcard);
+    });
+
+    it("returns undefined for invalid or compound indexes", () => {
+      expect(getMongoIndexType(["Key1", "Key2"])).toBeUndefined();
+      expect(getMongoIndexType([])).toBeUndefined();
+      expect(getMongoIndexType(undefined)).toBeUndefined();
+    });
   });
 
-  it("getMongoIndexTypeText", () => {
-    expect(getMongoIndexTypeText(MongoIndexTypes.Single)).toEqual(SingleFieldText);
-    expect(getMongoIndexTypeText(MongoIndexTypes.Wildcard)).toEqual(WildcardText);
+  describe("getMongoIndexTypeText", () => {
+    it("returns correct text for single field indexes", () => {
+      expect(getMongoIndexTypeText(MongoIndexTypes.Single)).toEqual(SingleFieldText);
+    });
+
+    it("returns correct text for wildcard indexes", () => {
+      expect(getMongoIndexTypeText(MongoIndexTypes.Wildcard)).toEqual(WildcardText);
+    });
   });
 
-  it("getMongoNotification", () => {
+  describe("getMongoNotification", () => {
     const singleIndexDescription = "sampleKey";
     const wildcardIndexDescription = "sampleKey.$**";
 
-    let notification = getMongoNotification(singleIndexDescription, undefined);
-    expect(notification.message).toEqual("Please select a type for each index.");
-    expect(notification.type).toEqual(MongoNotificationType.Warning);
+    describe("type validation", () => {
+      it("returns warning when type is missing", () => {
+        const notification = getMongoNotification(singleIndexDescription, undefined);
+        expect(notification.message).toEqual("Please select a type for each index.");
+        expect(notification.type).toEqual(MongoNotificationType.Warning);
+      });
 
-    notification = getMongoNotification(singleIndexDescription, MongoIndexTypes.Single);
-    expect(notification).toEqual(undefined);
+      it("returns undefined for valid type and description combinations", () => {
+        expect(getMongoNotification(singleIndexDescription, MongoIndexTypes.Single)).toBeUndefined();
+        expect(getMongoNotification(wildcardIndexDescription, MongoIndexTypes.Wildcard)).toBeUndefined();
+      });
+    });
 
-    notification = getMongoNotification(wildcardIndexDescription, MongoIndexTypes.Wildcard);
-    expect(notification).toEqual(undefined);
+    describe("field name validation", () => {
+      it("returns error when field name is empty", () => {
+        const notification = getMongoNotification("", MongoIndexTypes.Single);
+        expect(notification.message).toEqual("Please enter a field name.");
+        expect(notification.type).toEqual(MongoNotificationType.Error);
 
-    notification = getMongoNotification("", MongoIndexTypes.Single);
-    expect(notification.message).toEqual("Please enter a field name.");
-    expect(notification.type).toEqual(MongoNotificationType.Error);
+        const whitespaceNotification = getMongoNotification("   ", MongoIndexTypes.Single);
+        expect(whitespaceNotification.message).toEqual("Please enter a field name.");
+        expect(whitespaceNotification.type).toEqual(MongoNotificationType.Error);
+      });
 
-    notification = getMongoNotification(singleIndexDescription, MongoIndexTypes.Wildcard);
-    expect(notification.message).toEqual(
-      "Wildcard path is not present in the field name. Use a pattern like " + MongoWildcardPlaceHolder,
-    );
-    expect(notification.type).toEqual(MongoNotificationType.Error);
+      it("returns error when wildcard index is missing $** pattern", () => {
+        const notification = getMongoNotification(singleIndexDescription, MongoIndexTypes.Wildcard);
+        expect(notification.message).toEqual(
+          "Wildcard path is not present in the field name. Use a pattern like " + MongoWildcardPlaceHolder,
+        );
+        expect(notification.type).toEqual(MongoNotificationType.Error);
+      });
+    });
+
+    it("handles undefined field name", () => {
+      const notification = getMongoNotification(undefined, MongoIndexTypes.Single);
+      expect(notification.message).toEqual("Please enter a field name.");
+      expect(notification.type).toEqual(MongoNotificationType.Error);
+    });
+  });
+  it("isIndexingTransforming", () => {
+    expect(isIndexTransforming(undefined)).toBeFalsy();
+    expect(isIndexTransforming(0)).toBeTruthy();
+    expect(isIndexTransforming(90)).toBeTruthy();
+    expect(isIndexTransforming(100)).toBeFalsy();
+  });
+
+  describe("getTabTitle", () => {
+    it("returns correct titles for each tab type", () => {
+      expect(getTabTitle(SettingsV2TabTypes.ScaleTab)).toBe("Scale");
+      expect(getTabTitle(SettingsV2TabTypes.ConflictResolutionTab)).toBe("Conflict Resolution");
+      expect(getTabTitle(SettingsV2TabTypes.SubSettingsTab)).toBe("Settings");
+      expect(getTabTitle(SettingsV2TabTypes.IndexingPolicyTab)).toBe("Indexing Policy");
+      expect(getTabTitle(SettingsV2TabTypes.ComputedPropertiesTab)).toBe("Computed Properties");
+      expect(getTabTitle(SettingsV2TabTypes.ContainerVectorPolicyTab)).toBe("Container Policies");
+      expect(getTabTitle(SettingsV2TabTypes.ThroughputBucketsTab)).toBe("Throughput Buckets");
+      expect(getTabTitle(SettingsV2TabTypes.DataMaskingTab)).toBe("Masking Policy (preview)");
+    });
+
+    it("handles partition key tab title based on fabric native", () => {
+      // Assuming initially not fabric native
+      expect(getTabTitle(SettingsV2TabTypes.PartitionKeyTab)).toBe("Partition Keys (preview)");
+    });
+
+    it("throws error for unknown tab type", () => {
+      expect(() => getTabTitle(999 as SettingsV2TabTypes)).toThrow("Unknown tab 999");
+    });
+  });
+
+  describe("partition key utils", () => {
+    it("getPartitionKeyName returns correct name based on API type", () => {
+      expect(getPartitionKeyName("Mongo")).toBe("Shard key");
+      expect(getPartitionKeyName("SQL")).toBe("Partition key");
+      expect(getPartitionKeyName("Mongo", true)).toBe("shard key");
+      expect(getPartitionKeyName("SQL", true)).toBe("partition key");
+    });
+
+    it("getPartitionKeyTooltipText returns correct tooltip based on API type", () => {
+      const mongoTooltip = getPartitionKeyTooltipText("Mongo");
+      expect(mongoTooltip).toContain("shard key");
+      expect(mongoTooltip).toContain("replica sets");
+
+      const sqlTooltip = getPartitionKeyTooltipText("SQL");
+      expect(sqlTooltip).toContain("partition key");
+      expect(sqlTooltip).toContain("id is often a good choice");
+    });
+
+    it("getPartitionKeySubtext returns correct subtext", () => {
+      expect(getPartitionKeySubtext(true, "SQL")).toBe(
+        "For small workloads, the item ID is a suitable choice for the partition key.",
+      );
+      expect(getPartitionKeySubtext(true, "Mongo")).toBe(
+        "For small workloads, the item ID is a suitable choice for the partition key.",
+      );
+      expect(getPartitionKeySubtext(false, "SQL")).toBe("");
+      expect(getPartitionKeySubtext(true, "Other")).toBe("");
+    });
+
+    it("getPartitionKeyPlaceHolder returns correct placeholder based on API type", () => {
+      expect(getPartitionKeyPlaceHolder("Mongo")).toBe("e.g., categoryId");
+      expect(getPartitionKeyPlaceHolder("Gremlin")).toBe("e.g., /address");
+      expect(getPartitionKeyPlaceHolder("SQL")).toBe("Required - first partition key e.g., /TenantId");
+      expect(getPartitionKeyPlaceHolder("SQL", 0)).toBe("second partition key e.g., /UserId");
+      expect(getPartitionKeyPlaceHolder("SQL", 1)).toBe("third partition key e.g., /SessionId");
+      expect(getPartitionKeyPlaceHolder("Other")).toBe("e.g., /address/zipCode");
+    });
   });
 });
-
-it("isIndexingTransforming", () => {
-  expect(isIndexTransforming(undefined)).toBeFalsy();
-  expect(isIndexTransforming(0)).toBeTruthy();
-  expect(isIndexTransforming(90)).toBeTruthy();
-  expect(isIndexTransforming(100)).toBeFalsy();
-});

src/Explorer/Controls/Settings/SettingsUtils.tsx

@@ -13,7 +13,8 @@ export type isDirtyTypes =
   | DataModels.ComputedProperties
   | DataModels.VectorEmbedding[]
   | DataModels.FullTextPolicy
-  | DataModels.ThroughputBucket[];
+  | DataModels.ThroughputBucket[]
+  | DataModels.DataMaskingPolicy;
 export const TtlOff = "off";
 export const TtlOn = "on";
 export const TtlOnNoDefault = "on-nodefault";
@@ -59,6 +60,7 @@ export enum SettingsV2TabTypes {
   ContainerVectorPolicyTab,
   ThroughputBucketsTab,
   GlobalSecondaryIndexTab,
+  DataMaskingTab,
 }
 
 export enum ContainerPolicyTabTypes {
@@ -175,6 +177,8 @@ export const getTabTitle = (tab: SettingsV2TabTypes): string => {
       return "Throughput Buckets";
     case SettingsV2TabTypes.GlobalSecondaryIndexTab:
       return "Global Secondary Index (Preview)";
+    case SettingsV2TabTypes.DataMaskingTab:
+      return "Masking Policy (preview)";
     default:
       throw new Error(`Unknown tab ${tab}`);
   }

src/Explorer/Controls/Settings/TestUtils.tsx

@@ -65,6 +65,11 @@ export const collection = {
     sourceCollectionId: "source1",
     sourceCollectionRid: "rid123",
   }),
+  dataMaskingPolicy: ko.observable<DataModels.DataMaskingPolicy>({
+    includedPaths: [],
+    excludedPaths: ["/excludedPath"],
+    isPolicyEnabled: true,
+  }),
   readSettings: () => {
     return;
   },

src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap

@@ -53,6 +53,7 @@ exports[`SettingsComponent renders 1`] = `
                   "parameters": [Function],
                 },
               },
+              "dataMaskingPolicy": [Function],
               "databaseId": "test",
               "defaultTtl": [Function],
               "fullTextPolicy": [Function],
@@ -145,6 +146,7 @@ exports[`SettingsComponent renders 1`] = `
                   "parameters": [Function],
                 },
               },
+              "dataMaskingPolicy": [Function],
               "databaseId": "test",
               "defaultTtl": [Function],
               "fullTextPolicy": [Function],
@@ -302,6 +304,7 @@ exports[`SettingsComponent renders 1`] = `
                   "parameters": [Function],
                 },
               },
+              "dataMaskingPolicy": [Function],
               "databaseId": "test",
               "defaultTtl": [Function],
               "fullTextPolicy": [Function],
@@ -442,6 +445,7 @@ exports[`SettingsComponent renders 1`] = `
                   "parameters": [Function],
                 },
               },
+              "dataMaskingPolicy": [Function],
               "databaseId": "test",
               "defaultTtl": [Function],
               "fullTextPolicy": [Function],

src/Explorer/Explorer.tsx

@@ -359,6 +359,14 @@ export default class Explorer {
     );
   }
 
+  public async openContainerCopyFeedbackBlade(): Promise<void> {
+    sendMessage({ type: MessageTypes.OpenContainerCopyFeedbackBlade });
+    Logger.logInfo(
+      `Container Copy Feedback logging current date when survey is shown ${Date.now().toString()}`,
+      "Explorer/openContainerCopyFeedbackBlade",
+    );
+  }
+
   public async refreshDatabaseForResourceToken(): Promise<void> {
     const databaseId = userContext.parsedResourceToken?.databaseId;
     const collectionId = userContext.parsedResourceToken?.collectionId;
@@ -1016,7 +1024,7 @@ export default class Explorer {
         break;
 
       case ViewModels.TerminalKind.VCoreMongo:
-        title = "VCoreMongo Shell";
+        title = "Mongo Shell";
         break;
 
       default:

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts

@@ -136,7 +136,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
 
   describe("Open Postgres and vCore Mongo buttons", () => {
     const openPostgresShellButtonLabel = "Open PSQL shell";
-    const openVCoreMongoShellButtonLabel = "Open MongoDB (vCore) shell";
+    const openVCoreMongoShellButtonLabel = "Open MongoDB (DocumentDB) shell";
 
     beforeAll(() => {
       mockExplorer = {} as Explorer;

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -450,7 +450,7 @@ function createOpenTerminalButtonByKind(
       case ViewModels.TerminalKind.Postgres:
         return "PSQL";
       case ViewModels.TerminalKind.VCoreMongo:
-        return "MongoDB (vCore)";
+        return "MongoDB (DocumentDB)";
       default:
         return "";
     }

src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx

@@ -893,6 +893,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                       ) => {
                         this.setState({ fullTextPolicy, fullTextIndexes, fullTextPolicyValidated });
                       }}
+                      // Remove when multi language support on container create issue is fixed
+                      englishOnly={true}
                     />
                   </Stack>
                 </Stack>

src/Explorer/Panes/AddCollectionPanel/__snapshots__/AddCollectionPanel.test.tsx.snap

@@ -516,6 +516,7 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
             }
           >
             <FullTextPoliciesComponent
+              englishOnly={true}
               fullTextPolicy={
                 {
                   "defaultLanguage": "en-US",

src/Explorer/Panes/PanelContainerComponent.test.tsx

@@ -3,11 +3,24 @@ import React from "react";
 import { PanelContainerComponent, PanelContainerProps } from "./PanelContainerComponent";
 
 describe("PaneContainerComponent test", () => {
+  it("should not render console with panel", () => {
+    const panelContainerProps: PanelContainerProps = {
+      headerText: "test",
+      panelContent: <div></div>,
+      isOpen: true,
+      hasConsole: false,
+      isConsoleExpanded: false,
+    };
+    const wrapper = shallow(<PanelContainerComponent {...panelContainerProps} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
   it("should render with panel content and header", () => {
     const panelContainerProps: PanelContainerProps = {
       headerText: "test",
       panelContent: <div></div>,
       isOpen: true,
+      hasConsole: true,
       isConsoleExpanded: false,
     };
     const wrapper = shallow(<PanelContainerComponent {...panelContainerProps} />);
@@ -19,6 +32,7 @@ describe("PaneContainerComponent test", () => {
       headerText: "test",
       panelContent: undefined,
       isOpen: true,
+      hasConsole: true,
       isConsoleExpanded: false,
     };
     const wrapper = shallow(<PanelContainerComponent {...panelContainerProps} />);
@@ -30,6 +44,7 @@ describe("PaneContainerComponent test", () => {
       headerText: "test",
       panelContent: <div></div>,
       isOpen: true,
+      hasConsole: true,
       isConsoleExpanded: true,
     };
     const wrapper = shallow(<PanelContainerComponent {...panelContainerProps} />);

src/Explorer/Panes/PanelContainerComponent.tsx

@@ -8,7 +8,7 @@ export interface PanelContainerProps {
   panelContent?: JSX.Element;
   isConsoleExpanded: boolean;
   isOpen: boolean;
-  hasConsole?: boolean;
+  hasConsole: boolean;
   isConsoleAnimationFinished?: boolean;
   panelWidth?: string;
   onRenderNavigationContent?: IRenderFunction<IPanelProps>;

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -13,6 +13,7 @@ import {
   IToggleStyles,
   Position,
   SpinButton,
+  Stack,
   Toggle,
 } from "@fluentui/react";
 import { Accordion, AccordionHeader, AccordionItem, AccordionPanel, makeStyles } from "@fluentui/react-components";
@@ -204,6 +205,9 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       ? (LocalStorageUtility.getEntryString(StorageKey.MongoGuidRepresentation) as Constants.MongoGuidRepresentation)
       : Constants.MongoGuidRepresentation.CSharpLegacy,
   );
+  const [ignorePartitionKeyOnDocumentUpdate, setIgnorePartitionKeyOnDocumentUpdate] = useState<boolean>(
+    LocalStorageUtility.getEntryBoolean(StorageKey.IgnorePartitionKeyOnDocumentUpdate),
+  );
 
   const styles = useStyles();
 
@@ -424,6 +428,12 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       LocalStorageUtility.setEntryString(StorageKey.MongoGuidRepresentation, mongoGuidRepresentation);
     }
 
+    // Advanced settings
+    LocalStorageUtility.setEntryBoolean(
+      StorageKey.IgnorePartitionKeyOnDocumentUpdate,
+      ignorePartitionKeyOnDocumentUpdate,
+    );
+
     setIsExecuting(false);
     logConsoleInfo(
       `Updated items per page setting to ${LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage)}`,
@@ -453,6 +463,10 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       );
     }
 
+    logConsoleInfo(
+      `${ignorePartitionKeyOnDocumentUpdate ? "Enabled" : "Disabled"} ignoring partition key on document update`,
+    );
+
     refreshExplorer && (await explorer.refreshExplorer());
     closeSidePanel();
   };
@@ -593,6 +607,13 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     setMongoGuidRepresentation(option.key as Constants.MongoGuidRepresentation);
   };
 
+  const handleOnIgnorePartitionKeyOnDocumentUpdateChange = (
+    ev: React.MouseEvent<HTMLElement>,
+    checked?: boolean,
+  ): void => {
+    setIgnorePartitionKeyOnDocumentUpdate(!!checked);
+  };
+
   const choiceButtonStyles = {
     root: {
       clear: "both",
@@ -1137,6 +1158,29 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                 </AccordionPanel>
               </AccordionItem>
             )}
+            <AccordionItem value="15">
+              <AccordionHeader>
+                <div className={styles.header}>Advanced Settings</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
+                    <Checkbox
+                      styles={{ label: { padding: 0 } }}
+                      className="padding"
+                      ariaLabel="Ignore partition key on document update"
+                      checked={ignorePartitionKeyOnDocumentUpdate}
+                      onChange={handleOnIgnorePartitionKeyOnDocumentUpdateChange}
+                      label="Ignore partition key on document update"
+                    />
+                    <InfoTooltip className={styles.headerIcon}>
+                      If checked, the partition key value will not be used to locate the document during update
+                      operations. Only use this if document updates are failing due to an abnormal partition key.
+                    </InfoTooltip>
+                  </Stack>
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
           </Accordion>
         )}
 

src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap

@@ -575,6 +575,52 @@ exports[`Settings Pane should render Default properly 1`] = `
           </div>
         </AccordionPanel>
       </AccordionItem>
+      <AccordionItem
+        value="15"
+      >
+        <AccordionHeader>
+          <div
+            className="___15c001r_0000000 fq02s40"
+          >
+            Advanced Settings
+          </div>
+        </AccordionHeader>
+        <AccordionPanel>
+          <div
+            className="___1dfa554_0000000 fo7qwa0"
+          >
+            <Stack
+              horizontal={true}
+              tokens={
+                {
+                  "childrenGap": 4,
+                }
+              }
+              verticalAlign="center"
+            >
+              <StyledCheckboxBase
+                ariaLabel="Ignore partition key on document update"
+                checked={false}
+                className="padding"
+                label="Ignore partition key on document update"
+                onChange={[Function]}
+                styles={
+                  {
+                    "label": {
+                      "padding": 0,
+                    },
+                  }
+                }
+              />
+              <InfoTooltip
+                className="___vtc5hy0_0000000 f10ra9hq f1k6fduh"
+              >
+                If checked, the partition key value will not be used to locate the document during update operations. Only use this if document updates are failing due to an abnormal partition key.
+              </InfoTooltip>
+            </Stack>
+          </div>
+        </AccordionPanel>
+      </AccordionItem>
     </Accordion>
     <div
       className="settingsSection"
@@ -838,6 +884,52 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
           </div>
         </AccordionPanel>
       </AccordionItem>
+      <AccordionItem
+        value="15"
+      >
+        <AccordionHeader>
+          <div
+            className="___15c001r_0000000 fq02s40"
+          >
+            Advanced Settings
+          </div>
+        </AccordionHeader>
+        <AccordionPanel>
+          <div
+            className="___1dfa554_0000000 fo7qwa0"
+          >
+            <Stack
+              horizontal={true}
+              tokens={
+                {
+                  "childrenGap": 4,
+                }
+              }
+              verticalAlign="center"
+            >
+              <StyledCheckboxBase
+                ariaLabel="Ignore partition key on document update"
+                checked={false}
+                className="padding"
+                label="Ignore partition key on document update"
+                onChange={[Function]}
+                styles={
+                  {
+                    "label": {
+                      "padding": 0,
+                    },
+                  }
+                }
+              />
+              <InfoTooltip
+                className="___vtc5hy0_0000000 f10ra9hq f1k6fduh"
+              >
+                If checked, the partition key value will not be used to locate the document during update operations. Only use this if document updates are failing due to an abnormal partition key.
+              </InfoTooltip>
+            </Stack>
+          </div>
+        </AccordionPanel>
+      </AccordionItem>
     </Accordion>
     <div
       className="settingsSection"

src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx

@@ -13,7 +13,7 @@ import {
 import { Upload } from "Common/Upload/Upload";
 import { UploadDetailsRecord } from "Contracts/ViewModels";
 import { logConsoleError } from "Utils/NotificationConsoleUtils";
-import React, { ChangeEvent, FunctionComponent, useState } from "react";
+import React, { ChangeEvent, FunctionComponent, useReducer, useState } from "react";
 import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
@@ -57,6 +57,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
   const [uploadFileData, setUploadFileData] = useState<UploadDetailsRecord[]>([]);
   const [formError, setFormError] = useState<string>("");
   const [isExecuting, setIsExecuting] = useState<boolean>();
+  const [reducer, setReducer] = useReducer((x) => x + 1, 1);
 
   const onSubmit = () => {
     setFormError("");
@@ -75,6 +76,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
         (uploadDetails) => {
           setUploadFileData(uploadDetails.data);
           setFiles(undefined);
+          setReducer(); // Trigger a re-render to update the UI with new upload details
           // Emit the upload details to the parent component
           onUpload && onUpload(uploadDetails.data);
         },
@@ -95,6 +97,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
   const props: RightPaneFormProps = {
     formError,
     isExecuting: isExecuting,
+    isSubmitButtonDisabled: !files || files.length === 0,
     submitButtonText: "Upload",
     onSubmit,
   };
@@ -192,6 +195,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
     <RightPaneForm {...props}>
       <div className="paneMainContent">
         <Upload
+          key={reducer} // Force re-render on state change
           label="Select JSON Files"
           onUpload={updateSelectedFiles}
           accept="application/json"

src/Explorer/Panes/UploadItemsPane/__snapshots__/UploadItemsPane.test.tsx.snap

@@ -3,6 +3,7 @@
 exports[`Upload Items Pane should render Default properly 1`] = `
 <RightPaneForm
   formError=""
+  isSubmitButtonDisabled={true}
   onSubmit={[Function]}
   submitButtonText="Upload"
 >
@@ -11,6 +12,7 @@ exports[`Upload Items Pane should render Default properly 1`] = `
   >
     <Upload
       accept="application/json"
+      key="1"
       label="Select JSON Files"
       multiple={true}
       onUpload={[Function]}

src/Explorer/Panes/__snapshots__/PanelContainerComponent.test.tsx.snap

@@ -39,6 +39,45 @@ exports[`PaneContainerComponent test should be resize if notification console is
 </StyledPanelBase>
 `;
 
+exports[`PaneContainerComponent test should not render console with panel 1`] = `
+<StyledPanelBase
+  closeButtonAriaLabel="Close test"
+  customWidth="440px"
+  data-test="Panel:test"
+  headerClassName="panelHeader"
+  headerText="test"
+  isFooterAtBottom={true}
+  isLightDismiss={true}
+  isOpen={true}
+  onDismiss={[Function]}
+  style={
+    {
+      "height": "768px",
+    }
+  }
+  styles={
+    {
+      "commands": {
+        "marginTop": 8,
+        "paddingTop": 0,
+      },
+      "content": {
+        "padding": 0,
+      },
+      "header": {
+        "padding": "0 0 8px 34px",
+      },
+      "navigation": {
+        "borderBottom": "1px solid #cccccc",
+      },
+    }
+  }
+  type={7}
+>
+  <div />
+</StyledPanelBase>
+`;
+
 exports[`PaneContainerComponent test should render nothing if content is undefined 1`] = `<Fragment />`;
 
 exports[`PaneContainerComponent test should render with panel content and header 1`] = `

src/Explorer/Quickstart/VCoreMongoQuickstartGuide.tsx

@@ -46,7 +46,7 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
     <Stack style={{ paddingTop: 8, height: "100%", width: "100%" }}>
       <Stack style={{ flexGrow: 1, padding: "0 20px", overflow: "auto" }}>
         <Text variant="xxLarge">Quick start guide</Text>
-        <Text variant="small">Getting started in Cosmos DB Mongo DB (vCore)</Text>
+        <Text variant="small">Getting started in Azure DocumentDB (with MongoDB compatibility)</Text>
         {currentStep < 5 && (
           <Pivot
             style={{ marginTop: 10, width: "100%" }}
@@ -68,13 +68,13 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
                   This tutorial guides you to create and query distributed tables using a sample dataset.
                   <br />
                   <br />
-                  To start, input the admin password you used during the cluster creation process into the MongoDB vCore
+                  To start, input the admin password you used during the cluster creation process into the Document DB
                   terminal.
                   <br />
                   <br />
                   <br />
-                  Note: If you navigate out of the Quick start blade &#40;MongoDB vCore Shell&#41;, the session will be
-                  closed and all ongoing commands might be interrupted.
+                  Note: If you navigate out of the Quick start blade &#40;MongoDB Shell&#41;, the session will be closed
+                  and all ongoing commands might be interrupted.
                 </Text>
               </Stack>
             </PivotItem>
@@ -295,7 +295,7 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
                   <br />
                   <br />
                   Modernize your data seamlessly from an existing MongoDB cluster, whether it&apos;s on-premises or
-                  hosted in the cloud, to Azure Cosmos DB for MongoDB vCore.&nbsp;
+                  hosted in the cloud, to Azure DocumentDB.&nbsp;
                   <Link
                     target="_blank"
                     href="https://learn.microsoft.com/azure/cosmos-db/mongodb/vcore/migration-options"

src/Explorer/SplashScreen/FabricHome.tsx

@@ -182,7 +182,7 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
       },
       {
         title: "Sample Vector Data",
-        description: "Load sample vector data in your database",
+        description: "Load sample vector data with text-embedding-ada-002",
         icon: <img src={AzureOpenAiIcon} alt={"Azure Open AI icon"} aria-hidden="true" />,
         onClick: () => {
           setSelectedSampleDataConfiguration({
@@ -203,7 +203,7 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
         title: "Sample Gallery",
         description: "Get real-world end-to-end samples",
         icon: <img src={GithubIcon} alt={"GitHub icon"} aria-hidden="true" />,
-        onClick: () => window.open("https://azurecosmosdb.github.io/gallery/?tags=example&tags=analytics", "_blank"),
+        onClick: () => window.open("https://aka.ms/CosmosFabricSamplesGallery", "_blank"),
       },
     ];
 

src/Explorer/SplashScreen/SampleUtil.ts

@@ -36,6 +36,56 @@ export enum SampleDataFile {
   FABRIC_SAMPLE_VECTOR_DATA = "FabricSampleVectorData",
 }
 
+const containerSettings: {
+  [key in SampleDataFile]: {
+    partitionKeyString: string;
+    vectorEmbeddingPolicy?: DataModels.VectorEmbeddingPolicy;
+    indexingPolicy?: DataModels.IndexingPolicy;
+  };
+} = {
+  [SampleDataFile.COPILOT]: {
+    partitionKeyString: "category",
+  },
+  [SampleDataFile.FABRIC_SAMPLE_DATA]: {
+    partitionKeyString: "categoryName",
+  },
+  [SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA]: {
+    partitionKeyString: "categoryName",
+    vectorEmbeddingPolicy: {
+      vectorEmbeddings: [
+        {
+          path: "/vectors",
+          dataType: "float32",
+          distanceFunction: "cosine",
+          dimensions: 1536,
+        },
+      ],
+    },
+    indexingPolicy: {
+      automatic: true,
+      indexingMode: "consistent",
+      includedPaths: [
+        {
+          path: "/*",
+        },
+      ],
+      excludedPaths: [
+        {
+          path: '/"_etag"/?',
+        },
+      ],
+      fullTextIndexes: [],
+      vectorIndexes: [
+        {
+          path: "/vectors",
+          type: "quantizedFlat",
+          quantizationByteSize: 64,
+        },
+      ],
+    },
+  },
+};
+
 export const createContainer = async (
   databaseName: string,
   containerName: string,
@@ -49,48 +99,12 @@ export const createContainer = async (
     databaseId: databaseName,
     databaseLevelThroughput: false,
     partitionKey: {
-      paths: [`/${SAMPLE_DATA_PARTITION_KEY}`],
+      paths: [`/${containerSettings[sampleDataFile].partitionKeyString}`],
       kind: "Hash",
       version: BackendDefaults.partitionKeyVersion,
     },
-    vectorEmbeddingPolicy:
-      sampleDataFile === SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA
-        ? {
-            vectorEmbeddings: [
-              {
-                path: "/descriptionVector",
-                dataType: "float32",
-                distanceFunction: "cosine",
-                dimensions: 512,
-              },
-            ],
-          }
-        : undefined,
-    indexingPolicy:
-      sampleDataFile === SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA
-        ? {
-            automatic: true,
-            indexingMode: "consistent",
-            includedPaths: [
-              {
-                path: "/*",
-              },
-            ],
-            excludedPaths: [
-              {
-                path: '/"_etag"/?',
-              },
-            ],
-            fullTextIndexes: [],
-            vectorIndexes: [
-              {
-                path: "/descriptionVector",
-                type: "quantizedFlat",
-                quantizationByteSize: 64,
-              },
-            ],
-          }
-        : undefined,
+    vectorEmbeddingPolicy: containerSettings[sampleDataFile].vectorEmbeddingPolicy,
+    indexingPolicy: containerSettings[sampleDataFile].indexingPolicy,
   };
   await createCollection(createRequest);
   await explorer.refreshAllDatabases();
@@ -103,8 +117,6 @@ export const createContainer = async (
   return newCollection;
 };
 
-const SAMPLE_DATA_PARTITION_KEY = "category"; // This pkey is specifically set for queryCopilotSampleData.json below
-
 export const importData = async (sampleDataFile: SampleDataFile, collection: ViewModels.Collection): Promise<void> => {
   let documents: JSONObject[] = undefined;
   switch (sampleDataFile) {

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -273,7 +273,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         subtitle = "Get started with our sample datasets, documentation, and additional tools.";
         break;
       case "VCoreMongo":
-        title = "Welcome to Azure Cosmos DB for MongoDB (vCore)";
+        title = "Welcome to Azure DocumentDB (with MongoDB compatibility)";
         subtitle = "Get started with our sample datasets, documentation, and additional tools.";
         break;
       default:
@@ -456,7 +456,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
     if (userContext.apiType === "VCoreMongo") {
       icon = VisualStudioIcon;
       title = "Connect with VS Code";
-      description = "Query and Manage your MongoDB cluster in Visual Studio Code";
+      description = "Query and Manage your MongoDB and DocumentDB clusters in Visual Studio Code";
       onClick = () => this.container.openInVsCode();
     }
 

src/Explorer/Tree/Collection.test.ts

@@ -14,17 +14,30 @@ describe("Collection", () => {
       defaultTtl: 1,
       indexingPolicy: {} as DataModels.IndexingPolicy,
       partitionKey,
-      _rid: "",
-      _self: "",
-      _etag: "",
+      _rid: "testRid",
+      _self: "testSelf",
+      _etag: "testEtag",
       _ts: 1,
-      id: "",
+      id: "testCollection",
     };
   };
 
   const generateMockCollectionWithDataModel = (data: DataModels.Collection): Collection => {
-    const mockContainer = {} as Explorer;
-    return generateCollection(mockContainer, "abc", data);
+    const mockContainer = {
+      isReadOnly: () => false,
+      isFabricCapable: () => true,
+      databaseAccount: () => ({
+        name: () => "testAccount",
+        id: () => "testAccount",
+        properties: {
+          enablePartitionKey: true,
+          partitionKeyDefinitionVersion: 2,
+          capabilities: [] as string[],
+          databaseAccountEndpoint: "test.documents.azure.com",
+        },
+      }),
+    } as unknown as Explorer;
+    return generateCollection(mockContainer, "testDb", data);
   };
 
   describe("Partition key path parsing", () => {
@@ -78,7 +91,7 @@ describe("Collection", () => {
       expect(collection.partitionKeyPropertyHeaders[0]).toBe("/somePartitionKey");
     });
 
-    it("should be null if there is no partition key", () => {
+    it("should be empty if there is no partition key", () => {
       const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
         version: 2,
         paths: [],
@@ -88,4 +101,103 @@ describe("Collection", () => {
       expect(collection.partitionKeyPropertyHeaders.length).toBe(0);
     });
   });
+
+  describe("Collection properties", () => {
+    let collection: Collection;
+    const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
+      paths: ["/id"],
+      kind: "Hash",
+      version: 2,
+    });
+
+    beforeEach(() => {
+      collection = generateMockCollectionWithDataModel(collectionsDataModel);
+    });
+
+    it("should return correct collection id", () => {
+      expect(collection.id()).toBe("testCollection");
+    });
+
+    it("should return correct rid", () => {
+      expect(collection.rid).toBe("testRid");
+    });
+
+    it("should return correct self", () => {
+      expect(collection.self).toBe("testSelf");
+    });
+
+    it("should return correct collection type", () => {
+      expect(collection.partitionKey).toBeDefined();
+    });
+  });
+
+  describe("Collection type", () => {
+    it("should identify large partitioned collection for v2 partition key", () => {
+      const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
+        paths: ["/id"],
+        kind: "Hash",
+        version: 2,
+      });
+      const collection = generateMockCollectionWithDataModel(collectionsDataModel);
+      expect(collection.partitionKey.version).toBe(2);
+      expect(collection.partitionKey.paths).toEqual(["/id"]);
+    });
+
+    it("should identify standard partitioned collection for v1 partition key", () => {
+      const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
+        paths: ["/id"],
+        kind: "Hash",
+        version: 1,
+      });
+      const collection = generateMockCollectionWithDataModel(collectionsDataModel);
+      expect(collection.partitionKey.version).toBe(1);
+      expect(collection.partitionKey.paths).toEqual(["/id"]);
+    });
+
+    it("should identify collection without partition key", () => {
+      const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
+        paths: [],
+        kind: "Hash",
+        version: 2,
+      });
+      const collection = generateMockCollectionWithDataModel(collectionsDataModel);
+      expect(collection.partitionKey.paths).toEqual([]);
+    });
+  });
+
+  describe("Partition key handling", () => {
+    it("should return correct partition key paths for multiple paths", () => {
+      const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
+        paths: ["/id", "/pk"],
+        kind: "Hash",
+        version: 2,
+      });
+      const collection = generateMockCollectionWithDataModel(collectionsDataModel);
+      expect(collection.partitionKey.paths).toEqual(["/id", "/pk"]);
+      expect(collection.partitionKeyProperties).toEqual(["id", "pk"]);
+    });
+
+    it("should handle empty partition key paths", () => {
+      const collectionsDataModel = generateMockCollectionsDataModelWithPartitionKey({
+        paths: [],
+        kind: "Hash",
+        version: 2,
+      });
+      const collection = generateMockCollectionWithDataModel(collectionsDataModel);
+      expect(collection.partitionKey.paths).toEqual([]);
+      expect(collection.partitionKeyProperties).toEqual([]);
+    });
+
+    it("should handle undefined partition key", () => {
+      const collectionData = generateMockCollectionsDataModelWithPartitionKey({
+        paths: ["/id"],
+        kind: "Hash",
+        version: 2,
+      });
+      delete collectionData.partitionKey;
+      const collection = generateMockCollectionWithDataModel(collectionData);
+      expect(collection.partitionKey).toBeUndefined();
+      expect(collection.partitionKeyProperties).toEqual([]);
+    });
+  });
 });

src/Explorer/Tree/Collection.ts

@@ -67,6 +67,7 @@ export default class Collection implements ViewModels.Collection {
   public computedProperties: ko.Observable<DataModels.ComputedProperties>;
   public materializedViews: ko.Observable<DataModels.MaterializedView[]>;
   public materializedViewDefinition: ko.Observable<DataModels.MaterializedViewDefinition>;
+  public dataMaskingPolicy: ko.Observable<DataModels.DataMaskingPolicy>;
 
   public offer: ko.Observable<DataModels.Offer>;
   public conflictResolutionPolicy: ko.Observable<DataModels.ConflictResolutionPolicy>;
@@ -136,25 +137,35 @@ export default class Collection implements ViewModels.Collection {
     this.materializedViews = ko.observable(data.materializedViews);
     this.materializedViewDefinition = ko.observable(data.materializedViewDefinition);
 
-    this.partitionKeyPropertyHeaders = this.partitionKey?.paths;
-    this.partitionKeyProperties = this.partitionKeyPropertyHeaders?.map((partitionKeyPropertyHeader, i) => {
-      // TODO fix this to only replace non-excaped single quotes
-      let partitionKeyProperty = partitionKeyPropertyHeader.replace(/[/]+/g, ".").substring(1).replace(/[']+/g, "");
+    // Initialize dataMaskingPolicy with default values if not present
+    const defaultDataMaskingPolicy: DataModels.DataMaskingPolicy = {
+      includedPaths: Array<{ path: string; strategy: string; startPosition: number; length: number }>(),
+      excludedPaths: Array<string>(),
+      isPolicyEnabled: true,
+    };
+    const observablePolicy = ko.observable(data.dataMaskingPolicy || defaultDataMaskingPolicy);
+    observablePolicy.subscribe(() => {});
+    this.dataMaskingPolicy = observablePolicy;
+    this.partitionKeyPropertyHeaders = this.partitionKey?.paths || [];
+    this.partitionKeyProperties =
+      this.partitionKeyPropertyHeaders?.map((partitionKeyPropertyHeader, i) => {
+        // TODO fix this to only replace non-excaped single quotes
+        let partitionKeyProperty = partitionKeyPropertyHeader.replace(/[/]+/g, ".").substring(1).replace(/[']+/g, "");
 
-      if (userContext.apiType === "Mongo" && partitionKeyProperty) {
-        if (~partitionKeyProperty.indexOf(`"`)) {
-          partitionKeyProperty = partitionKeyProperty.replace(/["]+/g, "");
+        if (userContext.apiType === "Mongo" && partitionKeyProperty) {
+          if (~partitionKeyProperty.indexOf(`"`)) {
+            partitionKeyProperty = partitionKeyProperty.replace(/["]+/g, "");
+          }
+          // TODO #10738269 : Add this logic in a derived class for Mongo
+          if (partitionKeyProperty.indexOf("$v") > -1) {
+            // From $v.shard.$v.key.$v > shard.key
+            partitionKeyProperty = partitionKeyProperty.replace(/.\$v/g, "").replace(/\$v./g, "");
+            this.partitionKeyPropertyHeaders[i] = "/" + partitionKeyProperty;
+          }
         }
-        // TODO #10738269 : Add this logic in a derived class for Mongo
-        if (partitionKeyProperty.indexOf("$v") > -1) {
-          // From $v.shard.$v.key.$v > shard.key
-          partitionKeyProperty = partitionKeyProperty.replace(/.\$v/g, "").replace(/\$v./g, "");
-          this.partitionKeyPropertyHeaders[i] = "/" + partitionKeyProperty;
-        }
-      }
 
-      return partitionKeyProperty;
-    });
+        return partitionKeyProperty;
+      }) || [];
 
     this.documentIds = ko.observableArray<DocumentId>([]);
     this.isCollectionExpanded = ko.observable<boolean>(false);
@@ -163,7 +174,6 @@ export default class Collection implements ViewModels.Collection {
 
     this.documentsFocused = ko.observable<boolean>();
     this.documentsFocused.subscribe((focus) => {
-      console.log("Focus set on Documents: " + focus);
       this.focusedSubnodeKind(ViewModels.CollectionTabKind.Documents);
     });
 

src/Main.tsx

@@ -20,7 +20,7 @@ import "../externals/jquery.typeahead.min.css";
 import "../externals/jquery.typeahead.min.js";
 // Image Dependencies
 import { Platform } from "ConfigContext";
-import ContainerCopyPanel from "Explorer/ContainerCopy";
+import ContainerCopyPanel from "Explorer/ContainerCopy/ContainerCopyPanel";
 import Explorer from "Explorer/Explorer";
 import { QueryCopilotCarousel } from "Explorer/QueryCopilot/CopilotCarousel";
 import { SidebarContainer } from "Explorer/Sidebar";
@@ -78,13 +78,10 @@ const App: React.FunctionComponent = () => {
   }
   StyleConstants.updateStyles();
   const explorer = useKnockoutExplorer(config?.platform);
-  // console.log("Using config: ", config);
 
   if (!explorer) {
     return <LoadingExplorer />;
   }
-  // console.log("Using explorer: ", explorer);
-  // console.log("Using userContext: ", userContext);
 
   return (
     <KeyboardShortcutRoot>

src/Shared/StorageUtility.ts

@@ -35,6 +35,7 @@ export enum StorageKey {
   DefaultQueryResultsView,
   AppState,
   MongoGuidRepresentation,
+  IgnorePartitionKeyOnDocumentUpdate,
 }
 
 export const hasRUThresholdBeenConfigured = (): boolean => {

src/UserContext.ts

@@ -176,7 +176,7 @@ function updateUserContext(newContext: Partial<UserContext>): void {
   Object.assign(userContext, newContext);
 }
 
-function apiType(account: DatabaseAccount | undefined): ApiType {
+export function apiType(account: DatabaseAccount | undefined): ApiType {
   if (!account) {
     return "SQL";
   }

src/Utils/CapabilityUtils.ts

@@ -24,3 +24,10 @@ export const isVectorSearchEnabled = (): boolean => {
     (isCapabilityEnabled(Constants.CapabilityNames.EnableNoSQLVectorSearch) || isFabricNative())
   );
 };
+
+export const isFullTextSearchPreviewFeaturesEnabled = (): boolean => {
+  return (
+    userContext.apiType === "SQL" &&
+    isCapabilityEnabled(Constants.CapabilityNames.EnableNoSQLFullTextSearchPreviewFeatures)
+  );
+};

src/Utils/arm/RbacUtils.ts

@@ -1,4 +1,5 @@
 import { configContext } from "ConfigContext";
+import { buildArmUrl } from "Utils/arm/armUtils";
 import { armRequest } from "Utils/arm/request";
 import { getCopyJobAuthorizationHeader } from "../CopyJobAuthUtils";
 
@@ -38,13 +39,6 @@ export type RoleDefinitionType = {
 
 const apiVersion = "2025-04-15";
 
-const getArmBaseUrl = (): string => {
-  const base = configContext.ARM_ENDPOINT;
-  return base.endsWith("/") ? base.slice(0, -1) : base;
-};
-
-const buildArmUrl = (path: string): string => `${getArmBaseUrl()}${path}?api-version=${apiVersion}`;
-
 const handleResponse = async (response: Response, context: string) => {
   if (!response.ok) {
     const body = await response.text().catch(() => "");
@@ -61,6 +55,7 @@ export const fetchRoleAssignments = async (
 ): Promise<RoleAssignmentType[]> => {
   const uri = buildArmUrl(
     `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/sqlRoleAssignments`,
+    apiVersion,
   );
 
   const response = await fetch(uri, { method: "GET", headers: getCopyJobAuthorizationHeader() });
@@ -76,7 +71,7 @@ export const fetchRoleDefinitions = async (roleAssignments: RoleAssignmentType[]
   const uniqueRoleDefinitionIds = Array.from(new Set(roleDefinitionIds));
 
   const headers = getCopyJobAuthorizationHeader();
-  const roleDefinitionUris = uniqueRoleDefinitionIds.map((id) => buildArmUrl(id));
+  const roleDefinitionUris = uniqueRoleDefinitionIds.map((id) => buildArmUrl(id, apiVersion));
 
   const promises = roleDefinitionUris.map((url) => fetch(url, { method: "GET", headers }));
   const responses = await Promise.all(promises);

src/Utils/arm/armUtils.ts

@@ -0,0 +1,15 @@
+import { configContext } from "ConfigContext";
+
+const getArmBaseUrl = (): string => {
+  const base = configContext.ARM_ENDPOINT;
+  return base.endsWith("/") ? base.slice(0, -1) : base;
+};
+
+const buildArmUrl = (path: string, apiVersion: string): string => {
+  if (!path || !apiVersion) {
+    return "";
+  }
+  return `${getArmBaseUrl()}${path}?api-version=${apiVersion}`;
+};
+
+export { buildArmUrl, getArmBaseUrl };

src/Utils/arm/databaseAccountUtils.ts

@@ -1,6 +1,6 @@
 import { DatabaseAccount } from "Contracts/DataModels";
 import { userContext } from "UserContext";
-import { configContext } from "../../ConfigContext";
+import { buildArmUrl } from "Utils/arm/armUtils";
 
 const apiVersion = "2025-04-15";
 export type FetchAccountDetailsParams = {
@@ -12,11 +12,10 @@ export type FetchAccountDetailsParams = {
 const buildUrl = (params: FetchAccountDetailsParams): string => {
   const { subscriptionId, resourceGroupName, accountName } = params;
 
-  let armEndpoint = configContext.ARM_ENDPOINT;
-  if (armEndpoint.endsWith("/")) {
-    armEndpoint = armEndpoint.slice(0, -1);
-  }
-  return `${armEndpoint}/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}?api-version=${apiVersion}`;
+  return buildArmUrl(
+    `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}`,
+    apiVersion,
+  );
 };
 
 export async function fetchDatabaseAccount(subscriptionId: string, resourceGroupName: string, accountName: string) {

src/hooks/useKnockoutExplorer.ts

@@ -960,11 +960,7 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
     Object.assign(userContext.features, extractFeatures(new URLSearchParams(inputs.features)));
   }
 
-  if (
-    configContext.platform === Platform.Portal &&
-    inputs.containerCopyEnabled &&
-    userContext.apiType === "SQL"
-  ) {
+  if (configContext.platform === Platform.Portal && inputs.containerCopyEnabled && userContext.apiType === "SQL") {
     Object.assign(userContext.features, { enableContainerCopy: inputs.containerCopyEnabled });
   }
 

utils/armClientGenerator/generator.ts

@@ -21,9 +21,9 @@ const version = "2025-05-01-preview";
 "cosmos" | "managedCassandra" | "mongorbac" | "notebook" | "privateEndpointConnection" | "privateLinkResources" |
 "rbac" | "restorable" | "services" | "dataTransferService"
 */
-const githubResourceName = "dataTransferService";
-const deResourceName = "dataTransferService";
-const schemaURL = `https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/DocumentDB/preview/${version}/${githubResourceName}.json`;
+const githubResourceName = "cosmos-db";
+const deResourceName = "cosmos";
+const schemaURL = `https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/${version}/${githubResourceName}.json`;
 const outputDir = path.join(__dirname, `../../src/Utils/arm/generatedClients/${deResourceName}`);
 
 // Array of strings to use for eventual output