Update snapshots

less/documentDB.less

@@ -1179,16 +1179,16 @@ menuQuickStart {
   }
 }
 
-#tbodycontent tr.gridRowSelected {
+.gridRowSelected {
   .active();
 }
 
-#tbodycontent tr.gridRowSelected:hover {
+.gridRowSelected:hover {
   cursor: default;
   .hover();
 }
 
-#tbodycontent tr.gridRowHighlighted {
+.gridRowHighlighted {
   border-style: dotted;
   border-width: 2px;
 }
@@ -2576,10 +2576,9 @@ a:link {
 .querydropdown.placeholderVisible {
   font-style: italic;
 }
-.querydropdown.placeholderVisible::placeholder {
-  /* Chrome, Firefox, Opera, Safari 10.1+ */
+.querydropdown.placeholderVisible::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
   color: #767474;
-  opacity: 1;
+  opacity: 1; 
 }
 
 .querydropdown:hover {
@@ -2649,7 +2648,7 @@ a:link {
 
 .nav-tabs > li.active > .tabNavContentContainer > .tab_Content > .tabNavText {
   font-weight: bolder;
-  border-bottom: 2px solid rgba(0, 120, 212, 1);
+  border-bottom: 2px solid rgba(0,120,212,1);
 }
 
 .nav-tabs > li.active:focus > .tabNavContentContainer {
@@ -3097,3 +3096,4 @@ a:link {
   background: white;
   height: 100%;
 }
+

package-lock.json

@@ -179,11 +179,10 @@
       }
     },
     "@azure/cosmos": {
-      "version": "4.0.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/@azure/cosmos/-/cosmos-4.0.0.tgz",
-      "integrity": "sha1-X9qLNctiu82lIVm5bEw5gahD1bk=",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.16.2.tgz",
+      "integrity": "sha512-sceY5LWj0BHGj8PSyaVCfDRQLVZyoCfIY78kyIROJVEw0k+p9XFs8fhpykN8JklkCftL0WlaVY+X25SQwnhZsw==",
       "requires": {
-        "@azure/abort-controller": "^1.0.0",
         "@azure/core-auth": "^1.3.0",
         "@azure/core-rest-pipeline": "^1.2.0",
         "debug": "^4.1.1",
@@ -22134,12 +22133,6 @@
       "resolved": "https://registry.npmjs.org/react-splitter-layout/-/react-splitter-layout-4.0.0.tgz",
       "integrity": "sha512-SLqOjBOxRuizWUa83w6q5/u9cDWa9/yj9Iko9V9JFN8x+cqIXiDlUFWSx+icz3IIgvsN/oRIw3za5/32RjIwrA=="
     },
-    "react-string-format": {
-      "version": "1.0.1",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/react-string-format/-/react-string-format-1.0.1.tgz",
-      "integrity": "sha1-JyQaRZHqURInBBx64HC3FJBh3AA=",
-      "license": "MIT"
-    },
     "react-syntax-highlighter": {
       "version": "12.2.1",
       "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-12.2.1.tgz",

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.0.0",
+    "@azure/cosmos": "3.16.2",
     "@azure/cosmos-language-service": "0.0.5",
     "@azure/identity": "1.2.1",
     "@azure/ms-rest-nodeauth": "3.0.7",
@@ -92,7 +92,6 @@
     "react-notification-system": "0.2.17",
     "react-redux": "7.1.3",
     "react-splitter-layout": "4.0.0",
-    "react-string-format": "1.0.1",
     "react-youtube": "9.0.1",
     "redux": "4.0.4",
     "reflect-metadata": "0.1.13",
@@ -235,4 +234,4 @@
     "printWidth": 120,
     "endOfLine": "auto"
   }
-}
+}

src/Common/Constants.ts

@@ -427,6 +427,12 @@ export class JunoEndpoints {
   public static readonly Stage = "https://tools-staging.cosmos.azure.com";
 }
 
+export class PriorityLevel {
+  public static readonly High = "high";
+  public static readonly Low = "low";
+  public static readonly Default = "low";
+}
+
 export const QueryCopilotSampleDatabaseId = "CopilotSampleDb";
 export const QueryCopilotSampleContainerId = "SampleContainer";
 

src/Common/CosmosClient.test.ts

@@ -125,7 +125,7 @@ describe("requestPlugin", () => {
       const headers = {};
       const endpoint = "https://docs.azure.com";
       const path = "/dbs/foo";
-      requestPlugin({ endpoint, headers, path } as any, undefined, next as any);
+      requestPlugin({ endpoint, headers, path } as any, next as any);
       expect(next.mock.calls[0][0]).toMatchSnapshot();
     });
   });
@@ -137,7 +137,7 @@ describe("requestPlugin", () => {
       const headers = {};
       const endpoint = "";
       const path = "/dbs/foo";
-      requestPlugin({ endpoint, headers, path } as any, undefined, next as any);
+      requestPlugin({ endpoint, headers, path } as any, next as any);
       expect(next.mock.calls[0][0]).toMatchSnapshot();
     });
   });

src/Common/CosmosClient.ts

@@ -1,12 +1,13 @@
 import * as Cosmos from "@azure/cosmos";
-import { sendCachedDataMessage } from "Common/MessageHandler";
-import { AuthorizationToken, MessageTypes } from "Contracts/MessageTypes";
-import { Platform, configContext } from "../ConfigContext";
+import { configContext, Platform } from "../ConfigContext";
 import { userContext } from "../UserContext";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
-import * as PriorityBasedExecutionUtils from "../Utils/PriorityBasedExecutionUtils";
 import { EmulatorMasterKey, HttpHeaders } from "./Constants";
 import { getErrorMessage } from "./ErrorHandlingUtils";
+import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { PriorityLevel } from "../Common/Constants";
+import * as PriorityBasedExecutionUtils from "../Utils/PriorityBasedExecutionUtils";
+import { AuthType } from "../AuthType";
 
 const _global = typeof self === "undefined" ? window : self;
 
@@ -25,15 +26,6 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
     return decodeURIComponent(headers.authorization);
   }
 
-  if (configContext.platform === Platform.Fabric) {
-    const authorizationToken = await sendCachedDataMessage<AuthorizationToken>(MessageTypes.GetAuthorizationToken, [
-      requestInfo,
-    ]);
-    console.log("Response from Fabric: ", authorizationToken);
-    headers[HttpHeaders.msDate] = authorizationToken.XDate;
-    return authorizationToken.PrimaryReadWriteToken;
-  }
-
   if (userContext.masterKey) {
     // TODO This SDK method mutates the headers object. Find a better one or fix the SDK.
     await Cosmos.setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
@@ -49,7 +41,7 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
   return decodeURIComponent(result.PrimaryReadWriteToken);
 };
 
-export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, diagnosticNode, next) => {
+export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, next) => {
   requestContext.endpoint = new URL(configContext.PROXY_PATH, window.location.href).href;
   requestContext.headers["x-ms-proxy-target"] = endpoint();
   return next(requestContext);
@@ -64,11 +56,7 @@ export const endpoint = () => {
   return userContext.endpoint || userContext?.databaseAccount?.properties?.documentEndpoint;
 };
 
-export async function getTokenFromAuthService(
-  verb: string,
-  resourceType: string,
-  resourceId?: string,
-): Promise<AuthorizationToken> {
+export async function getTokenFromAuthService(verb: string, resourceType: string, resourceId?: string): Promise<any> {
   try {
     const host = configContext.BACKEND_ENDPOINT;
     const response = await _global.fetch(host + "/api/guest/runtimeproxy/authorizationTokens", {
@@ -107,6 +95,18 @@ export function client(): Cosmos.CosmosClient {
   _defaultHeaders["x-ms-cosmos-sdk-supportedcapabilities"] =
     SDKSupportedCapabilities.None | SDKSupportedCapabilities.PartitionMerge;
 
+  if (
+    userContext.authType === AuthType.ConnectionString ||
+    userContext.authType === AuthType.EncryptedToken ||
+    userContext.authType === AuthType.ResourceToken
+  ) {
+    // Default to low priority. Needed for non-AAD-auth scenarios
+    // where we cannot use RP API, and thus, cannot detect whether priority
+    // based execution is enabled.
+    // The header will be ignored if priority based execution is disabled on the account.
+    _defaultHeaders["x-ms-cosmos-priority-level"] = PriorityLevel.Default;
+  }
+
   const options: Cosmos.CosmosClientOptions = {
     endpoint: endpoint() || "https://cosmos.azure.com", // CosmosClient gets upset if we pass a bad URL. This should never actually get called
     key: userContext.masterKey,

src/Common/MessageHandler.ts

@@ -22,7 +22,7 @@ export function handleCachedDataMessage(message: any): void {
   if (messageContent.error != null) {
     cachedDataPromise.deferred.reject(messageContent.error);
   } else {
-    cachedDataPromise.deferred.resolve(messageContent.data);
+    cachedDataPromise.deferred.resolve(JSON.parse(messageContent.data));
   }
   runGarbageCollector();
 }

src/Contracts/ExplorerContracts.ts

@@ -1,6 +1,46 @@
-import { MessageTypes } from "Contracts/MessageTypes";
 import * as ActionContracts from "./ActionContracts";
 import * as Diagnostics from "./Diagnostics";
 import * as Versions from "./Versions";
 
-export { ActionContracts, Diagnostics, MessageTypes, Versions };
+/**
+ * Messaging types used with Data Explorer <-> Portal communication
+ * and Hosted <-> Explorer communication
+ */
+export enum MessageTypes {
+  TelemetryInfo,
+  LogInfo,
+  RefreshResources,
+  AllDatabases,
+  CollectionsForDatabase,
+  RefreshOffers,
+  AllOffers,
+  UpdateLocationHash,
+  SingleOffer,
+  RefreshOffer,
+  UpdateAccountName,
+  ForbiddenError,
+  AadSignIn,
+  GetAccessAadRequest,
+  GetAccessAadResponse,
+  UpdateAccountSwitch,
+  UpdateDirectoryControl,
+  SwitchAccount,
+  SendNotification,
+  ClearNotification,
+  ExplorerClickEvent,
+  LoadingStatus,
+  GetArcadiaToken,
+  CreateWorkspace,
+  CreateSparkPool,
+  RefreshDatabaseAccount,
+  CloseTab,
+  OpenQuickstartBlade,
+  OpenPostgreSQLPasswordReset,
+  OpenPostgresNetworkingBlade,
+  OpenCosmosDBNetworkingBlade,
+  DisplayNPSSurvey,
+  OpenVCoreMongoNetworkingBlade,
+  OpenVCoreMongoConnectionStringsBlade,
+}
+
+export { ActionContracts, Diagnostics, Versions };

src/Contracts/FabricContract.ts

@@ -1,5 +1,3 @@
-import { AuthorizationToken, MessageTypes } from "./MessageTypes";
-
 export type FabricMessage =
   | {
       type: "newContainer";
@@ -7,52 +5,21 @@ export type FabricMessage =
     }
   | {
       type: "initialize";
-      message: {
-        endpoint: string | undefined;
-        error: string | undefined;
-      };
+      connectionString: string | undefined;
     }
   | {
       type: "openTab";
       databaseName: string;
       collectionName: string | undefined;
-    }
-  | {
-      type: "authorizationToken";
-      message: {
-        id: string;
-        error: string | undefined;
-        data: AuthorizationToken | undefined;
-      };
     };
 
 export type DataExploreMessage =
   | "ready"
   | {
-      type: MessageTypes.TelemetryInfo;
+      type: number;
       data: {
         action: "LoadDatabases";
         actionModifier: "success" | "start";
         defaultExperience: "SQL";
       };
-    }
-  | {
-      type: MessageTypes.GetAuthorizationToken;
-      id: string;
-      params: GetCosmosTokenMessageOptions[];
     };
-
-export type GetCosmosTokenMessageOptions = {
-  verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";
-  resourceType: "" | "dbs" | "colls" | "docs" | "sprocs" | "pkranges";
-  resourceId: string;
-};
-
-export type CosmosDBTokenResponse = {
-  token: string;
-  date: string;
-};
-
-export type CosmosDBConnectionInfoResponse = {
-  endpoint: string;
-};

src/Contracts/MessageTypes.ts

@@ -1,48 +0,0 @@
-/**
- * Messaging types used with Data Explorer <-> Portal communication,
- * Hosted <-> Explorer communication and Data Explorer -> Fabric communication.
- */
-export enum MessageTypes {
-  TelemetryInfo,
-  LogInfo,
-  RefreshResources,
-  AllDatabases,
-  CollectionsForDatabase,
-  RefreshOffers,
-  AllOffers,
-  UpdateLocationHash,
-  SingleOffer,
-  RefreshOffer,
-  UpdateAccountName,
-  ForbiddenError,
-  AadSignIn,
-  GetAccessAadRequest,
-  GetAccessAadResponse,
-  UpdateAccountSwitch,
-  UpdateDirectoryControl,
-  SwitchAccount,
-  SendNotification,
-  ClearNotification,
-  ExplorerClickEvent,
-  LoadingStatus,
-  GetArcadiaToken,
-  CreateWorkspace,
-  CreateSparkPool,
-  RefreshDatabaseAccount,
-  CloseTab,
-  OpenQuickstartBlade,
-  OpenPostgreSQLPasswordReset,
-  OpenPostgresNetworkingBlade,
-  OpenCosmosDBNetworkingBlade,
-  DisplayNPSSurvey,
-  OpenVCoreMongoNetworkingBlade,
-  OpenVCoreMongoConnectionStringsBlade,
-
-  // Data Explorer -> Fabric communication
-  GetAuthorizationToken,
-}
-
-export interface AuthorizationToken {
-  XDate: string;
-  PrimaryReadWriteToken: string;
-}

src/Explorer/DataSamples/ContainerSampleGenerator.test.ts

@@ -123,6 +123,19 @@ describe("ContainerSampleGenerator", () => {
     await generator.createSampleContainerAsync();
   });
 
+  it("should not create any sample for Mongo API account", async () => {
+    const experience = "Sample generation not supported for this API Mongo";
+    updateUserContext({
+      databaseAccount: {
+        properties: {
+          capabilities: [{ name: "EnableMongo" }],
+        },
+      } as DatabaseAccount,
+    });
+
+    expect(ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub)).rejects.toMatch(experience);
+  });
+
   it("should not create any sample for Table API account", async () => {
     const experience = "Sample generation not supported for this API Tables";
     updateUserContext({

src/Explorer/Explorer.tsx

@@ -689,9 +689,9 @@ export default class Explorer {
   private _initSettings() {
     if (!ExplorerSettings.hasSettingsDefined()) {
       ExplorerSettings.createDefaultSettings();
+    } else {
+      ExplorerSettings.ensurePriorityLevel();
     }
-
-    ExplorerSettings.ensurePriorityLevel();
   }
 
   public uploadFile(

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -67,7 +67,7 @@ export function createStaticCommandBarButtons(
     }
   }
 
-  if (userContext.apiType !== "Tables" && configContext.platform !== Platform.Fabric) {
+  if (userContext.apiType !== "Tables") {
     newCollectionBtn.children = [createNewCollectionGroup(container)];
     const newDatabaseBtn = createNewDatabase(container);
     newCollectionBtn.children.push(newDatabaseBtn);

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -114,8 +114,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
     super(props);
 
     this.state = {
-      createNewDatabase:
-        userContext.apiType !== "Tables" && configContext.platform !== Platform.Fabric && !this.props.databaseId,
+      createNewDatabase: userContext.apiType !== "Tables" && !this.props.databaseId,
       newDatabaseId: props.isQuickstart ? this.getSampleDBName() : "",
       isSharedThroughputChecked: this.getSharedThroughputDefault(),
       selectedDatabaseId:
@@ -275,38 +274,36 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               </TooltipHost>
             </Stack>
 
-            {configContext.platform !== Platform.Fabric && (
-              <Stack horizontal verticalAlign="center">
-                <div role="radiogroup">
-                  <input
-                    className="panelRadioBtn"
-                    checked={this.state.createNewDatabase}
-                    aria-label="Create new database"
-                    aria-checked={this.state.createNewDatabase}
-                    name="databaseType"
-                    type="radio"
-                    role="radio"
-                    id="databaseCreateNew"
-                    tabIndex={0}
-                    onChange={this.onCreateNewDatabaseRadioBtnChange.bind(this)}
-                  />
-                  <span className="panelRadioBtnLabel">Create new</span>
+            <Stack horizontal verticalAlign="center">
+              <div role="radiogroup">
+                <input
+                  className="panelRadioBtn"
+                  checked={this.state.createNewDatabase}
+                  aria-label="Create new database"
+                  aria-checked={this.state.createNewDatabase}
+                  name="databaseType"
+                  type="radio"
+                  role="radio"
+                  id="databaseCreateNew"
+                  tabIndex={0}
+                  onChange={this.onCreateNewDatabaseRadioBtnChange.bind(this)}
+                />
+                <span className="panelRadioBtnLabel">Create new</span>
 
-                  <input
-                    className="panelRadioBtn"
-                    checked={!this.state.createNewDatabase}
-                    aria-label="Use existing database"
-                    aria-checked={!this.state.createNewDatabase}
-                    name="databaseType"
-                    type="radio"
-                    role="radio"
-                    tabIndex={0}
-                    onChange={this.onUseExistingDatabaseRadioBtnChange.bind(this)}
-                  />
-                  <span className="panelRadioBtnLabel">Use existing</span>
-                </div>
-              </Stack>
-            )}
+                <input
+                  className="panelRadioBtn"
+                  checked={!this.state.createNewDatabase}
+                  aria-label="Use existing database"
+                  aria-checked={!this.state.createNewDatabase}
+                  name="databaseType"
+                  type="radio"
+                  role="radio"
+                  tabIndex={0}
+                  onChange={this.onUseExistingDatabaseRadioBtnChange.bind(this)}
+                />
+                <span className="panelRadioBtnLabel">Use existing</span>
+              </div>
+            </Stack>
 
             {this.state.createNewDatabase && (
               <Stack className="panelGroupSpacing">

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -1,14 +1,4 @@
-import { PriorityLevel } from "@azure/cosmos";
-import {
-  Checkbox,
-  ChoiceGroup,
-  IChoiceGroupOption,
-  ISpinButtonStyles,
-  IToggleStyles,
-  Position,
-  SpinButton,
-  Toggle,
-} from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
@@ -16,10 +6,10 @@ import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import * as StringUtility from "Shared/StringUtility";
 import { userContext } from "UserContext";
 import { logConsoleInfo } from "Utils/NotificationConsoleUtils";
-import * as PriorityBasedExecutionUtils from "Utils/PriorityBasedExecutionUtils";
 import { useSidePanel } from "hooks/useSidePanel";
-import React, { FunctionComponent, useState } from "react";
+import React, { FunctionComponent, MouseEvent, useState } from "react";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
+import * as PriorityBasedExecutionUtils from "Utils/PriorityBasedExecutionUtils";
 
 export const SettingsPane: FunctionComponent = () => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
@@ -29,13 +19,6 @@ export const SettingsPane: FunctionComponent = () => {
       ? Constants.Queries.UnlimitedPageOption
       : Constants.Queries.CustomPageOption,
   );
-  const [queryTimeoutEnabled, setQueryTimeoutEnabled] = useState<boolean>(
-    LocalStorageUtility.getEntryBoolean(StorageKey.QueryTimeoutEnabled),
-  );
-  const [queryTimeout, setQueryTimeout] = useState<number>(LocalStorageUtility.getEntryNumber(StorageKey.QueryTimeout));
-  const [automaticallyCancelQueryAfterTimeout, setAutomaticallyCancelQueryAfterTimeout] = useState<boolean>(
-    LocalStorageUtility.getEntryBoolean(StorageKey.AutomaticallyCancelQueryAfterTimeout),
-  );
   const [customItemPerPage, setCustomItemPerPage] = useState<number>(
     LocalStorageUtility.getEntryNumber(StorageKey.CustomItemPerPage) || 0,
   );
@@ -59,10 +42,10 @@ export const SettingsPane: FunctionComponent = () => {
       ? LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism)
       : Constants.Queries.DefaultMaxDegreeOfParallelism,
   );
-  const [priorityLevel, setPriorityLevel] = useState<PriorityLevel>(
+  const [priorityLevel, setPriorityLevel] = useState<string>(
     LocalStorageUtility.hasItem(StorageKey.PriorityLevel)
-      ? (LocalStorageUtility.getEntryString(StorageKey.PriorityLevel) as PriorityLevel)
-      : PriorityLevel.Low,
+      ? LocalStorageUtility.getEntryString(StorageKey.PriorityLevel)
+      : Constants.PriorityLevel.Default,
   );
   const explorerVersion = configContext.gitSha;
   const shouldShowQueryPageOptions = userContext.apiType === "SQL";
@@ -70,7 +53,7 @@ export const SettingsPane: FunctionComponent = () => {
   const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin";
   const shouldShowParallelismOption = userContext.apiType !== "Gremlin";
   const shouldShowPriorityLevelOption = PriorityBasedExecutionUtils.isFeatureEnabled();
-  const handlerOnSubmit = () => {
+  const handlerOnSubmit = (e: MouseEvent<HTMLButtonElement>) => {
     setIsExecuting(true);
 
     LocalStorageUtility.setEntryNumber(
@@ -78,11 +61,10 @@ export const SettingsPane: FunctionComponent = () => {
       isCustomPageOptionSelected() ? customItemPerPage : Constants.Queries.unlimitedItemsPerPage,
     );
     LocalStorageUtility.setEntryNumber(StorageKey.CustomItemPerPage, customItemPerPage);
-    LocalStorageUtility.setEntryBoolean(StorageKey.QueryTimeoutEnabled, queryTimeoutEnabled);
     LocalStorageUtility.setEntryString(StorageKey.ContainerPaginationEnabled, containerPaginationEnabled.toString());
     LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, crossPartitionQueryEnabled.toString());
     LocalStorageUtility.setEntryNumber(StorageKey.MaxDegreeOfParellism, maxDegreeOfParallelism);
-    LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, priorityLevel);
+    LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, priorityLevel.toString());
 
     if (shouldShowGraphAutoVizOption) {
       LocalStorageUtility.setEntryBoolean(
@@ -91,14 +73,6 @@ export const SettingsPane: FunctionComponent = () => {
       );
     }
 
-    if (queryTimeoutEnabled) {
-      LocalStorageUtility.setEntryNumber(StorageKey.QueryTimeout, queryTimeout);
-      LocalStorageUtility.setEntryBoolean(
-        StorageKey.AutomaticallyCancelQueryAfterTimeout,
-        automaticallyCancelQueryAfterTimeout,
-      );
-    }
-
     setIsExecuting(false);
     logConsoleInfo(
       `Updated items per page setting to ${LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage)}`,
@@ -123,6 +97,7 @@ export const SettingsPane: FunctionComponent = () => {
       `Updated query setting to ${LocalStorageUtility.getEntryString(StorageKey.SetPartitionKeyUndefined)}`,
     );
     closeSidePanel();
+    e.preventDefault();
   };
 
   const isCustomPageOptionSelected = () => {
@@ -137,7 +112,7 @@ export const SettingsPane: FunctionComponent = () => {
     formError: "",
     isExecuting,
     submitButtonText: "Apply",
-    onSubmit: () => handlerOnSubmit(),
+    onSubmit: () => handlerOnSubmit(undefined),
   };
   const pageOptionList: IChoiceGroupOption[] = [
     { key: Constants.Queries.CustomPageOption, text: "Custom" },
@@ -150,36 +125,21 @@ export const SettingsPane: FunctionComponent = () => {
   ];
 
   const priorityLevelOptionList: IChoiceGroupOption[] = [
-    { key: PriorityLevel.Low, text: "Low" },
-    { key: PriorityLevel.High, text: "High" },
+    { key: Constants.PriorityLevel.Low, text: "Low" },
+    { key: Constants.PriorityLevel.High, text: "High" },
   ];
 
   const handleOnPriorityLevelOptionChange = (
     ev: React.FormEvent<HTMLInputElement>,
     option: IChoiceGroupOption,
   ): void => {
-    setPriorityLevel(option.key as PriorityLevel);
+    setPriorityLevel(option.key);
   };
 
   const handleOnPageOptionChange = (ev: React.FormEvent<HTMLInputElement>, option: IChoiceGroupOption): void => {
     setPageOption(option.key);
   };
 
-  const handleOnQueryTimeoutToggleChange = (ev: React.MouseEvent<HTMLElement>, checked?: boolean): void => {
-    setQueryTimeoutEnabled(checked);
-  };
-
-  const handleOnAutomaticallyCancelQueryToggleChange = (ev: React.MouseEvent<HTMLElement>, checked?: boolean): void => {
-    setAutomaticallyCancelQueryAfterTimeout(checked);
-  };
-
-  const handleOnQueryTimeoutSpinButtonChange = (ev: React.MouseEvent<HTMLElement>, newValue?: string): void => {
-    const queryTimeout = Number(newValue);
-    if (!isNaN(queryTimeout)) {
-      setQueryTimeout(queryTimeout);
-    }
-  };
-
   const choiceButtonStyles = {
     root: {
       clear: "both",
@@ -201,35 +161,6 @@ export const SettingsPane: FunctionComponent = () => {
       },
     ],
   };
-
-  const queryTimeoutToggleStyles: IToggleStyles = {
-    label: {
-      fontSize: 12,
-      fontWeight: 400,
-      display: "block",
-    },
-    root: {},
-    container: {},
-    pill: {},
-    thumb: {},
-    text: {},
-  };
-
-  const queryTimeoutSpinButtonStyles: ISpinButtonStyles = {
-    label: {
-      fontSize: 12,
-      fontWeight: 400,
-    },
-    root: {
-      paddingBottom: 10,
-    },
-    labelWrapper: {},
-    icon: {},
-    spinButtonWrapper: {},
-    input: {},
-    arrowButtonsContainer: {},
-  };
-
   return (
     <RightPaneForm {...genericPaneProps}>
       <div className="paneMainContent">
@@ -280,50 +211,6 @@ export const SettingsPane: FunctionComponent = () => {
             </div>
           </div>
         )}
-        {userContext.apiType === "SQL" && (
-          <div className="settingsSection">
-            <div className="settingsSectionPart">
-              <div>
-                <legend id="queryTimeoutLabel" className="settingsSectionLabel legendLabel">
-                  Query Timeout
-                </legend>
-                <InfoTooltip>
-                  When a query reaches a specified time limit, a popup with an option to cancel the query will show
-                  unless automatic cancellation has been enabled
-                </InfoTooltip>
-              </div>
-              <div>
-                <Toggle
-                  styles={queryTimeoutToggleStyles}
-                  label="Enable query timeout"
-                  onChange={handleOnQueryTimeoutToggleChange}
-                  defaultChecked={queryTimeoutEnabled}
-                />
-              </div>
-              {queryTimeoutEnabled && (
-                <div>
-                  <SpinButton
-                    label="Query timeout (ms)"
-                    labelPosition={Position.top}
-                    defaultValue={(queryTimeout || 5000).toString()}
-                    min={100}
-                    step={1000}
-                    onChange={handleOnQueryTimeoutSpinButtonChange}
-                    incrementButtonAriaLabel="Increase value by 1000"
-                    decrementButtonAriaLabel="Decrease value by 1000"
-                    styles={queryTimeoutSpinButtonStyles}
-                  />
-                  <Toggle
-                    label="Automatically cancel query after timeout"
-                    styles={queryTimeoutToggleStyles}
-                    onChange={handleOnAutomaticallyCancelQueryToggleChange}
-                    defaultChecked={automaticallyCancelQueryAfterTimeout}
-                  />
-                </div>
-              )}
-            </div>
-          </div>
-        )}
         <div className="settingsSection">
           <div className="settingsSectionPart">
             <div className="settingsSectionLabel">
@@ -402,7 +289,8 @@ export const SettingsPane: FunctionComponent = () => {
                 </legend>
                 <InfoTooltip>
                   Sets the priority level for data-plane requests from Data Explorer when using Priority-Based
-                  Execution.
+                  Execution. If &quot;None&quot; is selected, Data Explorer will not specify priority level, and the
+                  server-side default priority level will be used.
                 </InfoTooltip>
                 <ChoiceGroup
                   ariaLabelledBy="priorityLevel"

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

@@ -97,46 +97,6 @@ exports[`Settings Pane should render Default properly 1`] = `
         </div>
       </div>
     </div>
-    <div
-      className="settingsSection"
-    >
-      <div
-        className="settingsSectionPart"
-      >
-        <div>
-          <legend
-            className="settingsSectionLabel legendLabel"
-            id="queryTimeoutLabel"
-          >
-            Query Timeout
-          </legend>
-          <InfoTooltip>
-            When a query reaches a specified time limit, a popup with an option to cancel the query will show unless automatic cancellation has been enabled
-          </InfoTooltip>
-        </div>
-        <div>
-          <StyledToggleBase
-            defaultChecked={false}
-            label="Enable query timeout"
-            onChange={[Function]}
-            styles={
-              Object {
-                "container": Object {},
-                "label": Object {
-                  "display": "block",
-                  "fontSize": 12,
-                  "fontWeight": 400,
-                },
-                "pill": Object {},
-                "root": Object {},
-                "text": Object {},
-                "thumb": Object {},
-              }
-            }
-          />
-        </div>
-      </div>
-    </div>
     <div
       className="settingsSection"
     >

src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.test.tsx

@@ -102,7 +102,7 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it("should not submit submission if required description field is null", () => {
+  it("should submit submission", () => {
     const explorer = new Explorer();
     const wrapper = shallow(<QueryCopilotFeedbackModal explorer={explorer} />);
 
@@ -110,24 +110,12 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
     submitButton.simulate("click");
     wrapper.setProps({});
 
-    expect(SubmitFeedback).toHaveBeenCalledTimes(0);
-  });
-
-  it("should submit submission", () => {
-    useQueryCopilot.getState().openFeedbackModal("test query", false, "test prompt");
-    const explorer = new Explorer();
-    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={explorer} />);
-
-    const submitButton = wrapper.find("form");
-    submitButton.simulate("submit");
-    wrapper.setProps({});
-
     expect(SubmitFeedback).toHaveBeenCalledTimes(1);
     expect(SubmitFeedback).toHaveBeenCalledWith({
       params: {
         likeQuery: false,
-        generatedQuery: "test query",
-        userPrompt: "test prompt",
+        generatedQuery: "",
+        userPrompt: "",
         description: "",
         contact: getUserEmail(),
       },

src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx

@@ -25,94 +25,93 @@ export const QueryCopilotFeedbackModal = ({ explorer }: { explorer: Explorer }):
     closeFeedbackModal,
     setHideFeedbackModalForLikedQueries,
   } = useQueryCopilot();
-  const [isContactAllowed, setIsContactAllowed] = React.useState<boolean>(false);
+  const [isContactAllowed, setIsContactAllowed] = React.useState<boolean>(true);
   const [description, setDescription] = React.useState<string>("");
   const [doNotShowAgainChecked, setDoNotShowAgainChecked] = React.useState<boolean>(false);
   const [contact, setContact] = React.useState<string>(getUserEmail());
 
-  const handleSubmit = () => {
-    closeFeedbackModal();
-    setHideFeedbackModalForLikedQueries(doNotShowAgainChecked);
-    SubmitFeedback({
-      params: { generatedQuery, likeQuery, description, userPrompt, contact },
-      explorer: explorer,
-    });
-  };
-
   return (
     <Modal isOpen={showFeedbackModal}>
-      <form onSubmit={handleSubmit}>
-        <Stack style={{ padding: 24 }}>
-          <Stack horizontal horizontalAlign="space-between">
-            <Text style={{ fontSize: 20, fontWeight: 600, marginBottom: 20 }}>Send feedback to Microsoft</Text>
-            <IconButton iconProps={{ iconName: "Cancel" }} onClick={() => closeFeedbackModal()} />
-          </Stack>
-          <Text style={{ fontSize: 14, marginBottom: 14 }}>Your feedback will help improve the experience.</Text>
-          <TextField
-            styles={{ root: { marginBottom: 14 } }}
-            label="Description"
-            required
-            placeholder="Provide more details"
-            value={description}
-            onChange={(_, newValue) => setDescription(newValue)}
-            multiline
-            rows={3}
-          />
-          <TextField
-            styles={{ root: { marginBottom: 14 } }}
-            label="Query generated"
-            defaultValue={generatedQuery}
-            readOnly
-          />
-          <ChoiceGroup
-            styles={{
-              root: {
-                marginBottom: 14,
-              },
-              flexContainer: {
-                selectors: {
-                  ".ms-ChoiceField-field::before": { marginTop: 4 },
-                  ".ms-ChoiceField-field::after": { marginTop: 4 },
-                  ".ms-ChoiceFieldLabel": { paddingLeft: 6 },
-                },
-              },
-            }}
-            label="May we contact you about your feedback?"
-            options={[
-              { key: "yes", text: "Yes, you may contact me." },
-              { key: "no", text: "No, do not contact me." },
-            ]}
-            selectedKey={isContactAllowed ? "yes" : "no"}
-            onChange={(_, option) => {
-              setIsContactAllowed(option.key === "yes");
-              setContact(option.key === "yes" ? getUserEmail() : "");
-            }}
-          ></ChoiceGroup>
-          <Text style={{ fontSize: 12, marginBottom: 14 }}>
-            By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the{" "}
-            {
-              <Link href="https://privacy.microsoft.com/privacystatement" target="_blank">
-                Privacy statement
-              </Link>
-            }{" "}
-            for more information.
-          </Text>
-          {likeQuery && (
-            <Checkbox
-              styles={{ label: { paddingLeft: 0 }, root: { marginBottom: 14 } }}
-              label="Don't show me this next time"
-              checked={doNotShowAgainChecked}
-              onChange={(_, checked) => setDoNotShowAgainChecked(checked)}
-            />
-          )}
-          <Stack horizontal horizontalAlign="end">
-            <PrimaryButton styles={{ root: { marginRight: 8 } }} type="submit">
-              Submit
-            </PrimaryButton>
-            <DefaultButton onClick={() => closeFeedbackModal()}>Cancel</DefaultButton>
-          </Stack>
+      <Stack style={{ padding: 24 }}>
+        <Stack horizontal horizontalAlign="space-between">
+          <Text style={{ fontSize: 20, fontWeight: 600, marginBottom: 20 }}>Send feedback to Microsoft</Text>
+          <IconButton iconProps={{ iconName: "Cancel" }} onClick={() => closeFeedbackModal()} />
         </Stack>
-      </form>
+        <Text style={{ fontSize: 14, marginBottom: 14 }}>Your feedback will help improve the experience.</Text>
+        <TextField
+          styles={{ root: { marginBottom: 14 } }}
+          label="Description"
+          required
+          placeholder="Provide more details"
+          value={description}
+          onChange={(_, newValue) => setDescription(newValue)}
+          multiline
+          rows={3}
+        />
+        <TextField
+          styles={{ root: { marginBottom: 14 } }}
+          label="Query generated"
+          defaultValue={generatedQuery}
+          readOnly
+        />
+        <ChoiceGroup
+          styles={{
+            root: {
+              marginBottom: 14,
+            },
+            flexContainer: {
+              selectors: {
+                ".ms-ChoiceField-field::before": { marginTop: 4 },
+                ".ms-ChoiceField-field::after": { marginTop: 4 },
+                ".ms-ChoiceFieldLabel": { paddingLeft: 6 },
+              },
+            },
+          }}
+          label="May we contact you about your feedback?"
+          options={[
+            { key: "yes", text: "Yes, you may contact me." },
+            { key: "no", text: "No, do not contact me." },
+          ]}
+          selectedKey={isContactAllowed ? "yes" : "no"}
+          onChange={(_, option) => {
+            setIsContactAllowed(option.key === "yes");
+            setContact(option.key === "yes" ? getUserEmail() : "");
+          }}
+        ></ChoiceGroup>
+        <Text style={{ fontSize: 12, marginBottom: 14 }}>
+          By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the{" "}
+          {
+            <Link href="https://privacy.microsoft.com/privacystatement" target="_blank">
+              Privacy statement
+            </Link>
+          }{" "}
+          for more information.
+        </Text>
+        {likeQuery && (
+          <Checkbox
+            styles={{ label: { paddingLeft: 0 }, root: { marginBottom: 14 } }}
+            label="Don't show me this next time"
+            checked={doNotShowAgainChecked}
+            onChange={(_, checked) => setDoNotShowAgainChecked(checked)}
+          />
+        )}
+        <Stack horizontal horizontalAlign="end">
+          <PrimaryButton
+            styles={{ root: { marginRight: 8 } }}
+            onClick={() => {
+              closeFeedbackModal();
+              setHideFeedbackModalForLikedQueries(doNotShowAgainChecked);
+              SubmitFeedback({
+                params: { generatedQuery, likeQuery, description, userPrompt, contact },
+                explorer: explorer,
+              });
+            }}
+          >
+            Submit
+          </PrimaryButton>
+          <DefaultButton onClick={() => closeFeedbackModal()}>Cancel</DefaultButton>
+        </Stack>
+      </Stack>
     </Modal>
   );
 };

src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import {
   Callout,
   CommandBarButton,
@@ -140,7 +141,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
 
     // Filter suggested prompts
     const filteredSuggested = suggestedPrompts.filter((prompt) =>
-      prompt.text.toLowerCase().includes(value.toLowerCase()),
+      prompt.text.toLowerCase().includes(value.toLowerCase())
     );
     setFilteredSuggestedPrompts(filteredSuggested);
   };
@@ -150,7 +151,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
     const existingHistories = histories.map((history) => history.replace(/\s+/g, " ").trim());
 
     const updatedHistories = existingHistories.filter(
-      (history) => history.toLowerCase() !== formattedUserPrompt.toLowerCase(),
+      (history) => history.toLowerCase() !== formattedUserPrompt.toLowerCase()
     );
     const newHistories = [formattedUserPrompt, ...updatedHistories.slice(0, 2)];
 
@@ -237,7 +238,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
   const showTeachingBubble = (): void => {
     if (!inputEdited.current) {
       setTimeout(() => {
-        if (!inputEdited.current && !isWelcomModalVisible()) {
+        if (!inputEdited.current) {
           toggleCopilotTeachingBubbleVisible();
           inputEdited.current = true;
         }
@@ -245,10 +246,6 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
     }
   };
 
-  const isWelcomModalVisible = (): boolean => {
-    return localStorage.getItem("hideWelcomeModal") !== "true";
-  };
-
   const clearFeedback = () => {
     resetButtonState();
     resetQueryResults();
@@ -301,7 +298,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
             setShowSamplePrompts(true);
           }}
           onKeyDown={(e) => {
-            if (e.key === "Enter" && userPrompt) {
+            if (e.key === "Enter") {
               inputEdited.current = true;
               startGenerateQueryProcess();
             }
@@ -537,7 +534,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
             iconProps={{ iconName: "Copy" }}
             style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
           >
-            Copy query
+            Copy code
           </CommandBarButton>
           <CommandBarButton
             onClick={() => {
@@ -546,11 +543,11 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
             iconProps={{ iconName: "Delete" }}
             style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
           >
-            Delete query
+            Delete code
           </CommandBarButton>
         </Stack>
       )}
-      <WelcomeModal visible={isWelcomModalVisible()} />
+      <WelcomeModal visible={localStorage.getItem("hideWelcomeModal") !== "true"} />
       {isSamplePromptsOpen && <SamplePrompts sampleProps={sampleProps} />}
       {query !== "" && query.trim().length !== 0 && (
         <DeletePopup

src/Explorer/QueryCopilot/QueryCopilotTab.tsx

@@ -21,13 +21,8 @@ import * as StringUtility from "../../Shared/StringUtility";
 export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: QueryCopilotProps): JSX.Element => {
   const { query, setQuery, selectedQuery, setSelectedQuery, isGeneratingQuery } = useQueryCopilot();
 
-  const cachedCopilotToggleStatus: string = localStorage.getItem(
-    `${userContext.databaseAccount?.id}-queryCopilotToggleStatus`,
-  );
-  const copilotInitialActive: boolean = cachedCopilotToggleStatus
-    ? StringUtility.toBoolean(cachedCopilotToggleStatus)
-    : true;
-  const [copilotActive, setCopilotActive] = useState<boolean>(copilotInitialActive);
+  const cachedCopilotToggleStatus = localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotToggleStatus`);
+  const [copilotActive, setCopilotActive] = useState<boolean>(StringUtility.toBoolean(cachedCopilotToggleStatus));
 
   const getCommandbarButtons = (): CommandButtonComponentProps[] => {
     const executeQueryBtnLabel = selectedQuery ? "Execute Selection" : "Execute Query";
@@ -92,7 +87,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
           <QueryCopilotPromptbar explorer={explorer} toggleCopilot={toggleCopilot}></QueryCopilotPromptbar>
         )}
         <Stack className="tabPaneContentContainer">
-          <SplitterLayout percentage={true} vertical={true} primaryIndex={0} primaryMinSize={30} secondaryMinSize={70}>
+          <SplitterLayout vertical={true} primaryIndex={0} primaryMinSize={100} secondaryMinSize={200}>
             <EditorReact
               language={"sql"}
               content={query}

src/Explorer/QueryCopilot/Shared/QueryCopilotClient.ts

@@ -166,7 +166,7 @@ export const OnExecuteQueryClick = async (): Promise<void> => {
 
 export const QueryDocumentsPerPage = async (
   firstItemIndex: number,
-  queryIterator: MinimalQueryIterator,
+  queryIterator: MinimalQueryIterator
 ): Promise<void> => {
   try {
     useQueryCopilot.getState().setIsExecuting(true);
@@ -174,8 +174,7 @@ export const QueryDocumentsPerPage = async (
     useTabs.getState().setIsQueryErrorThrown(false);
     const queryResults: QueryResults = await queryPagesUntilContentPresent(
       firstItemIndex,
-      async (firstItemIndex: number) =>
-        queryDocumentsPage(QueryCopilotSampleContainerId, queryIterator, firstItemIndex),
+      async (firstItemIndex: number) => queryDocumentsPage(QueryCopilotSampleContainerId, queryIterator, firstItemIndex)
     );
 
     useQueryCopilot.getState().setQueryResults(queryResults);
@@ -186,7 +185,7 @@ export const QueryDocumentsPerPage = async (
     });
   } catch (error) {
     const isCopilotActive = StringUtility.toBoolean(
-      localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotToggleStatus`),
+      localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotToggleStatus`)
     );
     const errorMessage = getErrorMessage(error);
     traceFailure(Action.ExecuteQueryGeneratedFromQueryCopilot, {

src/Explorer/QueryCopilot/__snapshots__/QueryCopilotTab.test.tsx.snap

@@ -17,37 +17,6 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
       }
     }
   >
-    <QueryCopilotPromptbar
-      explorer={
-        Explorer {
-          "_isInitializingNotebooks": false,
-          "_resetNotebookWorkspace": [Function],
-          "isFixedCollectionWithSharedThroughputSupported": [Function],
-          "isTabsContentExpanded": [Function],
-          "onRefreshDatabasesKeyPress": [Function],
-          "onRefreshResourcesClick": [Function],
-          "phoenixClient": PhoenixClient {
-            "armResourceId": undefined,
-            "retryOptions": Object {
-              "maxTimeout": 5000,
-              "minTimeout": 5000,
-              "retries": 3,
-            },
-          },
-          "provideFeedbackEmail": [Function],
-          "queriesClient": QueriesClient {
-            "container": [Circular],
-          },
-          "refreshNotebookList": [Function],
-          "resourceTree": ResourceTreeAdapter {
-            "container": [Circular],
-            "copyNotebook": [Function],
-            "parameters": [Function],
-          },
-        }
-      }
-      toggleCopilot={[Function]}
-    />
     <Stack
       className="tabPaneContentContainer"
     >
@@ -56,10 +25,10 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
         onDragEnd={null}
         onDragStart={null}
         onSecondaryPaneSizeChange={null}
-        percentage={true}
+        percentage={false}
         primaryIndex={0}
-        primaryMinSize={30}
-        secondaryMinSize={70}
+        primaryMinSize={100}
+        secondaryMinSize={200}
         vertical={true}
       >
         <EditorReact

src/Explorer/Tabs/DocumentsTab.html

@@ -98,7 +98,7 @@
             <button
               class="filterbtnstyle queryButton"
               data-bind="
-                                click: refreshDocumentsGrid.bind($data, true),
+                                click: refreshDocumentsGrid,
                                 enable: applyFilterButton.enabled"
               aria-label="Apply filter"
               tabindex="0"
@@ -176,7 +176,7 @@
                   <img
                     class="refreshcol"
                     src="/refresh-cosmos.svg"
-                    data-bind="click: refreshDocumentsGrid.bind($data, false)"
+                    data-bind="click: refreshDocumentsGrid"
                     alt="Refresh documents"
                     tabindex="0"
                   />
@@ -209,10 +209,7 @@
           </table>
         </div>
         <div class="loadMore">
-          <a
-            role="button"
-            data-bind="click: loadNextPage.bind($data, false), event: { keypress: onLoadMoreKeyInput }"
-            tabindex="0"
+          <a role="button" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
             >Load more</a
           >
         </div>

src/Explorer/Tabs/DocumentsTab.ts

@@ -1,15 +1,12 @@
-import { ItemDefinition, PartitionKey, PartitionKeyDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { extractPartitionKey, ItemDefinition, PartitionKeyDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import { querySampleDocuments, readSampleDocument } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import * as ko from "knockout";
 import Q from "q";
-import { format } from "react-string-format";
-import { QueryConstants } from "Shared/Constants";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import DeleteDocumentIcon from "../../../images/DeleteDocument.svg";
-import NewDocumentIcon from "../../../images/NewDocument.svg";
-import UploadIcon from "../../../images/Upload_16x16.svg";
 import DiscardIcon from "../../../images/discard.svg";
+import NewDocumentIcon from "../../../images/NewDocument.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
+import UploadIcon from "../../../images/Upload_16x16.svg";
 import * as Constants from "../../Common/Constants";
 import {
   DocumentsGridMetrics,
@@ -17,15 +14,15 @@ import {
   QueryCopilotSampleContainerId,
   QueryCopilotSampleDatabaseId,
 } from "../../Common/Constants";
-import editable from "../../Common/EditableUtility";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
-import * as HeadersUtility from "../../Common/HeadersUtility";
-import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { deleteDocument } from "../../Common/dataAccess/deleteDocument";
 import { queryDocuments } from "../../Common/dataAccess/queryDocuments";
 import { readDocument } from "../../Common/dataAccess/readDocument";
 import { updateDocument } from "../../Common/dataAccess/updateDocument";
+import editable from "../../Common/EditableUtility";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
+import * as HeadersUtility from "../../Common/HeadersUtility";
+import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
@@ -33,7 +30,6 @@ import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
 import { logConsoleError } from "../../Utils/NotificationConsoleUtils";
 import * as QueryUtils from "../../Utils/QueryUtils";
-import { extractPartitionKeyValues } from "../../Utils/QueryUtils";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import { useDialog } from "../Controls/Dialog";
 import Explorer from "../Explorer";
@@ -83,7 +79,6 @@ export default class DocumentsTab extends TabsBase {
   private _resourceTokenPartitionKey: string;
   private _isQueryCopilotSampleContainer: boolean;
   private queryAbortController: AbortController;
-  private cancelQueryTimeoutID: NodeJS.Timeout;
 
   constructor(options: ViewModels.DocumentsTabOptions) {
     super(options);
@@ -351,22 +346,6 @@ export default class DocumentsTab extends TabsBase {
     return true;
   }
 
-  /**
-   * Query first page of documents
-   * Select and query first document and display content
-   */
-  private async autoPopulateContent(applyFilterButtonPressed?: boolean) {
-    // reset iterator
-    this._documentsIterator = this.createIterator();
-    // load documents
-    await this.loadNextPage(applyFilterButtonPressed);
-
-    // Select first document and load content
-    if (this.documentIds().length > 0) {
-      this.documentIds()[0].click();
-    }
-  }
-
   public onShowFilterClick(): Q.Promise<any> {
     this.isFilterCreated(true);
     this.isFilterExpanded(true);
@@ -396,14 +375,15 @@ export default class DocumentsTab extends TabsBase {
     return true;
   };
 
-  public async refreshDocumentsGrid(applyFilterButtonPressed?: boolean): Promise<void> {
+  public async refreshDocumentsGrid(): Promise<void> {
     // clear documents grid
     this.documentIds([]);
+
     try {
       // reset iterator
       this._documentsIterator = this.createIterator();
       // load documents
-      await this.autoPopulateContent(applyFilterButtonPressed);
+      await this.loadNextPage();
       // collapse filter
       this.appliedFilter(this.filterContent());
       this.isFilterExpanded(false);
@@ -426,11 +406,6 @@ export default class DocumentsTab extends TabsBase {
     this.queryAbortController.abort();
   }
 
-  /**
-   * TODO Doesn't seem to be used: remove?
-   * @param clickedDocumentId
-   * @returns
-   */
   public onDocumentIdClick(clickedDocumentId: DocumentId): Q.Promise<any> {
     if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
       return Q();
@@ -480,7 +455,7 @@ export default class DocumentsTab extends TabsBase {
           const value: string = this.renderObjectForEditor(savedDocument || {}, null, 4);
           this.selectedDocumentContent.setBaseline(value);
           this.initialDocumentContent(value);
-          const partitionKeyValueArray: PartitionKey[] = extractPartitionKeyValues(
+          const partitionKeyValueArray = extractPartitionKey(
             savedDocument,
             this.partitionKey as PartitionKeyDefinition,
           );
@@ -531,10 +506,7 @@ export default class DocumentsTab extends TabsBase {
     const selectedDocumentId = this.selectedDocumentId();
     const documentContent = JSON.parse(this.selectedDocumentContent());
 
-    const partitionKeyValueArray: PartitionKey[] = extractPartitionKeyValues(
-      documentContent,
-      this.partitionKey as PartitionKeyDefinition,
-    );
+    const partitionKeyValueArray = extractPartitionKey(documentContent, this.partitionKey as PartitionKeyDefinition);
     selectedDocumentId.partitionKeyValue = partitionKeyValueArray;
 
     this.isExecutionError(false);
@@ -652,7 +624,8 @@ export default class DocumentsTab extends TabsBase {
 
     if (!this._documentsIterator) {
       try {
-        await this.autoPopulateContent();
+        this._documentsIterator = this.createIterator();
+        await this.loadNextPage();
       } catch (error) {
         if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
           TelemetryProcessor.traceFailure(
@@ -743,35 +716,9 @@ export default class DocumentsTab extends TabsBase {
     this.initDocumentEditor(documentId, content);
   }
 
-  public loadNextPage(applyFilterButtonClicked?: boolean): Q.Promise<any> {
+  public loadNextPage(): Q.Promise<any> {
     this.isExecuting(true);
     this.isExecutionError(false);
-    let automaticallyCancelQueryAfterTimeout: boolean;
-    if (applyFilterButtonClicked && this.queryTimeoutEnabled()) {
-      const queryTimeout: number = LocalStorageUtility.getEntryNumber(StorageKey.QueryTimeout);
-      automaticallyCancelQueryAfterTimeout = LocalStorageUtility.getEntryBoolean(
-        StorageKey.AutomaticallyCancelQueryAfterTimeout,
-      );
-      const cancelQueryTimeoutID: NodeJS.Timeout = setTimeout(() => {
-        if (this.isExecuting()) {
-          if (automaticallyCancelQueryAfterTimeout) {
-            this.queryAbortController.abort();
-          } else {
-            useDialog
-              .getState()
-              .showOkCancelModalDialog(
-                QueryConstants.CancelQueryTitle,
-                format(QueryConstants.CancelQuerySubTextTemplate, QueryConstants.CancelQueryTimeoutThresholdReached),
-                "Yes",
-                () => this.queryAbortController.abort(),
-                "No",
-                undefined,
-              );
-          }
-        }
-      }, queryTimeout);
-      this.cancelQueryTimeoutID = cancelQueryTimeoutID;
-    }
     return this._loadNextPageInternal()
       .then(
         (documentsIdsResponse = []) => {
@@ -827,15 +774,7 @@ export default class DocumentsTab extends TabsBase {
           }
         },
       )
-      .finally(() => {
-        this.isExecuting(false);
-        if (applyFilterButtonClicked && this.queryTimeoutEnabled()) {
-          clearTimeout(this.cancelQueryTimeoutID);
-          if (!automaticallyCancelQueryAfterTimeout) {
-            useDialog.getState().closeDialog();
-          }
-        }
-      });
+      .finally(() => this.isExecuting(false));
   }
 
   public onLoadMoreKeyInput = (source: any, event: KeyboardEvent): void => {
@@ -1013,8 +952,4 @@ export default class DocumentsTab extends TabsBase {
         useSelectedNode.getState().isQueryCopilotCollectionSelected(),
     };
   }
-
-  private queryTimeoutEnabled(): boolean {
-    return !this.isPreferredApiMongoDB && LocalStorageUtility.getEntryBoolean(StorageKey.QueryTimeoutEnabled);
-  }
 }

src/Explorer/Tabs/MongoDocumentsTab.ts

@@ -1,5 +1,4 @@
-import { PartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
-import { extractPartitionKeyValues } from "Utils/QueryUtils";
+import { extractPartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
 import * as Constants from "../../Common/Constants";
@@ -89,7 +88,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
     )
       .then(
         (savedDocument: any) => {
-          const partitionKeyArray: PartitionKey[] = extractPartitionKeyValues(
+          let partitionKeyArray = extractPartitionKey(
             savedDocument,
             this._getPartitionKeyDefinition() as PartitionKeyDefinition,
           );
@@ -151,7 +150,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
 
           this.documentIds().forEach((documentId: DocumentId) => {
             if (documentId.rid === updatedDocument._rid) {
-              const partitionKeyArray: PartitionKey[] = extractPartitionKeyValues(
+              const partitionKeyArray = extractPartitionKey(
                 updatedDocument,
                 this._getPartitionKeyDefinition() as PartitionKeyDefinition,
               );
@@ -290,7 +289,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
   }
 
   private _hasShardKeySpecified(document: any): boolean {
-    return Boolean(extractPartitionKeyValues(document, this._getPartitionKeyDefinition() as PartitionKeyDefinition));
+    return Boolean(extractPartitionKey(document, this._getPartitionKeyDefinition() as PartitionKeyDefinition));
   }
 
   private _getPartitionKeyDefinition(): DataModels.PartitionKey {

src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx

@@ -1,16 +1,12 @@
 import { FeedOptions } from "@azure/cosmos";
-import { useDialog } from "Explorer/Controls/Dialog";
 import { OnExecuteQueryClick } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { QueryCopilotResults } from "Explorer/QueryCopilot/Shared/QueryCopilotResults";
 import { QueryCopilotSidebar } from "Explorer/QueryCopilot/V2/Sidebar/QueryCopilotSidebar";
 import { QueryResultSection } from "Explorer/Tabs/QueryTab/QueryResultSection";
-import { QueryConstants } from "Shared/Constants";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
 import React, { Fragment } from "react";
 import SplitterLayout from "react-splitter-layout";
 import "react-splitter-layout/lib/index.css";
-import { format } from "react-string-format";
 import LaunchCopilot from "../../../../images/CopilotTabIcon.svg";
 import CancelQueryIcon from "../../../../images/Entity_cancel.svg";
 import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
@@ -84,7 +80,6 @@ interface IQueryTabStates {
   isExecuting: boolean;
   showCopilotSidebar: boolean;
   queryCopilotGeneratedQuery: string;
-  cancelQueryTimeoutID: NodeJS.Timeout;
 }
 
 export default class QueryTabComponent extends React.Component<IQueryTabComponentProps, IQueryTabStates> {
@@ -112,13 +107,13 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
       isExecuting: false,
       showCopilotSidebar: useQueryCopilot.getState().showCopilotSidebar,
       queryCopilotGeneratedQuery: useQueryCopilot.getState().query,
-      cancelQueryTimeoutID: undefined,
     };
     this.isCloseClicked = false;
     this.splitterId = this.props.tabId + "_splitter";
     this.queryEditorId = `queryeditor${this.props.tabId}`;
     this.isPreferredApiMongoDB = this.props.isPreferredApiMongoDB;
     this.isCopilotTabActive = QueryCopilotSampleDatabaseId === this.props.collection.databaseId;
+
     this.executeQueryButton = {
       enabled: !!this.state.sqlQueryEditorContent && this.state.sqlQueryEditorContent.length > 0,
       visible: true,
@@ -255,34 +250,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
     this.setState({
       isExecuting: true,
     });
-    let automaticallyCancelQueryAfterTimeout: boolean;
-    if (this.queryTimeoutEnabled()) {
-      const queryTimeout: number = LocalStorageUtility.getEntryNumber(StorageKey.QueryTimeout);
-      automaticallyCancelQueryAfterTimeout = LocalStorageUtility.getEntryBoolean(
-        StorageKey.AutomaticallyCancelQueryAfterTimeout,
-      );
-      const cancelQueryTimeoutID: NodeJS.Timeout = setTimeout(() => {
-        if (this.state.isExecuting) {
-          if (automaticallyCancelQueryAfterTimeout) {
-            this.queryAbortController.abort();
-          } else {
-            useDialog
-              .getState()
-              .showOkCancelModalDialog(
-                QueryConstants.CancelQueryTitle,
-                format(QueryConstants.CancelQuerySubTextTemplate, QueryConstants.CancelQueryTimeoutThresholdReached),
-                "Yes",
-                () => this.queryAbortController.abort(),
-                "No",
-                undefined,
-              );
-          }
-        }
-      }, queryTimeout);
-      this.setState({
-        cancelQueryTimeoutID,
-      });
-    }
     useCommandBar.getState().setContextButtons(this.getTabsButtons());
 
     try {
@@ -306,14 +273,7 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
       this.props.tabsBaseInstance.isExecuting(false);
       this.setState({
         isExecuting: false,
-        cancelQueryTimeoutID: undefined,
       });
-      if (this.queryTimeoutEnabled()) {
-        clearTimeout(this.state.cancelQueryTimeoutID);
-        if (!automaticallyCancelQueryAfterTimeout) {
-          useDialog.getState().closeDialog();
-        }
-      }
       this.togglesOnFocus();
       useCommandBar.getState().setContextButtons(this.getTabsButtons());
     }
@@ -445,10 +405,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
     return this.state.sqlQueryEditorContent;
   }
 
-  private queryTimeoutEnabled(): boolean {
-    return !this.isPreferredApiMongoDB && LocalStorageUtility.getEntryBoolean(StorageKey.QueryTimeoutEnabled);
-  }
-
   private unsubscribeCopilotSidebar: () => void;
 
   componentDidMount(): void {

src/Explorer/Tree/ConflictId.ts

@@ -1,4 +1,4 @@
-import { extractPartitionKeyValues } from "Utils/QueryUtils";
+import { extractPartitionKey } from "@azure/cosmos";
 import * as ko from "knockout";
 import * as Constants from "../../Common/Constants";
 import { readDocument } from "../../Common/dataAccess/readDocument";
@@ -42,7 +42,7 @@ export default class ConflictId {
     }
     this.partitionKeyProperty = container && container.partitionKeyProperty;
     this.partitionKey = container && container.partitionKey;
-    this.partitionKeyValue = extractPartitionKeyValues(this.parsedContent, this.partitionKey as any);
+    this.partitionKeyValue = extractPartitionKey(this.parsedContent, this.partitionKey as any);
     this.stringPartitionKeyValue = this.getPartitionKeyValueAsString();
     this.id = ko.observable(data.id);
     this.isDirty = ko.observable(false);

src/Platform/Hosted/Components/ConnectExplorer.test.tsx

@@ -1,8 +1,6 @@
 jest.mock("../../../hooks/useDirectories");
 import "@testing-library/jest-dom";
 import { fireEvent, render, screen } from "@testing-library/react";
-import { extractFeatures } from "Platform/Hosted/extractFeatures";
-import { updateUserContext, userContext } from "UserContext";
 import React from "react";
 import { ConnectExplorer } from "./ConnectExplorer";
 
@@ -18,24 +16,3 @@ it("shows the connect form", () => {
   fireEvent.click(screen.getByText("Connect to your account with connection string"));
   expect(screen.queryByPlaceholderText("Please enter a connection string")).toBeDefined();
 });
-
-it("hides the connection string link when feature.disableConnectionStringLogin is true", () => {
-  const connectionString = "fakeConnectionString";
-  const login = jest.fn();
-  const setConnectionString = jest.fn();
-  const setEncryptedToken = jest.fn();
-  const setAuthType = jest.fn();
-  const oldFeatures = userContext.features;
-
-  const params = new URLSearchParams({
-    "feature.disableConnectionStringLogin": "true",
-  });
-
-  const testFeatures = extractFeatures(params);
-  updateUserContext({ features: testFeatures });
-
-  render(<ConnectExplorer {...{ login, setEncryptedToken, setAuthType, connectionString, setConnectionString }} />);
-  expect(screen.queryByPlaceholderText("Connect to your account with connection string")).toBeNull();
-
-  updateUserContext({ features: oldFeatures });
-});

src/Platform/Hosted/Components/ConnectExplorer.tsx

@@ -1,5 +1,4 @@
 import { useBoolean } from "@fluentui/react-hooks";
-import { userContext } from "UserContext";
 import * as React from "react";
 import ConnectImage from "../../../../images/HdeConnectCosmosDB.svg";
 import ErrorImage from "../../../../images/error.svg";
@@ -38,7 +37,6 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
   setConnectionString,
 }: Props) => {
   const [isFormVisible, { setTrue: showForm }] = useBoolean(false);
-  const enableConnectionStringLogin = !userContext.features.disableConnectionStringLogin;
 
   return (
     <div id="connectExplorer" className="connectExplorerContainer" style={{ display: "flex" }}>
@@ -48,7 +46,7 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
             <img src={ConnectImage} alt="Azure Cosmos DB" />
           </p>
           <p className="welcomeText">Welcome to Azure Cosmos DB</p>
-          {isFormVisible && enableConnectionStringLogin ? (
+          {isFormVisible ? (
             <form
               id="connectWithConnectionString"
               onSubmit={async (event) => {
@@ -91,11 +89,9 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
           ) : (
             <div id="connectWithAad">
               <input className="filterbtnstyle" type="button" value="Sign In" onClick={login} />
-              {enableConnectionStringLogin && (
-                <p className="switchConnectTypeText" onClick={showForm}>
-                  Connect to your account with connection string
-                </p>
-              )}
+              <p className="switchConnectTypeText" onClick={showForm}>
+                Connect to your account with connection string
+              </p>
             </div>
           )}
         </div>

src/Platform/Hosted/extractFeatures.ts

@@ -41,7 +41,6 @@ export type Features = {
   readonly enableCopilotFullSchema: boolean;
   readonly copilotChatFixedMonacoEditorHeight: boolean;
   readonly enablePriorityBasedExecution: boolean;
-  readonly disableConnectionStringLogin: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -115,7 +114,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     enableCopilotFullSchema: "true" === get("enablecopilotfullschema", "true"),
     copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
     enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
-    disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
   };
 }
 

src/Shared/Constants.ts

@@ -208,9 +208,3 @@ export class FreeTierLimits {
   public static RU: number = 1000;
   public static Storage: number = 25;
 }
-
-export class QueryConstants {
-  public static readonly CancelQueryTitle: string = "Cancel query";
-  public static readonly CancelQuerySubTextTemplate: string = "{0} Do you want to cancel this query?";
-  public static readonly CancelQueryTimeoutThresholdReached: string = "The query timeout threshold has been reached.";
-}

src/Shared/ExplorerSettings.ts

@@ -1,4 +1,3 @@
-import { PriorityLevel } from "@azure/cosmos";
 import * as Constants from "../Common/Constants";
 import { LocalStorageUtility, StorageKey } from "./StorageUtility";
 
@@ -7,7 +6,7 @@ export const createDefaultSettings = () => {
   LocalStorageUtility.setEntryNumber(StorageKey.CustomItemPerPage, Constants.Queries.itemsPerPage);
   LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, "true");
   LocalStorageUtility.setEntryNumber(StorageKey.MaxDegreeOfParellism, Constants.Queries.DefaultMaxDegreeOfParallelism);
-  LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, PriorityLevel.Low);
+  LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, Constants.PriorityLevel.Default);
 };
 
 export const hasSettingsDefined = (): boolean => {
@@ -20,6 +19,6 @@ export const hasSettingsDefined = (): boolean => {
 
 export const ensurePriorityLevel = () => {
   if (!LocalStorageUtility.hasItem(StorageKey.PriorityLevel)) {
-    LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, PriorityLevel.Low);
+    LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, Constants.PriorityLevel.Default);
   }
 };

src/Shared/StorageUtility.ts

@@ -4,9 +4,6 @@ import * as SessionStorageUtility from "./SessionStorageUtility";
 export { LocalStorageUtility, SessionStorageUtility };
 export enum StorageKey {
   ActualItemPerPage,
-  QueryTimeoutEnabled,
-  QueryTimeout,
-  AutomaticallyCancelQueryAfterTimeout,
   ContainerPaginationEnabled,
   CustomItemPerPage,
   DatabaseAccountId,

src/Utils/PriorityBasedExecutionUtils.test.ts

@@ -1,7 +1,7 @@
-import * as Cosmos from "@azure/cosmos";
-import { PriorityLevel } from "@azure/cosmos";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import * as PriorityBasedExecutionUtils from "./PriorityBasedExecutionUtils";
+import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { PriorityLevel } from "../Common/Constants";
+import * as Cosmos from "@azure/cosmos";
 
 describe("Priority execution utility", () => {
   it("check default priority level is Low", () => {

src/Utils/PriorityBasedExecutionUtils.ts

@@ -1,6 +1,6 @@
 import * as Cosmos from "@azure/cosmos";
-import { Constants, PriorityLevel } from "@azure/cosmos";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { PriorityLevel } from "../Common/Constants";
 import { userContext } from "../UserContext";
 
 export function isFeatureEnabled(): boolean {
@@ -21,18 +21,18 @@ export function isRelevantRequest(requestContext: Cosmos.RequestContext): boolea
 }
 
 export function getPriorityLevel(): PriorityLevel {
-  const priorityLevel: string = LocalStorageUtility.getEntryString(StorageKey.PriorityLevel);
-  if (priorityLevel) {
+  const priorityLevel = LocalStorageUtility.getEntryString(StorageKey.PriorityLevel);
+  if (priorityLevel && Object.values(PriorityLevel).includes(priorityLevel)) {
     return priorityLevel as PriorityLevel;
   } else {
-    return PriorityLevel.Low;
+    return PriorityLevel.Default;
   }
 }
 
-export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, undefined, next) => {
+export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, next) => {
   if (isRelevantRequest(requestContext)) {
     const priorityLevel: PriorityLevel = getPriorityLevel();
-    requestContext.headers[Constants.HttpHeaders.PriorityLevel] = priorityLevel;
+    requestContext.headers["x-ms-cosmos-priority-level"] = priorityLevel as string;
   }
   return next(requestContext);
 };

src/Utils/QueryUtils.test.ts

@@ -1,10 +1,8 @@
-import { PartitionKey, PartitionKeyDefinition, PartitionKeyKind } from "@azure/cosmos";
 import * as Q from "q";
 import * as sinon from "sinon";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import * as QueryUtils from "./QueryUtils";
-import { extractPartitionKeyValues } from "./QueryUtils";
 
 describe("Query Utils", () => {
   const generatePartitionKeyForPath = (path: string): DataModels.PartitionKey => {
@@ -96,69 +94,4 @@ describe("Query Utils", () => {
       expect(queryStub.getCall(0).args[0]).toBe(0);
     });
   });
-
-  describe("extractPartitionKey", () => {
-    const documentContent = {
-      "Volcano Name": "Adams",
-      Country: "United States",
-      Region: "US-Washington",
-      Location: {
-        type: "Point",
-        coordinates: [-121.49, 46.206],
-      },
-      Elevation: 3742,
-      Type: "Stratovolcano",
-      Status: "Tephrochronology",
-      "Last Known Eruption": "Last known eruption from A.D. 1-1499, inclusive",
-      id: "9e3c494e-8367-3f50-1f56-8c6fcb961363",
-      _rid: "xzo0AJRYUxUFAAAAAAAAAA==",
-      _self: "dbs/xzo0AA==/colls/xzo0AJRYUxU=/docs/xzo0AJRYUxUFAAAAAAAAAA==/",
-      _etag: '"ce00fa43-0000-0100-0000-652840440000"',
-      _attachments: "attachments/",
-      _ts: 1697136708,
-    };
-
-    it("should extract single partition key value", () => {
-      const singlePartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.Hash,
-        paths: ["/Elevation"],
-      };
-
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        singlePartitionKeyDefinition,
-      );
-      expect(partitionKeyValues.length).toBe(1);
-      expect(partitionKeyValues[0]).toEqual(3742);
-    });
-
-    it("should extract two partition key values", () => {
-      const multiPartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.MultiHash,
-        paths: ["/Type", "/Status"],
-      };
-      const expectedPartitionKeyValues: string[] = ["Stratovolcano", "Tephrochronology"];
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        multiPartitionKeyDefinition,
-      );
-      expect(partitionKeyValues.length).toBe(2);
-      expect(expectedPartitionKeyValues).toContain(documentContent["Type"]);
-      expect(expectedPartitionKeyValues).toContain(documentContent["Status"]);
-    });
-
-    it("should extract no partition key values", () => {
-      const singlePartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.Hash,
-        paths: ["/InvalidPartitionKeyPath"],
-      };
-
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        singlePartitionKeyDefinition,
-      );
-
-      expect(partitionKeyValues.length).toBe(0);
-    });
-  });
 });

src/Utils/QueryUtils.ts

@@ -1,4 +1,3 @@
-import { PartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 
@@ -83,22 +82,3 @@ export const queryPagesUntilContentPresent = async (
 
   return await doRequest(firstItemIndex);
 };
-
-/* eslint-disable  @typescript-eslint/no-explicit-any */
-export const extractPartitionKeyValues = (
-  documentContent: any,
-  partitionKeyDefinition: PartitionKeyDefinition,
-): PartitionKey[] => {
-  if (!partitionKeyDefinition.paths || partitionKeyDefinition.paths.length === 0) {
-    return undefined;
-  }
-
-  const partitionKeyValues: PartitionKey[] = [];
-  partitionKeyDefinition.paths.forEach((partitionKeyPath: string) => {
-    const partitionKeyPathWithoutSlash: string = partitionKeyPath.substring(1);
-    if (documentContent[partitionKeyPathWithoutSlash]) {
-      partitionKeyValues.push(documentContent[partitionKeyPathWithoutSlash]);
-    }
-  });
-  return partitionKeyValues;
-};

src/hooks/useKnockoutExplorer.ts

@@ -2,13 +2,15 @@ import { createUri } from "Common/UrlUtility";
 import { FabricMessage } from "Contracts/FabricContract";
 import Explorer from "Explorer/Explorer";
 import { useSelectedNode } from "Explorer/useSelectedNode";
+import { fetchEncryptedToken } from "Platform/Hosted/Components/ConnectExplorer";
 import { getNetworkSettingsWarningMessage } from "Utils/NetworkUtility";
+import { fetchAccessData } from "hooks/usePortalAccessToken";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
 import { useEffect, useState } from "react";
 import { AuthType } from "../AuthType";
 import { AccountKind, Flights } from "../Common/Constants";
 import { normalizeArmEndpoint } from "../Common/EnvironmentUtility";
-import { handleCachedDataMessage, sendMessage, sendReadyMessage } from "../Common/MessageHandler";
+import { sendMessage, sendReadyMessage } from "../Common/MessageHandler";
 import { Platform, configContext, updateConfigContext } from "../ConfigContext";
 import { ActionType, DataExplorerAction, TabKind } from "../Contracts/ActionContracts";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
@@ -105,7 +107,23 @@ async function configureFabric(): Promise<Explorer> {
 
         switch (data.type) {
           case "initialize": {
-            explorer = await configureWithFabric(data.message.endpoint);
+            // TODO For now, retrieve info from session storage. Replace with info injected into Data Explorer
+            const connectionString = data.connectionString ?? sessionStorage.getItem("connectionString");
+            if (!connectionString) {
+              console.error("No connection string found in session storage");
+              return undefined;
+            }
+            const encryptedToken = await fetchEncryptedToken(connectionString);
+            // TODO Duplicated from useTokenMetadata
+            const encryptedTokenMetadata = await fetchAccessData(encryptedToken);
+
+            const hostedConfig: EncryptedToken = {
+              authType: AuthType.EncryptedToken,
+              encryptedToken,
+              encryptedTokenMetadata,
+            };
+
+            explorer = await configureWithEncryptedToken(hostedConfig);
             resolve(explorer);
             break;
           }
@@ -148,10 +166,6 @@ async function configureFabric(): Promise<Explorer> {
 
             break;
           }
-          case "authorizationToken": {
-            handleCachedDataMessage(data);
-            break;
-          }
           default:
             console.error(`Unknown Fabric message type: ${JSON.stringify(data)}`);
             break;
@@ -301,25 +315,6 @@ function configureHostedWithResourceToken(config: ResourceToken): Explorer {
   return explorer;
 }
 
-function configureWithFabric(documentEndpoint: string): Explorer {
-  updateUserContext({
-    authType: AuthType.ConnectionString,
-    databaseAccount: {
-      id: "",
-      location: "",
-      type: "",
-      name: "Mounted",
-      kind: AccountKind.Default,
-      properties: {
-        documentEndpoint,
-      },
-    },
-  });
-  const explorer = new Explorer();
-  setTimeout(() => explorer.refreshAllDatabases(), 0);
-  return explorer;
-}
-
 function configureWithEncryptedToken(config: EncryptedToken): Explorer {
   const apiExperience = DefaultExperienceUtility.getDefaultExperienceFromApiKind(config.encryptedTokenMetadata.apiKind);
   updateUserContext({

src/hooks/useQueryCopilot.ts

@@ -128,7 +128,7 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
 
   openFeedbackModal: (generatedQuery: string, likeQuery: boolean, userPrompt: string) =>
     set({ generatedQuery, likeQuery, userPrompt, showFeedbackModal: true }),
-  closeFeedbackModal: () => set({ showFeedbackModal: false }),
+  closeFeedbackModal: () => set({ generatedQuery: "", likeQuery: false, userPrompt: "", showFeedbackModal: false }),
   setHideFeedbackModalForLikedQueries: (hideFeedbackModalForLikedQueries: boolean) =>
     set({ hideFeedbackModalForLikedQueries }),
   refreshCorrelationId: () => set({ correlationId: guid() }),

web.config

@@ -6,15 +6,6 @@
       <mimeMap fileExtension="woff" mimeType="application/font-woff" />
     </staticContent>
     <rewrite>
-      <rules>
-        <rule name="AAD-Redirect" stopProcessing="true">
-          <match url="^aad" ignoreCase="true"/>
-          <conditions>
-            <add input="{HTTP_HOST}" pattern="^cosmos.azure.com" />
-          </conditions>
-          <action type="Redirect" url="/?feature.enableAadDataPlane=true&amp;feature.disableConnectionStringLogin=true" redirectType="Permanent" />
-        </rule>
-      </rules>
       <outboundRules>
         <rule name="Strict-Transport-Security" enabled="true">
           <match serverVariable="RESPONSE_Strict_Transport_Security" pattern=".*" />