Initial plan

.github/workflows/ci.yml

@@ -189,9 +189,6 @@ jobs:
             NOSQL_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql.documents.azure.com/.default" -o tsv --query accessToken)
             echo "::add-mask::$NOSQL_TESTACCOUNT_TOKEN"
             echo NOSQL_TESTACCOUNT_TOKEN=$NOSQL_TESTACCOUNT_TOKEN >> $GITHUB_ENV
-            NOSQL2_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql-2.documents.azure.com/.default" -o tsv --query accessToken)
-            echo "::add-mask::$NOSQL2_TESTACCOUNT_TOKEN"
-            echo NOSQL2_TESTACCOUNT_TOKEN=$NOSQL2_TESTACCOUNT_TOKEN >> $GITHUB_ENV
             NOSQL_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql-readonly.documents.azure.com/.default" -o tsv --query accessToken)
             echo "::add-mask::$NOSQL_READONLY_TESTACCOUNT_TOKEN"
             echo NOSQL_READONLY_TESTACCOUNT_TOKEN=$NOSQL_READONLY_TESTACCOUNT_TOKEN >> $GITHUB_ENV

src/Contracts/DataExplorerMessagesContract.ts

@@ -46,10 +46,6 @@ export type DataExploreMessageV3 =
       params: {
         updateType: "created" | "deleted" | "settings";
       };
-    }
-  | {
-      type: FabricMessageTypes.RestoreContainer;
-      params: [];
     };
 export interface GetCosmosTokenMessageOptions {
   verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";

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

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

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

@@ -61,6 +61,7 @@ const CopyJobActionMenu: React.FC<CopyJobActionMenuProps> = ({ job, handleClick
 
   const getMenuItems = (): IContextualMenuProps["items"] => {
     const isThisJobUpdating = updatingJobAction?.jobName === job.Name;
+    const updatingAction = updatingJobAction?.action;
 
     const baseItems = [
       {
@@ -104,7 +105,7 @@ const CopyJobActionMenu: React.FC<CopyJobActionMenuProps> = ({ job, handleClick
           text: ContainerCopyMessages.MonitorJobs.Actions.complete,
           iconProps: { iconName: "CheckMark" },
           onClick: () => showActionConfirmationDialog(job, CopyJobActions.complete),
-          disabled: isThisJobUpdating,
+          disabled: isThisJobUpdating && updatingAction === CopyJobActions.complete,
         });
       }
       return filteredItems;

src/Explorer/ContextMenuButtonFactory.tsx

@@ -7,7 +7,7 @@ import {
   AddGlobalSecondaryIndexPanelProps,
 } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
 import { useDatabases } from "Explorer/useDatabases";
-import { isFabric, isFabricNative, openRestoreContainerDialog } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
@@ -35,7 +35,6 @@ import StoredProcedure from "./Tree/StoredProcedure";
 import Trigger from "./Tree/Trigger";
 import UserDefinedFunction from "./Tree/UserDefinedFunction";
 import { useSelectedNode } from "./useSelectedNode";
-import { extractFeatures } from "../Platform/Hosted/extractFeatures";
 
 export interface CollectionContextMenuButtonParams {
   databaseId: string;
@@ -61,17 +60,6 @@ export const createDatabaseContextMenu = (container: Explorer, databaseId: strin
     },
   ];
 
-  if (isFabricNative() && !userContext.fabricContext?.isReadOnly) {
-    const features = extractFeatures();
-    if (features?.enableRestoreContainer) {
-      items.push({
-        iconSrc: AddCollectionIcon,
-        onClick: () => openRestoreContainerDialog(),
-        label: `Restore ${getCollectionName()}`,
-      });
-    }
-  }
-
   if (!isFabricNative() && (userContext.apiType !== "Tables" || userContext.features.enableSDKoperations)) {
     items.push({
       iconSrc: DeleteDatabaseIcon,

src/Explorer/SplashScreen/SplashScreen.less

@@ -54,6 +54,6 @@
     .mainButtonsContainer {
       display: flex;
       gap: 0 16px;
-      margin: 40px auto
+      margin-bottom: 10px
     }
    

src/Main.tsx

@@ -105,12 +105,9 @@ const App = (): JSX.Element => {
   // Scenario-based health tracking: start ApplicationLoad and complete phases.
   const { startScenario, completePhase } = useMetricScenario();
   React.useEffect(() => {
-    // Only start scenario after config is initialized to avoid race conditions
+    startScenario(MetricScenario.ApplicationLoad);
-    // with message handlers that depend on configContext.platform
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-    if (config) {
+  }, []);
-      startScenario(MetricScenario.ApplicationLoad);
-    }
-  }, [config, startScenario]);
 
   React.useEffect(() => {
     if (explorer) {

src/Platform/Fabric/FabricUtil.ts

@@ -105,12 +105,6 @@ const requestAndStoreAccessToken = async (): Promise<void> => {
   });
 };
 
-export const openRestoreContainerDialog = (): void => {
-  if (isFabricNative()) {
-    sendCachedDataMessage(FabricMessageTypes.RestoreContainer, []);
-  }
-};
-
 /**
  * Check token validity and schedule a refresh if necessary
  * @param tokenTimestamp

src/Platform/Hosted/extractFeatures.ts

@@ -40,7 +40,6 @@ export type Features = {
   readonly disableConnectionStringLogin: boolean;
   readonly enableContainerCopy: boolean;
   readonly enableCloudShell: boolean;
-  readonly enableRestoreContainer: boolean; // only for Fabric
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -112,7 +111,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
     disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
     enableContainerCopy: "true" === get("enablecontainercopy"),
-    enableRestoreContainer: "true" === get("enablerestorecontainer"),
     enableCloudShell: true,
   };
 }

src/Utils/AuthorizationUtils.test.ts

@@ -43,7 +43,6 @@ describe("AuthorizationUtils", () => {
         partitionKeyDefault: false,
         partitionKeyDefault2: false,
         notebooksDownBanner: false,
-        enableRestoreContainer: false,
       },
     });
   };

test/fx.ts

@@ -39,7 +39,6 @@ export enum TestAccount {
   MongoReadonly = "MongoReadOnly",
   Mongo32 = "Mongo32",
   SQL = "SQL",
-  SQL2 = "SQL2",
   SQLReadOnly = "SQLReadOnly",
   SQLContainerCopyOnly = "SQLContainerCopyOnly",
 }
@@ -52,7 +51,6 @@ export const defaultAccounts: Record<TestAccount, string> = {
   [TestAccount.MongoReadonly]: "github-e2etests-mongo-readonly",
   [TestAccount.Mongo32]: "github-e2etests-mongo32",
   [TestAccount.SQL]: "github-e2etests-sql",
-  [TestAccount.SQL2]: "github-e2etests-sql-2",
   [TestAccount.SQLReadOnly]: "github-e2etests-sql-readonly",
   [TestAccount.SQLContainerCopyOnly]: "github-e2etests-sql-containercopyonly",
 };
@@ -74,9 +72,6 @@ function tryGetStandardName(accountType: TestAccount) {
 }
 
 export function getAccountName(accountType: TestAccount) {
-  if (accountType === TestAccount.SQL2 && !process.env.CI) {
-    accountType = TestAccount.SQL;
-  }
   return (
     process.env[`DE_TEST_ACCOUNT_NAME_${accountType.toLocaleUpperCase()}`] ??
     tryGetStandardName(accountType) ??
@@ -106,7 +101,6 @@ export async function getTestExplorerUrl(accountType: TestAccount, options?: Tes
   params.set("feature.enableCopilot", "false");
 
   const nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_TOKEN;
-  const nosql2RbacToken = process.env.NOSQL2_TESTACCOUNT_TOKEN;
   const nosqlReadOnlyRbacToken = process.env.NOSQL_READONLY_TESTACCOUNT_TOKEN;
   const nosqlContainerCopyRbacToken = process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN;
   const tableRbacToken = process.env.TABLE_TESTACCOUNT_TOKEN;
@@ -123,12 +117,7 @@ export async function getTestExplorerUrl(accountType: TestAccount, options?: Tes
         params.set("enableaaddataplane", "true");
       }
       break;
-    case TestAccount.SQL2:
+
-      if (nosql2RbacToken) {
-        params.set("nosql2RbacToken", nosql2RbacToken);
-        params.set("enableaaddataplane", "true");
-      }
-      break;
     case TestAccount.SQLContainerCopyOnly:
       if (nosqlContainerCopyRbacToken) {
         params.set("nosqlRbacToken", nosqlContainerCopyRbacToken);
@@ -526,14 +515,14 @@ export class DataExplorer {
     const containerNode = await this.waitForContainerNode(context.database.id, context.container.id);
     await containerNode.expand();
 
-    // // refresh tree to remove deleted database
+    // refresh tree to remove deleted database
-    // const consoleMessages = await this.getNotificationConsoleMessages();
+    const consoleMessages = await this.getNotificationConsoleMessages();
-    // const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
+    const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
-    // await refreshButton.click();
+    await refreshButton.click();
-    // await expect(consoleMessages).toContainText("Successfully refreshed databases", {
+    await expect(consoleMessages).toContainText("Successfully refreshed databases", {
-    //   timeout: ONE_MINUTE_MS,
+      timeout: ONE_MINUTE_MS,
-    // });
+    });
-    // await this.collapseNotificationConsole();
+    await this.collapseNotificationConsole();
 
     const scaleAndSettingsButton = this.frame.getByTestId(
       `TreeNode:${context.database.id}/${context.container.id}/Scale & Settings`,

test/sql/containercopy/offlineMigration.spec.ts

@@ -1,258 +1,258 @@
-// /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any */
-// import { expect, Frame, Locator, Page, test } from "@playwright/test";
+import { expect, Frame, Locator, Page, test } from "@playwright/test";
-// import { truncateName } from "../../../src/Explorer/ContainerCopy/CopyJobUtils";
+import { truncateName } from "../../../src/Explorer/ContainerCopy/CopyJobUtils";
-// import {
+import {
-//   ContainerCopy,
+  ContainerCopy,
-//   getAccountName,
+  getAccountName,
-//   getDropdownItemByNameOrPosition,
+  getDropdownItemByNameOrPosition,
-//   interceptAndInspectApiRequest,
+  interceptAndInspectApiRequest,
-//   TestAccount,
+  TestAccount,
-//   waitForApiResponse,
+  waitForApiResponse,
-// } from "../../fx";
+} from "../../fx";
-// import { createMultipleTestContainers } from "../../testData";
+import { createMultipleTestContainers } from "../../testData";
 
-// test.describe("Container Copy - Offline Migration", () => {
+test.describe("Container Copy - Offline Migration", () => {
-//   let page: Page;
+  let page: Page;
-//   let wrapper: Locator;
+  let wrapper: Locator;
-//   let panel: Locator;
+  let panel: Locator;
-//   let frame: Frame;
+  let frame: Frame;
-//   let expectedJobName: string;
+  let expectedJobName: string;
-//   let targetAccountName: string;
+  let targetAccountName: string;
-//   let expectedSubscriptionName: string;
+  let expectedSubscriptionName: string;
-//   let expectedCopyJobNameInitial: string;
+  let expectedCopyJobNameInitial: string;
 
-//   test.beforeEach("Setup for offline migration test", async ({ browser }) => {
+  test.beforeEach("Setup for offline migration test", async ({ browser }) => {
-//     await createMultipleTestContainers({ accountType: TestAccount.SQLContainerCopyOnly, containerCount: 2 });
+    await createMultipleTestContainers({ accountType: TestAccount.SQLContainerCopyOnly, containerCount: 2 });
 
-//     page = await browser.newPage();
+    page = await browser.newPage();
-//     ({ wrapper, frame } = await ContainerCopy.open(page, TestAccount.SQLContainerCopyOnly));
+    ({ wrapper, frame } = await ContainerCopy.open(page, TestAccount.SQLContainerCopyOnly));
-//     expectedJobName = `offline_test_job_${Date.now()}`;
+    expectedJobName = `offline_test_job_${Date.now()}`;
-//     targetAccountName = getAccountName(TestAccount.SQLContainerCopyOnly);
+    targetAccountName = getAccountName(TestAccount.SQLContainerCopyOnly);
-//   });
+  });
 
-//   test.afterEach("Cleanup after offline migration test", async () => {
+  test.afterEach("Cleanup after offline migration test", async () => {
-//     await page.unroute(/.*/, (route) => route.continue());
+    await page.unroute(/.*/, (route) => route.continue());
-//     await page.close();
+    await page.close();
-//   });
+  });
 
-//   test("Successfully create and manage offline migration copy job", async () => {
+  test("Successfully create and manage offline migration copy job", async () => {
-//     expect(wrapper).not.toBeNull();
+    expect(wrapper).not.toBeNull();
-//     await wrapper.locator(".commandBarContainer").waitFor({ state: "visible" });
+    await wrapper.locator(".commandBarContainer").waitFor({ state: "visible" });
 
-//     // Open Create Copy Job panel
+    // Open Create Copy Job panel
-//     const createCopyJobButton = wrapper.getByTestId("CommandBar/Button:Create Copy Job");
+    const createCopyJobButton = wrapper.getByTestId("CommandBar/Button:Create Copy Job");
-//     await expect(createCopyJobButton).toBeVisible();
+    await expect(createCopyJobButton).toBeVisible();
-//     await createCopyJobButton.click();
+    await createCopyJobButton.click();
-//     panel = frame.getByTestId("Panel:Create copy job");
+    panel = frame.getByTestId("Panel:Create copy job");
-//     await expect(panel).toBeVisible();
+    await expect(panel).toBeVisible();
 
-//     // Reduced wait time for better performance
+    // Reduced wait time for better performance
-//     await page.waitForTimeout(2000);
+    await page.waitForTimeout(2000);
 
-//     // Setup subscription and account
+    // Setup subscription and account
-//     const subscriptionDropdown = panel.getByTestId("subscription-dropdown");
+    const subscriptionDropdown = panel.getByTestId("subscription-dropdown");
-//     const expectedAccountName = targetAccountName;
+    const expectedAccountName = targetAccountName;
-//     expectedSubscriptionName = await subscriptionDropdown.locator("span.ms-Dropdown-title").innerText();
+    expectedSubscriptionName = await subscriptionDropdown.locator("span.ms-Dropdown-title").innerText();
 
-//     await subscriptionDropdown.click();
+    await subscriptionDropdown.click();
-//     const subscriptionItem = await getDropdownItemByNameOrPosition(
+    const subscriptionItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { name: expectedSubscriptionName },
+      { name: expectedSubscriptionName },
-//       { ariaLabel: "Subscription" },
+      { ariaLabel: "Subscription" },
-//     );
+    );
-//     await subscriptionItem.click();
+    await subscriptionItem.click();
 
-//     // Select account
+    // Select account
-//     const accountDropdown = panel.getByTestId("account-dropdown");
+    const accountDropdown = panel.getByTestId("account-dropdown");
-//     await expect(accountDropdown).toHaveText(new RegExp(expectedAccountName));
+    await expect(accountDropdown).toHaveText(new RegExp(expectedAccountName));
-//     await accountDropdown.click();
+    await accountDropdown.click();
 
-//     const accountItem = await getDropdownItemByNameOrPosition(
+    const accountItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { name: expectedAccountName },
+      { name: expectedAccountName },
-//       { ariaLabel: "Account" },
+      { ariaLabel: "Account" },
-//     );
+    );
-//     await accountItem.click();
+    await accountItem.click();
 
-//     // Test offline migration mode toggle functionality
+    // Test offline migration mode toggle functionality
-//     const migrationTypeContainer = panel.getByTestId("migration-type");
+    const migrationTypeContainer = panel.getByTestId("migration-type");
 
-//     // First test online mode (should show permissions screen)
+    // First test online mode (should show permissions screen)
-//     const onlineCopyRadioButton = migrationTypeContainer.getByRole("radio", { name: /Online mode/i });
+    const onlineCopyRadioButton = migrationTypeContainer.getByRole("radio", { name: /Online mode/i });
-//     await onlineCopyRadioButton.click({ force: true });
+    await onlineCopyRadioButton.click({ force: true });
-//     await expect(migrationTypeContainer.getByTestId("migration-type-description-online")).toBeVisible();
+    await expect(migrationTypeContainer.getByTestId("migration-type-description-online")).toBeVisible();
 
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
-//     await expect(panel.getByTestId("Panel:AssignPermissionsContainer")).toBeVisible();
+    await expect(panel.getByTestId("Panel:AssignPermissionsContainer")).toBeVisible();
-//     await expect(panel.getByText("Online container copy", { exact: true })).toBeVisible();
+    await expect(panel.getByText("Online container copy", { exact: true })).toBeVisible();
 
-//     // Go back and switch to offline mode
+    // Go back and switch to offline mode
-//     await panel.getByRole("button", { name: "Previous" }).click();
+    await panel.getByRole("button", { name: "Previous" }).click();
 
-//     const offlineCopyRadioButton = migrationTypeContainer.getByRole("radio", { name: /Offline mode/i });
+    const offlineCopyRadioButton = migrationTypeContainer.getByRole("radio", { name: /Offline mode/i });
-//     await offlineCopyRadioButton.click({ force: true });
+    await offlineCopyRadioButton.click({ force: true });
-//     await expect(migrationTypeContainer.getByTestId("migration-type-description-offline")).toBeVisible();
+    await expect(migrationTypeContainer.getByTestId("migration-type-description-offline")).toBeVisible();
 
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
 
-//     // Verify we skip permissions screen in offline mode
+    // Verify we skip permissions screen in offline mode
-//     await expect(panel.getByTestId("Panel:SelectSourceAndTargetContainers")).toBeVisible();
+    await expect(panel.getByTestId("Panel:SelectSourceAndTargetContainers")).toBeVisible();
-//     await expect(panel.getByTestId("Panel:AssignPermissionsContainer")).not.toBeVisible();
+    await expect(panel.getByTestId("Panel:AssignPermissionsContainer")).not.toBeVisible();
 
-//     // Test source and target container selection with validation
+    // Test source and target container selection with validation
-//     const sourceContainerDropdown = panel.getByTestId("source-containerDropdown");
+    const sourceContainerDropdown = panel.getByTestId("source-containerDropdown");
-//     expect(sourceContainerDropdown).toBeVisible();
+    expect(sourceContainerDropdown).toBeVisible();
-//     await expect(sourceContainerDropdown).toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(sourceContainerDropdown).toHaveClass(/(^|\s)is-disabled(\s|$)/);
 
-//     // Select source database first (containers are disabled until database is selected)
+    // Select source database first (containers are disabled until database is selected)
-//     const sourceDatabaseDropdown = panel.getByTestId("source-databaseDropdown");
+    const sourceDatabaseDropdown = panel.getByTestId("source-databaseDropdown");
-//     await sourceDatabaseDropdown.click();
+    await sourceDatabaseDropdown.click();
-//     const sourceDbDropdownItem = await getDropdownItemByNameOrPosition(
+    const sourceDbDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Database" },
+      { ariaLabel: "Database" },
-//     );
+    );
-//     await sourceDbDropdownItem.click();
+    await sourceDbDropdownItem.click();
 
-//     // Now container dropdown should be enabled
+    // Now container dropdown should be enabled
-//     await expect(sourceContainerDropdown).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(sourceContainerDropdown).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
-//     await sourceContainerDropdown.click();
+    await sourceContainerDropdown.click();
-//     const sourceContainerDropdownItem = await getDropdownItemByNameOrPosition(
+    const sourceContainerDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Container" },
+      { ariaLabel: "Container" },
-//     );
+    );
-//     await sourceContainerDropdownItem.click();
+    await sourceContainerDropdownItem.click();
 
-//     // Test target container selection
+    // Test target container selection
-//     const targetContainerDropdown = panel.getByTestId("target-containerDropdown");
+    const targetContainerDropdown = panel.getByTestId("target-containerDropdown");
-//     expect(targetContainerDropdown).toBeVisible();
+    expect(targetContainerDropdown).toBeVisible();
-//     await expect(targetContainerDropdown).toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(targetContainerDropdown).toHaveClass(/(^|\s)is-disabled(\s|$)/);
 
-//     const targetDatabaseDropdown = panel.getByTestId("target-databaseDropdown");
+    const targetDatabaseDropdown = panel.getByTestId("target-databaseDropdown");
-//     await targetDatabaseDropdown.click();
+    await targetDatabaseDropdown.click();
-//     const targetDbDropdownItem = await getDropdownItemByNameOrPosition(
+    const targetDbDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Database" },
+      { ariaLabel: "Database" },
-//     );
+    );
-//     await targetDbDropdownItem.click();
+    await targetDbDropdownItem.click();
 
-//     await expect(targetContainerDropdown).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(targetContainerDropdown).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
-//     await targetContainerDropdown.click();
+    await targetContainerDropdown.click();
 
-//     // First try selecting the same container (should show error)
+    // First try selecting the same container (should show error)
-//     const targetContainerDropdownItem1 = await getDropdownItemByNameOrPosition(
+    const targetContainerDropdownItem1 = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Container" },
+      { ariaLabel: "Container" },
-//     );
+    );
-//     await targetContainerDropdownItem1.click();
+    await targetContainerDropdownItem1.click();
 
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
 
-//     // Verify validation error for same source and target containers
+    // Verify validation error for same source and target containers
-//     const errorContainer = panel.getByTestId("Panel:ErrorContainer");
+    const errorContainer = panel.getByTestId("Panel:ErrorContainer");
-//     await expect(errorContainer).toBeVisible();
+    await expect(errorContainer).toBeVisible();
-//     await expect(errorContainer).toHaveText(/Source and destination containers cannot be the same/i);
+    await expect(errorContainer).toHaveText(/Source and destination containers cannot be the same/i);
 
-//     // Select different target container
+    // Select different target container
-//     await targetContainerDropdown.click();
+    await targetContainerDropdown.click();
-//     const targetContainerDropdownItem2 = await getDropdownItemByNameOrPosition(
+    const targetContainerDropdownItem2 = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 1 },
+      { position: 1 },
-//       { ariaLabel: "Container" },
+      { ariaLabel: "Container" },
-//     );
+    );
-//     await targetContainerDropdownItem2.click();
+    await targetContainerDropdownItem2.click();
 
-//     // Generate expected job name based on selections
+    // Generate expected job name based on selections
-//     const selectedSourceDatabase = await sourceDatabaseDropdown.innerText();
+    const selectedSourceDatabase = await sourceDatabaseDropdown.innerText();
-//     const selectedSourceContainer = await sourceContainerDropdown.innerText();
+    const selectedSourceContainer = await sourceContainerDropdown.innerText();
-//     const selectedTargetDatabase = await targetDatabaseDropdown.innerText();
+    const selectedTargetDatabase = await targetDatabaseDropdown.innerText();
-//     const selectedTargetContainer = await targetContainerDropdown.innerText();
+    const selectedTargetContainer = await targetContainerDropdown.innerText();
-//     expectedCopyJobNameInitial = `${truncateName(selectedSourceDatabase)}.${truncateName(
+    expectedCopyJobNameInitial = `${truncateName(selectedSourceDatabase)}.${truncateName(
-//       selectedSourceContainer,
+      selectedSourceContainer,
-//     )}_${truncateName(selectedTargetDatabase)}.${truncateName(selectedTargetContainer)}`;
+    )}_${truncateName(selectedTargetDatabase)}.${truncateName(selectedTargetContainer)}`;
 
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
 
-//     // Error should disappear and preview should be visible
+    // Error should disappear and preview should be visible
-//     await expect(errorContainer).not.toBeVisible();
+    await expect(errorContainer).not.toBeVisible();
-//     await expect(panel.getByTestId("Panel:PreviewCopyJob")).toBeVisible();
+    await expect(panel.getByTestId("Panel:PreviewCopyJob")).toBeVisible();
 
-//     // Verify job preview details
+    // Verify job preview details
-//     const previewContainer = panel.getByTestId("Panel:PreviewCopyJob");
+    const previewContainer = panel.getByTestId("Panel:PreviewCopyJob");
-//     await expect(previewContainer).toBeVisible();
+    await expect(previewContainer).toBeVisible();
-//     await expect(previewContainer.getByTestId("source-subscription-name")).toHaveText(expectedSubscriptionName);
+    await expect(previewContainer.getByTestId("source-subscription-name")).toHaveText(expectedSubscriptionName);
-//     await expect(previewContainer.getByTestId("source-account-name")).toHaveText(expectedAccountName);
+    await expect(previewContainer.getByTestId("source-account-name")).toHaveText(expectedAccountName);
 
-//     const jobNameInput = previewContainer.getByTestId("job-name-textfield");
+    const jobNameInput = previewContainer.getByTestId("job-name-textfield");
-//     await expect(jobNameInput).toHaveValue(new RegExp(expectedCopyJobNameInitial));
+    await expect(jobNameInput).toHaveValue(new RegExp(expectedCopyJobNameInitial));
 
-//     const primaryBtn = panel.getByRole("button", { name: "Copy", exact: true });
+    const primaryBtn = panel.getByRole("button", { name: "Copy", exact: true });
-//     await expect(primaryBtn).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(primaryBtn).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
 
-//     // Test invalid job name validation (spaces not allowed)
+    // Test invalid job name validation (spaces not allowed)
-//     await jobNameInput.fill("test job name");
+    await jobNameInput.fill("test job name");
-//     await expect(primaryBtn).toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(primaryBtn).toHaveClass(/(^|\s)is-disabled(\s|$)/);
 
-//     // Test duplicate job name error handling
+    // Test duplicate job name error handling
-//     const duplicateJobName = "test-job-name-1";
+    const duplicateJobName = "test-job-name-1";
-//     await jobNameInput.fill(duplicateJobName);
+    await jobNameInput.fill(duplicateJobName);
 
-//     const copyButton = panel.getByRole("button", { name: "Copy", exact: true });
+    const copyButton = panel.getByRole("button", { name: "Copy", exact: true });
-//     const expectedErrorMessage = `Duplicate job name '${duplicateJobName}'`;
+    const expectedErrorMessage = `Duplicate job name '${duplicateJobName}'`;
 
-//     await interceptAndInspectApiRequest(
+    await interceptAndInspectApiRequest(
-//       page,
+      page,
-//       `${expectedAccountName}/dataTransferJobs/${duplicateJobName}`,
+      `${expectedAccountName}/dataTransferJobs/${duplicateJobName}`,
-//       "PUT",
+      "PUT",
-//       new Error(expectedErrorMessage),
+      new Error(expectedErrorMessage),
-//       (url?: string) => url?.includes(duplicateJobName) ?? false,
+      (url?: string) => url?.includes(duplicateJobName) ?? false,
-//     );
+    );
 
-//     let errorThrown = false;
+    let errorThrown = false;
-//     try {
+    try {
-//       await copyButton.click();
+      await copyButton.click();
-//       await page.waitForTimeout(2000);
+      await page.waitForTimeout(2000);
-//     } catch (error: any) {
+    } catch (error: any) {
-//       errorThrown = true;
+      errorThrown = true;
-//       expect(error.message).toContain("not allowed");
+      expect(error.message).toContain("not allowed");
-//     }
+    }
 
-//     if (!errorThrown) {
+    if (!errorThrown) {
-//       const errorContainer = panel.getByTestId("Panel:ErrorContainer");
+      const errorContainer = panel.getByTestId("Panel:ErrorContainer");
-//       await expect(errorContainer).toBeVisible();
+      await expect(errorContainer).toBeVisible();
-//       await expect(errorContainer).toHaveText(new RegExp(expectedErrorMessage, "i"));
+      await expect(errorContainer).toHaveText(new RegExp(expectedErrorMessage, "i"));
-//     }
+    }
 
-//     await expect(panel).toBeVisible();
+    await expect(panel).toBeVisible();
 
-//     // Test successful job creation with valid job name
+    // Test successful job creation with valid job name
-//     const validJobName = expectedJobName;
+    const validJobName = expectedJobName;
 
-//     const copyJobCreationPromise = waitForApiResponse(
+    const copyJobCreationPromise = waitForApiResponse(
-//       page,
+      page,
-//       `${expectedAccountName}/dataTransferJobs/${validJobName}`,
+      `${expectedAccountName}/dataTransferJobs/${validJobName}`,
-//       "PUT",
+      "PUT",
-//     );
+    );
 
-//     await jobNameInput.fill(validJobName);
+    await jobNameInput.fill(validJobName);
-//     await expect(copyButton).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
+    await expect(copyButton).not.toHaveClass(/(^|\s)is-disabled(\s|$)/);
 
-//     await copyButton.click();
+    await copyButton.click();
 
-//     const response = await copyJobCreationPromise;
+    const response = await copyJobCreationPromise;
-//     expect(response.ok()).toBe(true);
+    expect(response.ok()).toBe(true);
 
-//     // Verify panel closes and job appears in the list
+    // Verify panel closes and job appears in the list
-//     await expect(panel).not.toBeVisible({ timeout: 5000 });
+    await expect(panel).not.toBeVisible({ timeout: 5000 });
 
-//     const jobsListContainer = wrapper.locator(".CopyJobListContainer .ms-DetailsList-contentWrapper .ms-List-page");
+    const jobsListContainer = wrapper.locator(".CopyJobListContainer .ms-DetailsList-contentWrapper .ms-List-page");
-//     await jobsListContainer.waitFor({ state: "visible", timeout: 5000 });
+    await jobsListContainer.waitFor({ state: "visible", timeout: 5000 });
 
-//     const jobItem = jobsListContainer.getByText(validJobName);
+    const jobItem = jobsListContainer.getByText(validJobName);
-//     await jobItem.waitFor({ state: "visible", timeout: 5000 });
+    await jobItem.waitFor({ state: "visible", timeout: 5000 });
-//     await expect(jobItem).toBeVisible();
+    await expect(jobItem).toBeVisible();
-//   });
+  });
-// });
+});

test/sql/containercopy/onlineMigration.spec.ts

@@ -1,185 +1,185 @@
-// /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any */
-// import { expect, Frame, Locator, Page, test } from "@playwright/test";
+import { expect, Frame, Locator, Page, test } from "@playwright/test";
-// import {
+import {
-//   ContainerCopy,
+  ContainerCopy,
-//   getAccountName,
+  getAccountName,
-//   getDropdownItemByNameOrPosition,
+  getDropdownItemByNameOrPosition,
-//   TestAccount,
+  TestAccount,
-//   waitForApiResponse,
+  waitForApiResponse,
-// } from "../../fx";
+} from "../../fx";
-// import { createMultipleTestContainers } from "../../testData";
+import { createMultipleTestContainers } from "../../testData";
 
-// test.describe("Container Copy - Online Migration", () => {
+test.describe("Container Copy - Online Migration", () => {
-//   let page: Page;
+  let page: Page;
-//   let wrapper: Locator;
+  let wrapper: Locator;
-//   let panel: Locator;
+  let panel: Locator;
-//   let frame: Frame;
+  let frame: Frame;
-//   let targetAccountName: string;
+  let targetAccountName: string;
 
-//   test.beforeEach("Setup for online migration test", async ({ browser }) => {
+  test.beforeEach("Setup for online migration test", async ({ browser }) => {
-//     await createMultipleTestContainers({ accountType: TestAccount.SQLContainerCopyOnly, containerCount: 2 });
+    await createMultipleTestContainers({ accountType: TestAccount.SQLContainerCopyOnly, containerCount: 2 });
 
-//     page = await browser.newPage();
+    page = await browser.newPage();
-//     ({ wrapper, frame } = await ContainerCopy.open(page, TestAccount.SQLContainerCopyOnly));
+    ({ wrapper, frame } = await ContainerCopy.open(page, TestAccount.SQLContainerCopyOnly));
-//     targetAccountName = getAccountName(TestAccount.SQLContainerCopyOnly);
+    targetAccountName = getAccountName(TestAccount.SQLContainerCopyOnly);
-//   });
+  });
 
-//   test.afterEach("Cleanup after online migration test", async () => {
+  test.afterEach("Cleanup after online migration test", async () => {
-//     await page.unroute(/.*/, (route) => route.continue());
+    await page.unroute(/.*/, (route) => route.continue());
-//     await page.close();
+    await page.close();
-//   });
+  });
 
-//   test("Successfully create and manage online migration copy job", async () => {
+  test("Successfully create and manage online migration copy job", async () => {
-//     expect(wrapper).not.toBeNull();
+    expect(wrapper).not.toBeNull();
-//     await wrapper.locator(".commandBarContainer").waitFor({ state: "visible" });
+    await wrapper.locator(".commandBarContainer").waitFor({ state: "visible" });
 
-//     // Open Create Copy Job panel
+    // Open Create Copy Job panel
-//     const createCopyJobButton = wrapper.getByTestId("CommandBar/Button:Create Copy Job");
+    const createCopyJobButton = wrapper.getByTestId("CommandBar/Button:Create Copy Job");
-//     await expect(createCopyJobButton).toBeVisible();
+    await expect(createCopyJobButton).toBeVisible();
-//     await createCopyJobButton.click();
+    await createCopyJobButton.click();
-//     panel = frame.getByTestId("Panel:Create copy job");
+    panel = frame.getByTestId("Panel:Create copy job");
-//     await expect(panel).toBeVisible();
+    await expect(panel).toBeVisible();
 
-//     // Reduced wait time for better performance
+    // Reduced wait time for better performance
-//     await page.waitForTimeout(1000);
+    await page.waitForTimeout(1000);
 
-//     // Enable online migration mode
+    // Enable online migration mode
-//     const migrationTypeContainer = panel.getByTestId("migration-type");
+    const migrationTypeContainer = panel.getByTestId("migration-type");
-//     const onlineCopyRadioButton = migrationTypeContainer.getByRole("radio", { name: /Online mode/i });
+    const onlineCopyRadioButton = migrationTypeContainer.getByRole("radio", { name: /Online mode/i });
-//     await onlineCopyRadioButton.click({ force: true });
+    await onlineCopyRadioButton.click({ force: true });
 
-//     await expect(migrationTypeContainer.getByTestId("migration-type-description-online")).toBeVisible();
+    await expect(migrationTypeContainer.getByTestId("migration-type-description-online")).toBeVisible();
 
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
 
-//     // Verify permissions screen is shown for online migration
+    // Verify permissions screen is shown for online migration
-//     const permissionScreen = panel.getByTestId("Panel:AssignPermissionsContainer");
+    const permissionScreen = panel.getByTestId("Panel:AssignPermissionsContainer");
-//     await expect(permissionScreen).toBeVisible();
+    await expect(permissionScreen).toBeVisible();
-//     await expect(permissionScreen.getByText("Online container copy", { exact: true })).toBeVisible();
+    await expect(permissionScreen.getByText("Online container copy", { exact: true })).toBeVisible();
 
-//     // Skip permissions setup and proceed to container selection
+    // Skip permissions setup and proceed to container selection
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
 
-//     // Configure source and target containers for online migration
+    // Configure source and target containers for online migration
-//     const sourceDatabaseDropdown = panel.getByTestId("source-databaseDropdown");
+    const sourceDatabaseDropdown = panel.getByTestId("source-databaseDropdown");
-//     await sourceDatabaseDropdown.click();
+    await sourceDatabaseDropdown.click();
-//     const sourceDbDropdownItem = await getDropdownItemByNameOrPosition(
+    const sourceDbDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Database" },
+      { ariaLabel: "Database" },
-//     );
+    );
-//     await sourceDbDropdownItem.click();
+    await sourceDbDropdownItem.click();
 
-//     const sourceContainerDropdown = panel.getByTestId("source-containerDropdown");
+    const sourceContainerDropdown = panel.getByTestId("source-containerDropdown");
-//     await sourceContainerDropdown.click();
+    await sourceContainerDropdown.click();
-//     const sourceContainerDropdownItem = await getDropdownItemByNameOrPosition(
+    const sourceContainerDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Container" },
+      { ariaLabel: "Container" },
-//     );
+    );
-//     await sourceContainerDropdownItem.click();
+    await sourceContainerDropdownItem.click();
 
-//     const targetDatabaseDropdown = panel.getByTestId("target-databaseDropdown");
+    const targetDatabaseDropdown = panel.getByTestId("target-databaseDropdown");
-//     await targetDatabaseDropdown.click();
+    await targetDatabaseDropdown.click();
-//     const targetDbDropdownItem = await getDropdownItemByNameOrPosition(
+    const targetDbDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 0 },
+      { position: 0 },
-//       { ariaLabel: "Database" },
+      { ariaLabel: "Database" },
-//     );
+    );
-//     await targetDbDropdownItem.click();
+    await targetDbDropdownItem.click();
 
-//     const targetContainerDropdown = panel.getByTestId("target-containerDropdown");
+    const targetContainerDropdown = panel.getByTestId("target-containerDropdown");
-//     await targetContainerDropdown.click();
+    await targetContainerDropdown.click();
-//     const targetContainerDropdownItem = await getDropdownItemByNameOrPosition(
+    const targetContainerDropdownItem = await getDropdownItemByNameOrPosition(
-//       frame,
+      frame,
-//       { position: 1 },
+      { position: 1 },
-//       { ariaLabel: "Container" },
+      { ariaLabel: "Container" },
-//     );
+    );
-//     await targetContainerDropdownItem.click();
+    await targetContainerDropdownItem.click();
 
-//     await panel.getByRole("button", { name: "Next" }).click();
+    await panel.getByRole("button", { name: "Next" }).click();
 
-//     // Verify job preview and create the online migration job
+    // Verify job preview and create the online migration job
-//     const previewContainer = panel.getByTestId("Panel:PreviewCopyJob");
+    const previewContainer = panel.getByTestId("Panel:PreviewCopyJob");
-//     await expect(previewContainer.getByTestId("source-account-name")).toHaveText(targetAccountName);
+    await expect(previewContainer.getByTestId("source-account-name")).toHaveText(targetAccountName);
 
-//     const jobNameInput = previewContainer.getByTestId("job-name-textfield");
+    const jobNameInput = previewContainer.getByTestId("job-name-textfield");
-//     const onlineMigrationJobName = await jobNameInput.inputValue();
+    const onlineMigrationJobName = await jobNameInput.inputValue();
 
-//     const copyButton = panel.getByRole("button", { name: "Copy", exact: true });
+    const copyButton = panel.getByRole("button", { name: "Copy", exact: true });
 
-//     const copyJobCreationPromise = waitForApiResponse(
+    const copyJobCreationPromise = waitForApiResponse(
-//       page,
+      page,
-//       `${targetAccountName}/dataTransferJobs/${onlineMigrationJobName}`,
+      `${targetAccountName}/dataTransferJobs/${onlineMigrationJobName}`,
-//       "PUT",
+      "PUT",
-//     );
+    );
-//     await copyButton.click();
+    await copyButton.click();
-//     await page.waitForTimeout(1000); // Reduced wait time
+    await page.waitForTimeout(1000); // Reduced wait time
 
-//     const response = await copyJobCreationPromise;
+    const response = await copyJobCreationPromise;
-//     expect(response.ok()).toBe(true);
+    expect(response.ok()).toBe(true);
 
-//     // Verify panel closes and job appears in the list
+    // Verify panel closes and job appears in the list
-//     await expect(panel).not.toBeVisible({ timeout: 5000 });
+    await expect(panel).not.toBeVisible({ timeout: 5000 });
 
-//     const jobsListContainer = wrapper.locator(".CopyJobListContainer .ms-DetailsList-contentWrapper .ms-List-page");
+    const jobsListContainer = wrapper.locator(".CopyJobListContainer .ms-DetailsList-contentWrapper .ms-List-page");
-//     await jobsListContainer.waitFor({ state: "visible", timeout: 5000 });
+    await jobsListContainer.waitFor({ state: "visible", timeout: 5000 });
 
-//     let jobRow, statusCell, actionMenuButton;
+    let jobRow, statusCell, actionMenuButton;
-//     jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
+    jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
-//     statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
+    statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
-//     await jobRow.waitFor({ state: "visible", timeout: 5000 });
+    await jobRow.waitFor({ state: "visible", timeout: 5000 });
 
-//     // Verify job status changes to queued state
+    // Verify job status changes to queued state
-//     await expect(statusCell).toContainText(/running|queued|pending/i, { timeout: 5000 });
+    await expect(statusCell).toContainText(/running|queued|pending/i, { timeout: 5000 });
 
-//     // Test job lifecycle management through action menu
+    // Test job lifecycle management through action menu
-//     actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
+    actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
-//     await actionMenuButton.click();
+    await actionMenuButton.click();
 
-//     // Test pause functionality
+    // Test pause functionality
-//     const pauseAction = frame.locator(".ms-ContextualMenu-list button:has-text('Pause')");
+    const pauseAction = frame.locator(".ms-ContextualMenu-list button:has-text('Pause')");
-//     await pauseAction.click();
+    await pauseAction.click();
 
-//     const pauseResponse = await waitForApiResponse(
+    const pauseResponse = await waitForApiResponse(
-//       page,
+      page,
-//       `${targetAccountName}/dataTransferJobs/${onlineMigrationJobName}/pause`,
+      `${targetAccountName}/dataTransferJobs/${onlineMigrationJobName}/pause`,
-//       "POST",
+      "POST",
-//     );
+    );
-//     expect(pauseResponse.ok()).toBe(true);
+    expect(pauseResponse.ok()).toBe(true);
 
-//     // Verify job status changes to paused
+    // Verify job status changes to paused
-//     jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
+    jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
-//     await jobRow.waitFor({ state: "visible", timeout: 5000 });
+    await jobRow.waitFor({ state: "visible", timeout: 5000 });
-//     statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
+    statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
-//     await expect(statusCell).toContainText(/paused/i, { timeout: 5000 });
+    await expect(statusCell).toContainText(/paused/i, { timeout: 5000 });
-//     await page.waitForTimeout(1000);
+    await page.waitForTimeout(1000);
 
-//     // Test cancel job functionality
+    // Test cancel job functionality
-//     actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
+    actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
-//     await actionMenuButton.click();
+    await actionMenuButton.click();
-//     await frame.locator(".ms-ContextualMenu-list button:has-text('Cancel')").click();
+    await frame.locator(".ms-ContextualMenu-list button:has-text('Cancel')").click();
 
-//     // Verify cancellation confirmation dialog
+    // Verify cancellation confirmation dialog
-//     await expect(frame.locator(".ms-Dialog-main")).toBeVisible({ timeout: 2000 });
+    await expect(frame.locator(".ms-Dialog-main")).toBeVisible({ timeout: 2000 });
-//     await expect(frame.locator(".ms-Dialog-main")).toContainText(onlineMigrationJobName);
+    await expect(frame.locator(".ms-Dialog-main")).toContainText(onlineMigrationJobName);
 
-//     const cancelDialogButton = frame.locator(".ms-Dialog-main").getByTestId("DialogButton:Cancel");
+    const cancelDialogButton = frame.locator(".ms-Dialog-main").getByTestId("DialogButton:Cancel");
-//     await expect(cancelDialogButton).toBeVisible();
+    await expect(cancelDialogButton).toBeVisible();
-//     await cancelDialogButton.click();
+    await cancelDialogButton.click();
-//     await expect(frame.locator(".ms-Dialog-main")).not.toBeVisible();
+    await expect(frame.locator(".ms-Dialog-main")).not.toBeVisible();
 
-//     actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
+    actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
-//     await actionMenuButton.click();
+    await actionMenuButton.click();
-//     await frame.locator(".ms-ContextualMenu-list button:has-text('Cancel')").click();
+    await frame.locator(".ms-ContextualMenu-list button:has-text('Cancel')").click();
 
-//     const confirmDialogButton = frame.locator(".ms-Dialog-main").getByTestId("DialogButton:Confirm");
+    const confirmDialogButton = frame.locator(".ms-Dialog-main").getByTestId("DialogButton:Confirm");
-//     await expect(confirmDialogButton).toBeVisible();
+    await expect(confirmDialogButton).toBeVisible();
-//     await confirmDialogButton.click();
+    await confirmDialogButton.click();
 
-//     // Verify final job status is cancelled
+    // Verify final job status is cancelled
-//     jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
+    jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
-//     statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
+    statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
-//     await expect(statusCell).toContainText(/cancelled/i, { timeout: 5000 });
+    await expect(statusCell).toContainText(/cancelled/i, { timeout: 5000 });
-//   });
+  });
-// });
+});

test/sql/document.spec.ts

@@ -136,7 +136,9 @@ test.describe.serial("Upload Item", () => {
     if (existsSync(uploadDocumentDirPath)) {
       rmdirSync(uploadDocumentDirPath);
     }
-    await context?.dispose();
+    if (!process.env.CI) {
+      await context?.dispose();
+    }
   });
 
   test.afterEach("Close Upload Items panel if still open", async () => {

test/sql/indexAdvisor.spec.ts

@@ -10,7 +10,7 @@ let CONTAINER_ID: string;
 
 // Set up test database and container with data before all tests
 test.beforeAll(async () => {
-  testContainer = await createTestSQLContainer({ includeTestData: true });
+  testContainer = await createTestSQLContainer(true);
   DATABASE_ID = testContainer.database.id;
   CONTAINER_ID = testContainer.container.id;
 });

test/sql/query.spec.ts

@@ -30,9 +30,12 @@ test.beforeEach("Open new query tab", async ({ page }) => {
   await explorer.frame.getByTestId("NotificationConsole/Contents").waitFor();
 });
 
-test.afterAll("Delete Test Database", async () => {
+// Delete database only if not running in CI
-  await context?.dispose();
+if (!process.env.CI) {
-});
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });
+}
 
 test("Query results", async () => {
   // Run the query and verify the results

test/sql/scaleAndSettings/changePartitionKey.spec.ts

@@ -10,13 +10,11 @@ test.describe("Change Partition Key", () => {
   let previousJobName: string | undefined;
 
   test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer({
+    context = await createTestSQLContainer();
-      testAccount: TestAccount.SQL2,
-    });
   });
 
   test.beforeEach("Open container settings", async ({ page }) => {
-    explorer = await DataExplorer.open(page, TestAccount.SQL2);
+    explorer = await DataExplorer.open(page, TestAccount.SQL);
 
     // Click Scale & Settings and open Partition Key tab
     await explorer.openScaleAndSettings(context);
@@ -25,9 +23,12 @@ test.describe("Change Partition Key", () => {
     await PartitionKeyTab.click();
   });
 
-  test.afterEach("Delete Test Database", async () => {
+  // Delete database only if not running in CI
-    await context?.dispose();
+  if (!process.env.CI) {
-  });
+    test.afterEach("Delete Test Database", async () => {
+      await context?.dispose();
+    });
+  }
 
   test("Change partition key path", async ({ page }) => {
     await expect(explorer.frame.getByText("/partitionKey")).toBeVisible();

test/sql/scaleAndSettings/computedProperties.spec.ts

@@ -8,13 +8,11 @@ test.describe("Computed Properties", () => {
   let explorer: DataExplorer = null!;
 
   test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer({
+    context = await createTestSQLContainer();
-      testAccount: TestAccount.SQL2,
-    });
   });
 
   test.beforeEach("Open Settings tab under Scale & Settings", async ({ page }) => {
-    explorer = await DataExplorer.open(page, TestAccount.SQL2);
+    explorer = await DataExplorer.open(page, TestAccount.SQL);
     const containerNode = await explorer.waitForContainerNode(context.database.id, context.container.id);
     await containerNode.expand();
 
@@ -24,7 +22,7 @@ test.describe("Computed Properties", () => {
     await computedPropertiesTab.click();
   });
 
-  test.afterEach("Delete Test Database", async () => {
+  test.afterAll("Delete Test Database", async () => {
     await context?.dispose();
   });
 

test/sql/scaleAndSettings/scale.spec.ts

@@ -118,5 +118,7 @@ async function openScaleTab(browser: Browser): Promise<SetupResult> {
 }
 
 async function cleanup({ context }: Partial<SetupResult>) {
-  await context?.dispose();
+  if (!process.env.CI) {
+    await context?.dispose();
+  }
 }

test/sql/scaleAndSettings/settings.spec.ts

@@ -17,9 +17,12 @@ test.describe("Settings under Scale & Settings", () => {
     await settingsTab.click();
   });
 
-  test.afterEach("Delete Test Database", async () => {
+  // Delete database only if not running in CI
-    await context?.dispose();
+  if (!process.env.CI) {
-  });
+    test.afterAll("Delete Test Database", async () => {
+      await context?.dispose();
+    });
+  }
 
   test("Update TTL to On (no default)", async () => {
     const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });

test/sql/scripts/storedProcedure.spec.ts

@@ -7,16 +7,14 @@ test.describe("Stored Procedures", () => {
   let explorer: DataExplorer = null!;
 
   test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer({
+    context = await createTestSQLContainer();
-      testAccount: TestAccount.SQL2,
-    });
   });
 
   test.beforeEach("Open container", async ({ page }) => {
-    explorer = await DataExplorer.open(page, TestAccount.SQL2);
+    explorer = await DataExplorer.open(page, TestAccount.SQL);
   });
 
-  test.afterEach("Delete Test Database", async () => {
+  test.afterAll("Delete Test Database", async () => {
     await context?.dispose();
   });
 
@@ -45,7 +43,7 @@ test.describe("Stored Procedures", () => {
     );
 
     // Execute stored procedure
-    const executeButton = explorer.commandBarButton(CommandBarButton.Execute).first();
+    const executeButton = explorer.commandBarButton(CommandBarButton.Execute);
     await executeButton.click();
     const executeSidePanelButton = explorer.frame.getByTestId("Panel/OkButton");
     await executeSidePanelButton.click();

test/sql/scripts/trigger.spec.ts

@@ -19,18 +19,18 @@ test.describe("Triggers", () => {
         request.setBody(itemToCreate);
     }`;
   test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer({
+    context = await createTestSQLContainer();
-      testAccount: TestAccount.SQL2,
-    });
   });
 
   test.beforeEach("Open container", async ({ page }) => {
-    explorer = await DataExplorer.open(page, TestAccount.SQL2);
+    explorer = await DataExplorer.open(page, TestAccount.SQL);
   });
 
-  test.afterEach("Delete Test Database", async () => {
+  if (!process.env.CI) {
-    await context?.dispose();
+    test.afterAll("Delete Test Database", async () => {
-  });
+      await context?.dispose();
+    });
+  }
 
   test("Add and delete trigger", async ({ page }, testInfo) => {
     // Open container context menu and click New Trigger

test/sql/scripts/userDefinedFunction.spec.ts

@@ -12,18 +12,18 @@ test.describe("User Defined Functions", () => {
   }`;
 
   test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer({
+    context = await createTestSQLContainer();
-      testAccount: TestAccount.SQL2,
-    });
   });
 
   test.beforeEach("Open container", async ({ page }) => {
-    explorer = await DataExplorer.open(page, TestAccount.SQL2);
+    explorer = await DataExplorer.open(page, TestAccount.SQL);
   });
 
-  test.afterEach("Delete Test Database", async () => {
+  if (!process.env.CI) {
-    await context?.dispose();
+    test.afterAll("Delete Test Database", async () => {
-  });
+      await context?.dispose();
+    });
+  }
 
   test("Add, execute, and delete user defined function", async ({ page }, testInfo) => {
     // Open container context menu and click New UDF

test/testData.ts

@@ -86,14 +86,13 @@ type createTestSqlContainerConfig = {
   includeTestData?: boolean;
   partitionKey?: string;
   databaseName?: string;
-  testAccount?: TestAccount;
 };
 
 type createMultipleTestSqlContainerConfig = {
   containerCount?: number;
   partitionKey?: string;
   databaseName?: string;
-  accountType: TestAccount.SQLContainerCopyOnly | TestAccount.SQL | TestAccount.SQL2;
+  accountType: TestAccount.SQLContainerCopyOnly | TestAccount.SQL;
 };
 
 export async function createMultipleTestContainers({
@@ -115,7 +114,12 @@ export async function createMultipleTestContainers({
     endpoint: account.documentEndpoint!,
   };
 
-  const rbacToken = getRbacToken(accountType);
+  const rbacToken =
+    accountType === TestAccount.SQL
+      ? process.env.NOSQL_TESTACCOUNT_TOKEN
+      : accountType === TestAccount.SQLContainerCopyOnly
+      ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN
+      : "";
   if (rbacToken) {
     clientOptions.tokenProvider = async (): Promise<string> => {
       const AUTH_PREFIX = `type=aad&ver=1.0&sig=`;
@@ -151,21 +155,20 @@ export async function createTestSQLContainer({
   includeTestData = false,
   partitionKey = "/partitionKey",
   databaseName = "",
-  testAccount = TestAccount.SQL,
 }: createTestSqlContainerConfig = {}) {
   const databaseId = databaseName ? databaseName : generateUniqueName("db");
   const containerId = "testcontainer"; // A unique container name isn't needed because the database is unique
   const credentials = getAzureCLICredentials();
   const adaptedCredentials = new AzureIdentityCredentialAdapter(credentials);
   const armClient = new CosmosDBManagementClient(adaptedCredentials, subscriptionId);
-  const accountName = getAccountName(testAccount);
+  const accountName = getAccountName(TestAccount.SQL);
   const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
 
   const clientOptions: CosmosClientOptions = {
     endpoint: account.documentEndpoint!,
   };
 
-  const nosqlAccountRbacToken = getRbacToken(testAccount);
+  const nosqlAccountRbacToken = process.env.NOSQL_TESTACCOUNT_TOKEN;
   if (nosqlAccountRbacToken) {
     clientOptions.tokenProvider = async (): Promise<string> => {
       const AUTH_PREFIX = `type=aad&ver=1.0&sig=`;
@@ -249,16 +252,3 @@ export async function retry<T>(fn: () => Promise<T>, retries = 3, delayMs = 1000
   }
   throw lastError;
 }
-
-function getRbacToken(accountType: TestAccount): string | undefined {
-  switch (accountType) {
-    case TestAccount.SQL:
-      return process.env.NOSQL_TESTACCOUNT_TOKEN;
-    case TestAccount.SQL2:
-      return process.env.NOSQL2_TESTACCOUNT_TOKEN;
-    case TestAccount.SQLContainerCopyOnly:
-      return process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN;
-    default:
-      return undefined;
-  }
-}

test/testExplorer/TestExplorer.ts

@@ -17,7 +17,6 @@ const nosqlRbacToken =
   urlSearchParams.get("nosqlRbacToken") ||
   (enablecontainercopy ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN : process.env.NOSQL_TESTACCOUNT_TOKEN) ||
   "";
-const nosql2RbacToken = urlSearchParams.get("nosql2RbacToken") || process.env.NOSQL2_TESTACCOUNT_TOKEN || "";
 const nosqlReadOnlyRbacToken =
   urlSearchParams.get("nosqlReadOnlyRbacToken") || process.env.NOSQL_READONLY_TESTACCOUNT_TOKEN || "";
 const tableRbacToken = urlSearchParams.get("tableRbacToken") || process.env.TABLE_TESTACCOUNT_TOKEN || "";
@@ -44,9 +43,6 @@ const initTestExplorer = async (): Promise<void> => {
     case "sql":
       rbacToken = nosqlRbacToken;
       break;
-    case "sql2":
-      rbacToken = nosql2RbacToken;
-      break;
     case "sql-readonly":
       rbacToken = nosqlReadOnlyRbacToken;
       break;