cloudshell screenshot fix

2025-12-28 05:11:31 +00:00 · 2025-08-18 18:44:24 +05:30
20 changed files with 312 additions and 1073 deletions
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -765,10 +765,3 @@ export const ShortenedQueryCopilotSampleContainerSchema = {
  userPrompt: "find all products",
 };
 export enum MongoGuidRepresentation {
  Standard = "Standard",
  CSharpLegacy = "CSharpLegacy",
  JavaLegacy = "JavaLegacy",
  PythonLegacy = "PythonLegacy",
 }
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -1,5 +1,4 @@
 import { Constants as CosmosSDKConstants } from "@azure/cosmos";
 import { getMongoGuidRepresentation } from "Shared/StorageUtility";
 import { AuthType } from "../AuthType";
 import { configContext } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
@@ -140,9 +139,6 @@ export function readDocument(
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
        ? documentId.partitionKeyProperties?.[0]
        : "",
    clientSettings: {
      guidRepresentation: getMongoGuidRepresentation(),
    },
  };
  const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
@@ -185,9 +181,6 @@ export function createDocument(
    partitionKey:
      collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : "",
    documentContent: JSON.stringify(documentContent),
    clientSettings: {
      guidRepresentation: getMongoGuidRepresentation(),
    },
  };
  const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
@@ -235,9 +228,6 @@ export function updateDocument(
        ? documentId.partitionKeyProperties?.[0]
        : "",
    documentContent,
    clientSettings: {
      guidRepresentation: getMongoGuidRepresentation(),
    },
  };
  const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
@@ -284,9 +274,6 @@ export function deleteDocuments(
    subscriptionID: userContext.subscriptionId,
    resourceGroup: userContext.resourceGroup,
    databaseAccountName: databaseAccount.name,
    clientSettings: {
      guidRepresentation: getMongoGuidRepresentation(),
    },
  };
  const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
--- a/src/Contracts/FabricMessageTypes.ts
+++ b/src/Contracts/FabricMessageTypes.ts
@@ -7,7 +7,6 @@ export enum FabricMessageTypes {
  GetAccessToken = "GetAccessToken",
  Ready = "Ready",
  OpenSettings = "OpenSettings",
  NewShortcut = "NewShortcut",
 }
 export interface AuthorizationToken {
--- a/src/Contracts/FabricMessagesContract.ts
+++ b/src/Contracts/FabricMessagesContract.ts
@@ -84,11 +84,9 @@ export type FabricMessageV3 =
    }
  | {
      type: "refreshResourceTree";
    }
  | {
      type: "shortcutCreated";
      message: {
-        shortcutId: string;
+        id: string;
        error: string | undefined;
      };
    };
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -5,7 +5,6 @@ import { Environment, getEnvironment } from "Common/EnvironmentUtility";
 import { sendMessage } from "Common/MessageHandler";
 import { Platform, configContext } from "ConfigContext";
 import { MessageTypes } from "Contracts/ExplorerContracts";
 import { AddFabricShortcutPanel } from "Explorer/Panes/AddCollectionPanel/AddFabricShortcutPanel";
 import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane";
 import { getCopilotEnabled, isCopilotFeatureRegistered } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { IGalleryItem } from "Juno/JunoClient";
@@ -1113,14 +1112,6 @@ export default class Explorer {
    }
  }
  public async onNewFabricShortcutClicked(param: {
    shortcutId: string;
  }): Promise<void> {
    useSidePanel
      .getState()
      .openSidePanel("Configure Shortcut", <AddFabricShortcutPanel explorer={this} shortcutId={param.shortcutId} />);
  }
  private refreshCommandBarButtons(): void {
    const activeTab = useTabs.getState().activeTab;
    if (activeTab) {
--- a/src/Explorer/Panes/AddCollectionPanel/AddFabricShortcutPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddFabricShortcutPanel.tsx
@@ -1,800 +0,0 @@
 import {
  ChoiceGroup,
  DefaultButton,
  DirectionalHint,
  Icon,
  IconButton,
  IDropdownOption,
  Link,
  ProgressIndicator,
  Separator,
  Stack,
  TeachingBubble,
  Text,
  TooltipHost
 } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { createCollection } from "Common/dataAccess/createCollection";
 import { getNewDatabaseSharedThroughputDefault } from "Common/DatabaseUtility";
 import { getErrorMessage, getErrorStack } from "Common/ErrorHandlingUtils";
 import { configContext, Platform } from "ConfigContext";
 import * as DataModels from "Contracts/DataModels";
 import { VectorEmbeddingPoliciesComponent } from "Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent";
 import {
  AllPropertiesIndexed,
  ContainerVectorPolicyTooltipContent,
  FullTextPolicyDefault,
  getPartitionKey,
  getPartitionKeyName,
  getPartitionKeyPlaceHolder,
  getPartitionKeyTooltipText,
  isFreeTierAccount,
  isSynapseLinkEnabled,
  parseUniqueKeys,
  scrollToSection,
  SharedDatabaseDefault,
  shouldShowAnalyticalStoreOptions
 } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 import { useSidePanel } from "hooks/useSidePanel";
 import { useTeachingBubble } from "hooks/useTeachingBubble";
 import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import React from "react";
 import { CollectionCreation } from "Shared/Constants";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
 import { getCollectionName } from "Utils/APITypeUtils";
 import { isCapabilityEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import { CollapsibleSectionComponent } from "../../Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import { ContainerSampleGenerator } from "../../DataSamples/ContainerSampleGenerator";
 import Explorer from "../../Explorer";
 import { useDatabases } from "../../useDatabases";
 import { PanelFooterComponent } from "../PanelFooterComponent";
 import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "../PanelLoadingScreen";
 interface AddFabricShortcutPanelProps {
  explorer: Explorer;
  shortcutId: string;
  databaseId?: string;
  isQuickstart?: boolean;
 }
 export const DefaultVectorEmbeddingPolicy: DataModels.VectorEmbeddingPolicy = {
  vectorEmbeddings: [],
 };
 export interface AddCollectionPanelState {
  createNewDatabase: boolean;
  newDatabaseId: string;
  isSharedThroughputChecked: boolean;
  selectedDatabaseId: string;
  collectionId: string;
  enableIndexing: boolean;
  isSharded: boolean;
  partitionKey: string;
  subPartitionKeys: string[];
  enableDedicatedThroughput: boolean;
  createMongoWildCardIndex: boolean;
  useHashV1: boolean;
  enableAnalyticalStore: boolean;
  uniqueKeys: string[];
  errorMessage: string;
  showErrorDetails: boolean;
  isExecuting: boolean;
  isThroughputCapExceeded: boolean;
  teachingBubbleStep: number;
  vectorIndexingPolicy: DataModels.VectorIndex[];
  vectorEmbeddingPolicy: DataModels.VectorEmbedding[];
  vectorPolicyValidated: boolean;
  fullTextPolicy: DataModels.FullTextPolicy;
  fullTextIndexes: DataModels.FullTextIndex[];
  fullTextPolicyValidated: boolean;
 }
 export class AddFabricShortcutPanel extends React.Component<AddFabricShortcutPanelProps, AddCollectionPanelState> {
  private newDatabaseThroughput: number;
  private isNewDatabaseAutoscale: boolean;
  private collectionThroughput: number;
  private isCollectionAutoscale: boolean;
  private isCostAcknowledged: boolean;
  private showFullTextSearch: boolean;
  constructor(props: AddFabricShortcutPanelProps) {
    super(props);
    this.state = {
      createNewDatabase:
        userContext.apiType !== "Tables" && configContext.platform !== Platform.Fabric && !this.props.databaseId,
      newDatabaseId: props.isQuickstart ? this.getSampleDBName() : "",
      isSharedThroughputChecked: getNewDatabaseSharedThroughputDefault(),
      selectedDatabaseId:
        userContext.apiType === "Tables" ? CollectionCreation.TablesAPIDefaultDatabase : this.props.databaseId,
      collectionId: props.isQuickstart ? `Sample${getCollectionName()}` : "",
      enableIndexing: true,
      isSharded: userContext.apiType !== "Tables",
      partitionKey: getPartitionKey(props.isQuickstart),
      subPartitionKeys: [],
      enableDedicatedThroughput: isFabricNative(), // Dedicated throughput is only enabled in Fabric Native by default
      createMongoWildCardIndex:
        isCapabilityEnabled("EnableMongo") && !isCapabilityEnabled("EnableMongo16MBDocumentSupport"),
      useHashV1: false,
      enableAnalyticalStore: false,
      uniqueKeys: [],
      errorMessage: "",
      showErrorDetails: false,
      isExecuting: false,
      isThroughputCapExceeded: false,
      teachingBubbleStep: 0,
      vectorEmbeddingPolicy: [],
      vectorIndexingPolicy: [],
      vectorPolicyValidated: true,
      fullTextPolicy: FullTextPolicyDefault,
      fullTextIndexes: [],
      fullTextPolicyValidated: true,
    };
    this.showFullTextSearch = userContext.apiType === "SQL";
  }
  componentDidMount(): void {
    if (this.state.teachingBubbleStep === 0 && this.props.isQuickstart) {
      this.setState({ teachingBubbleStep: 1 });
    }
  }
  componentDidUpdate(_prevProps: AddFabricShortcutPanelProps, prevState: AddCollectionPanelState): void {
    if (this.state.errorMessage && this.state.errorMessage !== prevState.errorMessage) {
      scrollToSection("panelContainer");
    }
  }
  render(): JSX.Element {
    const options: IChoiceGroupOption[] = [
      { key: 'continuous', text: 'Continuous' },
      { key: 'manual', text: 'Manual' },
    ];
    return (
      <form className="panelFormWrapper" onSubmit={this.submit.bind(this)} id="panelContainer">
        {this.state.errorMessage && (
          <PanelInfoErrorComponent
            message={this.state.errorMessage}
            messageType="error"
            showErrorDetails={this.state.showErrorDetails}
          />
        )}
        <div className="panelMainContent">
          <Stack>
            <Stack horizontal style={{ marginTop: -5, marginBottom: -4 }}>
              <Text className="panelTextBold" variant="small">Container id</Text>
              <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={getPartitionKeyTooltipText()}>
                <Icon
                  iconName="Info"
                  className="panelInfoIcon"
                  tabIndex={0}
                  ariaLabel={getPartitionKeyTooltipText()}
                />
              </TooltipHost>
            </Stack>
            <div>{this.props.shortcutId}</div>
            <div>publicHolidays</div>
            <Separator className="panelSeparator" style={{ marginTop: 2, marginBottom: -4 }} />
          </Stack>
          <Stack>
            <Stack horizontal style={{ marginTop: -5, marginBottom: -4 }}>
              <span className="mandatoryStar">*&nbsp;</span>
              <Text className="panelTextBold" variant="small">
                {getPartitionKeyName()}
              </Text>
              <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={getPartitionKeyTooltipText()}>
                <Icon
                  iconName="Info"
                  className="panelInfoIcon"
                  tabIndex={0}
                  ariaLabel={getPartitionKeyTooltipText()}
                />
              </TooltipHost>
            </Stack>
            <Text variant="small">{this.getPartitionKeySubtext()}</Text>
            <input
              type="text"
              id="addCollection-partitionKeyValue"
              aria-required
              required
              size={40}
              className="panelTextField"
              placeholder={getPartitionKeyPlaceHolder()}
              aria-label={getPartitionKeyName()}
              pattern={userContext.apiType === "Gremlin" ? "^/[^/]*" : ".*"}
              title={userContext.apiType === "Gremlin" ? "May not use composite partition key" : ""}
              value={this.state.partitionKey}
              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                if (
                  userContext.apiType !== "Mongo" &&
                  !this.state.partitionKey &&
                  !event.target.value.startsWith("/")
                ) {
                  this.setState({ partitionKey: "/" + event.target.value });
                } else {
                  this.setState({ partitionKey: event.target.value });
                }
              }}
            />
            {userContext.apiType === "SQL" &&
              this.state.subPartitionKeys.map((subPartitionKey: string, index: number) => {
                return (
                  <Stack style={{ marginBottom: 2, marginTop: -5 }} key={`uniqueKey${index}`} horizontal>
                    <div
                      style={{
                        width: "20px",
                        border: "solid",
                        borderWidth: "0px 0px 1px 1px",
                        marginRight: "5px",
                      }}
                    ></div>
                    <input
                      type="text"
                      id="addCollection-partitionKeyValue"
                      key={`addCollection-partitionKeyValue_${index}`}
                      aria-required
                      required
                      size={40}
                      tabIndex={index > 0 ? 1 : 0}
                      className="panelTextField"
                      autoComplete="off"
                      placeholder={getPartitionKeyPlaceHolder(index)}
                      aria-label={getPartitionKeyName()}
                      pattern={".*"}
                      title={""}
                      value={subPartitionKey}
                      onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                        const subPartitionKeys = [...this.state.subPartitionKeys];
                        if (!this.state.subPartitionKeys[index] && !event.target.value.startsWith("/")) {
                          subPartitionKeys[index] = "/" + event.target.value.trim();
                          this.setState({ subPartitionKeys });
                        } else {
                          subPartitionKeys[index] = event.target.value.trim();
                          this.setState({ subPartitionKeys });
                        }
                      }}
                    />
                    <IconButton
                      iconProps={{ iconName: "Delete" }}
                      style={{ height: 27 }}
                      onClick={() => {
                        const subPartitionKeys = this.state.subPartitionKeys.filter((uniqueKey, j) => index !== j);
                        this.setState({ subPartitionKeys });
                      }}
                    />
                  </Stack>
                );
              })}
            {userContext.apiType === "SQL" && (
              <Stack className="panelGroupSpacing">
                <DefaultButton
                  styles={{ root: { padding: 0, width: 200, height: 30 }, label: { fontSize: 12 } }}
                  hidden={this.state.useHashV1}
                  disabled={this.state.subPartitionKeys.length >= Constants.BackendDefaults.maxNumMultiHashPartition}
                  onClick={() => this.setState({ subPartitionKeys: [...this.state.subPartitionKeys, ""] })}
                >
                  Add hierarchical partition key
                </DefaultButton>
                {this.state.subPartitionKeys.length > 0 && (
                  <Text variant="small">
                    <Icon iconName="InfoSolid" className="removeIcon" tabIndex={0} /> This feature allows you to
                    partition your data with up to three levels of keys for better data distribution. Requires .NET
                    V3, Java V4 SDK, or preview JavaScript V3 SDK.{" "}
                    <Link href="https://aka.ms/cosmos-hierarchical-partitioning" target="_blank">
                      Learn more
                    </Link>
                  </Text>
                )}
              </Stack>
            )}
            <Separator className="panelSeparator" style={{ marginTop: 2, marginBottom: -4 }} />
          </Stack>
          <Stack>
            <CollapsibleSectionComponent
              title="Container Vector Policy"
              isExpandedByDefault={false}
              onExpand={() => {
                scrollToSection("collapsibleVectorPolicySectionContent");
              }}
              tooltipContent={ContainerVectorPolicyTooltipContent()}
            >
              <Stack id="collapsibleVectorPolicySectionContent" styles={{ root: { position: "relative" } }}>
                <Stack styles={{ root: { paddingLeft: 40 } }}>
                  <VectorEmbeddingPoliciesComponent
                    vectorEmbeddings={this.state.vectorEmbeddingPolicy}
                    vectorIndexes={this.state.vectorIndexingPolicy}
                    onVectorEmbeddingChange={(
                      vectorEmbeddingPolicy: DataModels.VectorEmbedding[],
                      vectorIndexingPolicy: DataModels.VectorIndex[],
                      vectorPolicyValidated: boolean,
                    ) => {
                      this.setState({ vectorEmbeddingPolicy, vectorIndexingPolicy, vectorPolicyValidated });
                    }}
                  />
                </Stack>
              </Stack>
            </CollapsibleSectionComponent>
            <Separator className="panelSeparator" style={{ marginTop: 2, marginBottom: -4 }} />
          </Stack>
          <Stack>
            <CollapsibleSectionComponent
              title="ETL Frequency"
              isExpandedByDefault={false}
              onExpand={() => {
                scrollToSection("collapsibleVectorPolicySectionContent");
              }}
              tooltipContent={ContainerVectorPolicyTooltipContent()}
            >
              <ChoiceGroup defaultSelectedKey="continuous" options={options} onChange={() => { }} required={true} />
            </CollapsibleSectionComponent>
          </Stack>
        </div>
        <PanelFooterComponent buttonLabel="OK" isButtonDisabled={this.state.isThroughputCapExceeded} />
        {this.state.isExecuting && (
          <div>
            <PanelLoadingScreen />
            {this.state.teachingBubbleStep === 5 && (
              <TeachingBubble
                headline="Creating sample container"
                target={"#loadingScreen"}
                onDismiss={() => this.setState({ teachingBubbleStep: 0 })}
                styles={{ footer: { width: "100%" } }}
              >
                A sample container is now being created and we are adding sample data for you. It should take about 1
                minute.
                <br />
                <br />
                Once the sample container is created, review your sample dataset and follow next steps
                <br />
                <br />
                <ProgressIndicator
                  styles={{
                    itemName: { color: "white" },
                    progressTrack: { backgroundColor: "#A6A6A6" },
                    progressBar: { background: "white" },
                  }}
                  label="Adding sample data set"
                />
              </TeachingBubble>
            )}
          </div>
        )}
      </form>
    );
  }
  private getDatabaseOptions(): IDropdownOption[] {
    return useDatabases.getState().databases?.map((database) => ({
      key: database.id(),
      text: database.id(),
    }));
  }
  private onCreateNewDatabaseRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && !this.state.createNewDatabase) {
      this.setState({
        createNewDatabase: true,
      });
    }
  }
  private onUseExistingDatabaseRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && this.state.createNewDatabase) {
      this.setState({
        createNewDatabase: false,
      });
    }
  }
  private onUnshardedRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && this.state.isSharded) {
      this.setState({
        isSharded: false,
      });
    }
  }
  private onShardedRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && !this.state.isSharded) {
      this.setState({
        isSharded: true,
      });
    }
  }
  private onEnableAnalyticalStoreRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && !this.state.enableAnalyticalStore) {
      this.setState({
        enableAnalyticalStore: true,
      });
    }
  }
  private onDisableAnalyticalStoreRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && this.state.enableAnalyticalStore) {
      this.setState({
        enableAnalyticalStore: false,
      });
    }
  }
  private onTurnOnIndexing(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && !this.state.enableIndexing) {
      this.setState({
        enableIndexing: true,
      });
    }
  }
  private onTurnOffIndexing(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && this.state.enableIndexing) {
      this.setState({
        enableIndexing: false,
      });
    }
  }
  private setVectorEmbeddingPolicy(vectorEmbeddingPolicy: DataModels.VectorEmbedding[]): void {
    this.setState({
      vectorEmbeddingPolicy,
    });
  }
  private setVectorIndexingPolicy(vectorIndexingPolicy: DataModels.VectorIndex[]): void {
    this.setState({
      vectorIndexingPolicy,
    });
  }
  private isSelectedDatabaseSharedThroughput(): boolean {
    if (!this.state.selectedDatabaseId) {
      return false;
    }
    const selectedDatabase = useDatabases
      .getState()
      .databases?.find((database) => database.id() === this.state.selectedDatabaseId);
    return !!selectedDatabase?.offer();
  }
  private getFreeTierIndexingText(): string {
    return this.state.enableIndexing
      ? "All properties in your documents will be indexed by default for flexible and efficient queries."
      : "Indexing will be turned off. Recommended if you don't need to run queries or only have key value operations.";
  }
  private getPartitionKeySubtext(): string {
    if (
      userContext.features.partitionKeyDefault &&
      (userContext.apiType === "SQL" || userContext.apiType === "Mongo")
    ) {
      const subtext = "For small workloads, the item ID is a suitable choice for the partition key.";
      return subtext;
    }
    return "";
  }
  //TODO: uncomment when learn more text becomes available
  // private getContainerFullTextPolicyTooltipContent(): JSX.Element {
  //   return (
  //     <Text variant="small">
  //       Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
  //       magna aliqua.{" "}
  //       <Link target="_blank" href="https://aka.ms/CosmosFullTextSearch">
  //         Learn more
  //       </Link>
  //     </Text>
  //   );
  // }
  private shouldShowCollectionThroughputInput(): boolean {
    if (isServerlessAccount()) {
      return false;
    }
    if (this.state.createNewDatabase) {
      return !this.state.isSharedThroughputChecked;
    }
    if (this.state.enableDedicatedThroughput) {
      return true;
    }
    return this.state.selectedDatabaseId && !this.isSelectedDatabaseSharedThroughput();
  }
  private shouldShowIndexingOptionsForFreeTierAccount(): boolean {
    if (!isFreeTierAccount()) {
      return false;
    }
    return this.state.createNewDatabase
      ? this.state.isSharedThroughputChecked
      : this.isSelectedDatabaseSharedThroughput();
  }
  private shouldShowVectorSearchParameters() {
    return isVectorSearchEnabled() && (isServerlessAccount() || this.shouldShowCollectionThroughputInput());
  }
  private shouldShowFullTextSearchParameters() {
    return !isFabricNative() && this.showFullTextSearch;
  }
  private parseUniqueKeys(): DataModels.UniqueKeyPolicy {
    if (this.state.uniqueKeys?.length === 0) {
      return undefined;
    }
    const uniqueKeyPolicy: DataModels.UniqueKeyPolicy = { uniqueKeys: [] };
    this.state.uniqueKeys.forEach((uniqueKey) => {
      if (uniqueKey) {
        const validPaths: string[] = uniqueKey.split(",")?.filter((path) => path?.length > 0);
        const trimmedPaths: string[] = validPaths?.map((path) => path.trim());
        if (trimmedPaths?.length > 0) {
          if (userContext.apiType === "Mongo") {
            trimmedPaths.map((path) => {
              const transformedPath = path.split(".").join("/");
              if (transformedPath[0] !== "/") {
                return "/" + transformedPath;
              }
              return transformedPath;
            });
          }
          uniqueKeyPolicy.uniqueKeys.push({ paths: trimmedPaths });
        }
      }
    });
    return uniqueKeyPolicy;
  }
  private validateInputs(): boolean {
    if (!this.state.createNewDatabase && !this.state.selectedDatabaseId) {
      this.setState({ errorMessage: "Please select an existing database" });
      return false;
    }
    const throughput = this.state.createNewDatabase ? this.newDatabaseThroughput : this.collectionThroughput;
    if (throughput > CollectionCreation.DefaultCollectionRUs100K && !this.isCostAcknowledged) {
      const errorMessage = this.isNewDatabaseAutoscale
        ? "Please acknowledge the estimated monthly spend."
        : "Please acknowledge the estimated daily spend.";
      this.setState({ errorMessage });
      return false;
    }
    if (throughput > CollectionCreation.MaxRUPerPartition && !this.state.isSharded) {
      this.setState({ errorMessage: "Unsharded collections support up to 10,000 RUs" });
      return false;
    }
    if (
      userContext.apiType === "Gremlin" &&
      (this.state.partitionKey === "/id" || this.state.partitionKey === "/label")
    ) {
      this.setState({ errorMessage: "/id and /label as partition keys are not allowed for graph." });
      return false;
    }
    if (this.shouldShowVectorSearchParameters()) {
      if (!this.state.vectorPolicyValidated) {
        this.setState({ errorMessage: "Please fix errors in container vector policy" });
        return false;
      }
      if (!this.state.fullTextPolicyValidated) {
        this.setState({ errorMessage: "Please fix errors in container full text search polilcy" });
        return false;
      }
    }
    return true;
  }
  private getAnalyticalStorageTtl(): number {
    if (!isSynapseLinkEnabled()) {
      return undefined;
    }
    if (!shouldShowAnalyticalStoreOptions()) {
      return undefined;
    }
    if (this.state.enableAnalyticalStore) {
      // TODO: always default to 90 days once the backend hotfix is deployed
      return userContext.features.ttl90Days
        ? Constants.AnalyticalStorageTtl.Days90
        : Constants.AnalyticalStorageTtl.Infinite;
    }
    return Constants.AnalyticalStorageTtl.Disabled;
  }
  private getSampleDBName(): string {
    const existingSampleDBs = useDatabases
      .getState()
      .databases?.filter((database) => database.id().startsWith("SampleDB"));
    const existingSampleDBNames = existingSampleDBs?.map((database) => database.id());
    if (!existingSampleDBNames || existingSampleDBNames.length === 0) {
      return "SampleDB";
    }
    let i = 1;
    while (existingSampleDBNames.indexOf(`SampleDB${i}`) !== -1) {
      i++;
    }
    return `SampleDB${i}`;
  }
  private async submit(event?: React.FormEvent<HTMLFormElement>): Promise<void> {
    event?.preventDefault();
    if (!this.validateInputs()) {
      return;
    }
    const collectionId: string = this.state.collectionId.trim();
    let databaseId = this.state.createNewDatabase ? this.state.newDatabaseId.trim() : this.state.selectedDatabaseId;
    let partitionKeyString = this.state.isSharded ? this.state.partitionKey.trim() : undefined;
    if (userContext.apiType === "Tables") {
      // Table require fixed Database: TablesDB, and fixed Partition Key: /'$pk'
      databaseId = CollectionCreation.TablesAPIDefaultDatabase;
      partitionKeyString = "/'$pk'";
    }
    const uniqueKeyPolicy: DataModels.UniqueKeyPolicy = parseUniqueKeys(this.state.uniqueKeys);
    const partitionKeyVersion = this.state.useHashV1 ? undefined : 2;
    const partitionKey: DataModels.PartitionKey = partitionKeyString
      ? {
        paths: [
          partitionKeyString,
          ...(userContext.apiType === "SQL" && this.state.subPartitionKeys.length > 0
            ? this.state.subPartitionKeys
            : []),
        ],
        kind: userContext.apiType === "SQL" && this.state.subPartitionKeys.length > 0 ? "MultiHash" : "Hash",
        version: partitionKeyVersion,
      }
      : undefined;
    const indexingPolicy: DataModels.IndexingPolicy = this.state.enableIndexing
      ? AllPropertiesIndexed
      : SharedDatabaseDefault;
    let vectorEmbeddingPolicy: DataModels.VectorEmbeddingPolicy;
    if (this.shouldShowVectorSearchParameters()) {
      indexingPolicy.vectorIndexes = this.state.vectorIndexingPolicy;
      vectorEmbeddingPolicy = {
        vectorEmbeddings: this.state.vectorEmbeddingPolicy,
      };
    }
    if (this.showFullTextSearch) {
      indexingPolicy.fullTextIndexes = this.state.fullTextIndexes;
    }
    const telemetryData = {
      database: {
        id: databaseId,
        new: this.state.createNewDatabase,
        shared: this.state.createNewDatabase
          ? this.state.isSharedThroughputChecked
          : this.isSelectedDatabaseSharedThroughput(),
      },
      collection: {
        id: this.state.collectionId,
        throughput: this.collectionThroughput,
        isAutoscale: this.isCollectionAutoscale,
        partitionKey,
        uniqueKeyPolicy,
        collectionWithDedicatedThroughput: this.state.enableDedicatedThroughput,
      },
      subscriptionQuotaId: userContext.quotaId,
      dataExplorerArea: Constants.Areas.ContextualPane,
      useIndexingForSharedThroughput: this.state.enableIndexing,
      isQuickstart: !!this.props.isQuickstart,
    };
    const startKey: number = TelemetryProcessor.traceStart(Action.CreateCollection, telemetryData);
    const databaseLevelThroughput: boolean = this.state.createNewDatabase
      ? this.state.isSharedThroughputChecked
      : this.isSelectedDatabaseSharedThroughput() && !this.state.enableDedicatedThroughput;
    let offerThroughput: number;
    let autoPilotMaxThroughput: number;
    // Throughput
    if (isFabricNative()) {
      // Fabric Native accounts are always autoscale and have a fixed throughput of 5K
      autoPilotMaxThroughput = AutoPilotUtils.autoPilotThroughput5K;
      offerThroughput = undefined;
    } else if (databaseLevelThroughput) {
      if (this.state.createNewDatabase) {
        if (this.isNewDatabaseAutoscale) {
          autoPilotMaxThroughput = this.newDatabaseThroughput;
        } else {
          offerThroughput = this.newDatabaseThroughput;
        }
      }
    } else {
      if (this.isCollectionAutoscale) {
        autoPilotMaxThroughput = this.collectionThroughput;
      } else {
        offerThroughput = this.collectionThroughput;
      }
    }
    const createCollectionParams: DataModels.CreateCollectionParams = {
      createNewDatabase: this.state.createNewDatabase,
      collectionId,
      databaseId,
      databaseLevelThroughput,
      offerThroughput,
      autoPilotMaxThroughput,
      analyticalStorageTtl: this.getAnalyticalStorageTtl(),
      indexingPolicy,
      partitionKey,
      uniqueKeyPolicy,
      createMongoWildcardIndex: this.state.createMongoWildCardIndex,
      vectorEmbeddingPolicy,
      fullTextPolicy: this.state.fullTextPolicy,
    };
    this.setState({ isExecuting: true });
    try {
      await createCollection(createCollectionParams);
      await this.props.explorer.refreshAllDatabases();
      if (this.props.isQuickstart) {
        const database = useDatabases.getState().findDatabaseWithId(databaseId);
        if (database) {
          database.isSampleDB = true;
          // populate sample container with sample data
          await database.loadCollections();
          const collection = database.findCollectionWithId(collectionId);
          collection.isSampleCollection = true;
          useTeachingBubble.getState().setSampleCollection(collection);
          const sampleGenerator = await ContainerSampleGenerator.createSampleGeneratorAsync(this.props.explorer);
          await sampleGenerator.populateContainerAsync(collection, partitionKeyString);
          // auto-expand sample database + container and show teaching bubble
          await database.expandDatabase();
          collection.expandCollection();
          useDatabases.getState().updateDatabase(database);
          useTeachingBubble.getState().setIsSampleDBExpanded(true);
          TelemetryProcessor.traceOpen(Action.LaunchUITour);
        }
      }
      this.setState({ isExecuting: false });
      TelemetryProcessor.traceSuccess(Action.CreateCollection, telemetryData, startKey);
      useSidePanel.getState().closeSidePanel();
    } catch (error) {
      const errorMessage: string = getErrorMessage(error);
      this.setState({ isExecuting: false, errorMessage, showErrorDetails: true });
      const failureTelemetryData = { ...telemetryData, error: errorMessage, errorStack: getErrorStack(error) };
      TelemetryProcessor.traceFailure(Action.CreateCollection, failureTelemetryData, startKey);
    }
  }
 }
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -199,12 +199,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    LocalStorageUtility.getEntryString(StorageKey.CopilotSampleDBEnabled) === "true",
  );
  const [mongoGuidRepresentation, setMongoGuidRepresentation] = useState<Constants.MongoGuidRepresentation>(
    LocalStorageUtility.hasItem(StorageKey.MongoGuidRepresentation)
      ? (LocalStorageUtility.getEntryString(StorageKey.MongoGuidRepresentation) as Constants.MongoGuidRepresentation)
      : Constants.MongoGuidRepresentation.CSharpLegacy,
  );
  const styles = useStyles();
  const explorerVersion = configContext.gitSha;
@@ -267,8 +261,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    useDatabases.getState().sampleDataResourceTokenCollection &&
    !isEmulator;
  const shouldShowMongoGuidRepresentationOption = userContext.apiType === "Mongo";
  const handlerOnSubmit = async () => {
    setIsExecuting(true);
@@ -420,10 +412,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
      );
    }
    if (shouldShowMongoGuidRepresentationOption) {
      LocalStorageUtility.setEntryString(StorageKey.MongoGuidRepresentation, mongoGuidRepresentation);
    }
    setIsExecuting(false);
    logConsoleInfo(
      `Updated items per page setting to ${LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage)}`,
@@ -445,14 +433,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
      );
    }
    if (shouldShowMongoGuidRepresentationOption) {
      logConsoleInfo(
        `Updated Mongo Guid Representation to ${LocalStorageUtility.getEntryString(
          StorageKey.MongoGuidRepresentation,
        )}`,
      );
    }
    refreshExplorer && (await explorer.refreshExplorer());
    closeSidePanel();
  };
@@ -497,13 +477,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    { key: SplitterDirection.Horizontal, text: "Horizontal" },
  ];
  const mongoGuidRepresentationDropdownOptions: IDropdownOption[] = [
    { key: Constants.MongoGuidRepresentation.CSharpLegacy, text: Constants.MongoGuidRepresentation.CSharpLegacy },
    { key: Constants.MongoGuidRepresentation.JavaLegacy, text: Constants.MongoGuidRepresentation.JavaLegacy },
    { key: Constants.MongoGuidRepresentation.PythonLegacy, text: Constants.MongoGuidRepresentation.PythonLegacy },
    { key: Constants.MongoGuidRepresentation.Standard, text: Constants.MongoGuidRepresentation.Standard },
  ];
  const handleOnPriorityLevelOptionChange = (
    ev: React.FormEvent<HTMLInputElement>,
    option: IChoiceGroupOption,
@@ -586,13 +559,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    setRefreshExplorer(false);
  };
  const handleOnMongoGuidRepresentationOptionChange = (
    ev: React.FormEvent<HTMLInputElement>,
    option: IDropdownOption,
  ): void => {
    setMongoGuidRepresentation(option.key as Constants.MongoGuidRepresentation);
  };
  const choiceButtonStyles = {
    root: {
      clear: "both",
@@ -1099,15 +1065,15 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                  <div className={styles.settingsSectionContainer}>
                    <div className={styles.settingsSectionDescription}>
                      This is a sample database and collection with synthetic product data you can use to explore using
-                      NoSQL queries. This will appear as another database in the Data Explorer UI, and is created by,
+                      NoSQL queries and Query Advisor. This will appear as another database in the Data Explorer UI, and
-                      and maintained by Microsoft at no cost to you.
+                      is created by, and maintained by Microsoft at no cost to you.
                    </div>
                    <Checkbox
                      styles={{
                        label: { padding: 0 },
                      }}
                      className="padding"
-                      ariaLabel="Enable sample db for query exploration"
+                      ariaLabel="Enable sample db for Query Advisor"
                      checked={copilotSampleDBEnabled}
                      onChange={handleSampleDatabaseChange}
                      label="Enable sample database"
@@ -1116,27 +1082,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                </AccordionPanel>
              </AccordionItem>
            )}
            {shouldShowMongoGuidRepresentationOption && (
              <AccordionItem value="14">
                <AccordionHeader>
                  <div className={styles.header}>Guid Representation</div>
                </AccordionHeader>
                <AccordionPanel>
                  <div className={styles.settingsSectionContainer}>
                    <div className={styles.settingsSectionDescription}>
                      GuidRepresentation in MongoDB refers to how Globally Unique Identifiers (GUIDs) are serialized and
                      deserialized when stored in BSON documents. This will apply to all document operations.
                    </div>
                    <Dropdown
                      aria-labelledby="mongoGuidRepresentation"
                      selectedKey={mongoGuidRepresentation}
                      options={mongoGuidRepresentationDropdownOptions}
                      onChange={handleOnMongoGuidRepresentationOptionChange}
                    />
                  </div>
                </AccordionPanel>
              </AccordionItem>
            )}
          </Accordion>
        )}
--- a/src/Explorer/QueryCopilot/QueryCopilotTab.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotTab.tsx
@@ -1,9 +1,11 @@
 /* eslint-disable no-console */
 import { Stack } from "@fluentui/react";
 import { QueryCopilotSampleContainerId, QueryCopilotSampleDatabaseId } from "Common/Constants";
 import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import { SaveQueryPane } from "Explorer/Panes/SaveQueryPane/SaveQueryPane";
 import { QueryCopilotPromptbar } from "Explorer/QueryCopilot/QueryCopilotPromptbar";
 import { readCopilotToggleStatus, saveCopilotToggleStatus } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { OnExecuteQueryClick } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { QueryCopilotProps } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
@@ -11,6 +13,7 @@ import { QueryCopilotResults } from "Explorer/QueryCopilot/Shared/QueryCopilotRe
 import { userContext } from "UserContext";
 import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
 import { useSidePanel } from "hooks/useSidePanel";
 import { ReactTabKind, TabsState, useTabs } from "hooks/useTabs";
 import React, { useState } from "react";
 import SplitterLayout from "react-splitter-layout";
 import QueryCommandIcon from "../../../images/CopilotCommand.svg";
@@ -23,8 +26,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
  const [copilotActive, setCopilotActive] = useState<boolean>(() =>
    readCopilotToggleStatus(userContext.databaseAccount),
  );
-  //TODO: Uncomment this useState when query copilot is reinstated in DE
+  const [tabActive, setTabActive] = useState<boolean>(true);
  // const [tabActive, setTabActive] = useState<boolean>(true);
  const getCommandbarButtons = (): CommandButtonComponentProps[] => {
    const executeQueryBtnLabel = selectedQuery ? "Execute Selection" : "Execute Query";
@@ -68,18 +70,17 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
    useCommandBar.getState().setContextButtons(getCommandbarButtons());
  }, [query, selectedQuery, copilotActive]);
-  //TODO: Uncomment this effect when query copilot is reinstated in DE
+  React.useEffect(() => {
-  // React.useEffect(() => {
+    return () => {
-  //   return () => {
+      useTabs.subscribe((state: TabsState) => {
-  //     useTabs.subscribe((state: TabsState) => {
+        if (state.activeReactTab === ReactTabKind.QueryCopilot) {
-  //       if (state.activeReactTab === ReactTabKind.QueryCopilot) {
+          setTabActive(true);
-  //         setTabActive(true);
+        } else {
-  //       } else {
+          setTabActive(false);
-  //         setTabActive(false);
+        }
-  //       }
+      });
-  //     });
+    };
-  //   };
+  }, []);
  // }, []);
  const toggleCopilot = (toggle: boolean) => {
    setCopilotActive(toggle);
@@ -89,7 +90,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
  return (
    <Stack className="tab-pane" style={{ width: "100%" }}>
      <div style={isGeneratingQuery ? { height: "100%" } : { overflowY: "auto", height: "100%" }}>
        {/*TODO: Uncomment this section when query copilot is reinstated in DE
        {tabActive && copilotActive && (
          <QueryCopilotPromptbar
            explorer={explorer}
@@ -97,7 +97,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
            databaseId={QueryCopilotSampleDatabaseId}
            containerId={QueryCopilotSampleContainerId}
          ></QueryCopilotPromptbar>
-        )} */}
+        )}
        <Stack className="tabPaneContentContainer">
          <SplitterLayout percentage={true} vertical={true} primaryIndex={0} primaryMinSize={30} secondaryMinSize={70}>
            <EditorReact
--- a/src/Explorer/Sidebar.tsx
+++ b/src/Explorer/Sidebar.tsx
@@ -15,9 +15,7 @@ import {
 import { Add16Regular, ArrowSync12Regular, ChevronLeft12Regular, ChevronRight12Regular } from "@fluentui/react-icons";
 import { GlobalSecondaryIndexLabels } from "Common/Constants";
 import { isGlobalSecondaryIndexEnabled } from "Common/DatabaseAccountUtility";
 import { sendMessage } from "Common/MessageHandler";
 import { configContext, Platform } from "ConfigContext";
 import { FabricMessageTypes } from "Contracts/FabricMessageTypes";
 import Explorer from "Explorer/Explorer";
 import { AddDatabasePanel } from "Explorer/Panes/AddDatabasePanel/AddDatabasePanel";
 import {
@@ -173,19 +171,6 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
      },
    ];
    if (isFabricNative()) {
      actions.push({
        id: "new_fabric_shortcut",
        label: "New Shortcut",
        icon: <Add16Regular />,
        onClick: () => {
          // explorer.onNewFabricShortcutClicked({ shortcutId: "blah" });
          // TODO: add telemetry
          sendMessage({ type: FabricMessageTypes.NewShortcut, });
        },
      });
    }
    if (configContext.platform !== Platform.Fabric && userContext.apiType !== "Tables") {
      actions.push({
        id: "new_database",
--- a/src/Explorer/SplashScreen/FabricHome.tsx
+++ b/src/Explorer/SplashScreen/FabricHome.tsx
@@ -1,8 +1,8 @@
 /**
 * Accordion top class
 */
-import { Link, makeStyles, tokens } from "@fluentui/react-components";
+import { makeStyles, tokens } from "@fluentui/react-components";
-import { DocumentAddRegular, LinkMultipleRegular, OpenRegular } from "@fluentui/react-icons";
+import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
 import { SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
 import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
 import { isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
@@ -119,7 +119,7 @@ const FabricHomeScreenButton: React.FC<FabricHomeScreenButtonProps & { className
 }) => {
  const styles = useStyles();
  return (
-    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick} tabIndex={0}>
+    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick}>
      <div className={styles.buttonUpperPart}>{icon}</div>
      <div aria-label={title} className={styles.buttonLowerPart}>
        <div>{title}</div>
@@ -147,7 +147,7 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
      {
        title: "Sample data",
        description: "Automatically load sample data in your database",
-        icon: <img src={CosmosDbBlackIcon} alt={"Azure Cosmos DB icon"} aria-hidden="true" />,
+        icon: <img src={CosmosDbBlackIcon} />,
        onClick: () => setOpenSampleDataImportDialog(true),
      },
      {
@@ -181,18 +181,16 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
          explorer={props.explorer}
          databaseName={userContext.fabricContext?.databaseName}
        />
-        <div className={styles.title} role="heading" aria-label={title} aria-level={1}>
+        <div className={styles.title} role="heading" aria-label={title}>
          {title}
        </div>
        {getSplashScreenButtons()}
-        {
+        {/* <div className={styles.footer}>
-          <div className={styles.footer}>
+          Need help?{" "}
-            Need help?{" "}
+          <Link href="https://aka.ms/cosmosdbfabricdocs" target="_blank">
-            <Link href="https://learn.microsoft.com/fabric/database/cosmos-db/overview" target="_blank">
+            Learn more <img src={LinkIcon} alt="Learn more" />
-              Learn more <OpenRegular />
+          </Link>
-            </Link>
+        </div> */}
          </div>
        }
      </CosmosFluentProvider>
    </>
  );
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -24,7 +24,6 @@ import { ReactTabKind, useTabs } from "hooks/useTabs";
 import * as React from "react";
 import ConnectIcon from "../../../images/Connect_color.svg";
 import ContainersIcon from "../../../images/Containers.svg";
 import CosmosDBIcon from "../../../images/CosmosDB-logo.svg";
 import LinkIcon from "../../../images/Link_blue.svg";
 import PowerShellIcon from "../../../images/PowerShell.svg";
 import CopilotIcon from "../../../images/QueryCopilotNewLogo.svg";
@@ -121,7 +120,11 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
  };
  private getSplashScreenButtons = (): JSX.Element => {
-    if (userContext.apiType === "SQL") {
+    if (
      userContext.apiType === "SQL" &&
      useQueryCopilot.getState().copilotEnabled &&
      useDatabases.getState().sampleDataResourceTokenCollection
    ) {
      return (
        <Stack
          className="splashStackContainer"
@@ -149,18 +152,25 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
            />
          </Stack>
          <Stack className="splashStackRow" horizontal>
-            <SplashScreenButton
+            {useQueryCopilot.getState().copilotEnabled && (
-              imgSrc={CosmosDBIcon}
+              <SplashScreenButton
-              imgSize={35}
+                imgSrc={CopilotIcon}
-              title={"Azure Cosmos DB Samples Gallery"}
+                title={"Query faster with Query Advisor"}
-              description={
+                description={
-                "Discover samples that showcase scalable, intelligent app patterns. Try one now to see how fast you can go from concept to code with Cosmos DB"
+                  "Query Advisor is your AI buddy that helps you write Azure Cosmos DB queries like a pro. Try it using our sample data set now!"
-              }
+                }
-              onClick={() => {
+                onClick={() => {
-                window.open("https://azurecosmosdb.github.io/gallery/?tags=example", "_blank");
+                  const copilotVersion = userContext.features.copilotVersion;
-                traceOpen(Action.LearningResourcesClicked, { apiType: userContext.apiType });
+                  if (copilotVersion === "v1.0") {
-              }}
+                    useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
-            />
+                  } else if (copilotVersion === "v2.0") {
                    const sampleCollection = useDatabases.getState().sampleDataResourceTokenCollection;
                    sampleCollection.onNewQueryClick(sampleCollection, undefined);
                  }
                  traceOpen(Action.OpenQueryCopilotFromSplashScreen, { apiType: userContext.apiType });
                }}
              />
            )}
            <SplashScreenButton
              imgSrc={ConnectIcon}
              title={"Connect"}
@@ -202,7 +212,6 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
              sample data, query.
            </TeachingBubble>
          )}
        {/*TODO: convert below to use SplashScreenButton */}
        {mainItems.map((item) => (
          <Stack
            id={`mainButton-${item.id}`}
@@ -468,34 +477,6 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
    };
  }
  //TODO: Re-enable lint rule when query copilot is reinstated in DE
  /* eslint-disable-next-line no-unused-vars */
  private getQueryCopilotCard = (): JSX.Element => {
    return (
      <>
        {useQueryCopilot.getState().copilotEnabled && (
          <SplashScreenButton
            imgSrc={CopilotIcon}
            title={"Query faster with Query Advisor"}
            description={
              "Query Advisor is your AI buddy that helps you write Azure Cosmos DB queries like a pro. Try it using our sample data set now!"
            }
            onClick={() => {
              const copilotVersion = userContext.features.copilotVersion;
              if (copilotVersion === "v1.0") {
                useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
              } else if (copilotVersion === "v2.0") {
                const sampleCollection = useDatabases.getState().sampleDataResourceTokenCollection;
                sampleCollection.onNewQueryClick(sampleCollection, undefined);
              }
              traceOpen(Action.OpenQueryCopilotFromSplashScreen, { apiType: userContext.apiType });
            }}
          />
        )}
      </>
    );
  };
  private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
    return {
      iconSrc: CollectionIcon,
--- a/src/Explorer/SplashScreen/SplashScreenButton.tsx
+++ b/src/Explorer/SplashScreen/SplashScreenButton.tsx
@@ -7,7 +7,6 @@ interface SplashScreenButtonProps {
  title: string;
  description: string;
  onClick: () => void;
  imgSize?: number;
 }
 export const SplashScreenButton: React.FC<SplashScreenButtonProps> = ({
@@ -15,7 +14,6 @@ export const SplashScreenButton: React.FC<SplashScreenButtonProps> = ({
  title,
  description,
  onClick,
  imgSize,
 }: SplashScreenButtonProps): JSX.Element => {
  return (
    <Stack
@@ -41,7 +39,7 @@ export const SplashScreenButton: React.FC<SplashScreenButtonProps> = ({
      role="button"
    >
      <div>
-        <img src={imgSrc} alt={title} aria-hidden="true" {...(imgSize ? { height: imgSize, width: imgSize } : {})} />
+        <img src={imgSrc} alt={title} aria-hidden="true" />
      </div>
      <Stack style={{ marginLeft: 16 }}>
        <Text style={{ fontSize: 18, fontWeight: 600 }}>{title}</Text>
--- a/src/Explorer/Tabs/CloudShellTab/Utils/CloudShellIPUtils.ts
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/CloudShellIPUtils.ts
@@ -0,0 +1,71 @@
 import { userContext } from "../../../../UserContext";
 export const CLOUDSHELL_IP_RECOMMENDATIONS = {
  centralindia: [
    { startIP: "4.247.135.109", endIP: "4.247.135.109" },
    { startIP: "74.225.207.63", endIP: "74.225.207.63" },
  ],
  southeastasia: [{ startIP: "4.194.5.74", endIP: "4.194.213.10" }],
  centraluseuap: [
    { startIP: "52.158.186.182", endIP: "52.158.186.182" },
    { startIP: "172.215.26.246", endIP: "172.215.26.246" },
    { startIP: "134.138.154.177", endIP: "134.138.154.177" },
    { startIP: "134.138.129.52", endIP: "134.138.129.52" },
    { startIP: "172.215.31.177", endIP: "172.215.31.177" },
  ],
  eastus2euap: [
    { startIP: "135.18.43.51", endIP: "135.18.43.51" },
    { startIP: "20.252.175.33", endIP: "20.252.175.33" },
    { startIP: "40.89.88.111", endIP: "40.89.88.111" },
    { startIP: "135.18.17.187", endIP: "135.18.17.187" },
    { startIP: "135.18.67.251", endIP: "135.18.67.251" },
  ],
  eastus: [
    { startIP: "40.71.199.151", endIP: "40.71.199.151" },
    { startIP: "20.42.18.188", endIP: "20.42.18.188" },
    { startIP: "52.190.17.9", endIP: "52.190.17.9" },
    { startIP: "20.120.96.152", endIP: "20.120.96.152" },
  ],
  northeurope: [
    { startIP: "74.234.65.146", endIP: "74.234.65.146" },
    { startIP: "52.169.70.113", endIP: "52.169.70.113" },
  ],
  southcentralus: [
    { startIP: "4.151.247.81", endIP: "4.151.247.81" },
    { startIP: "20.225.211.35", endIP: "20.225.211.35" },
    { startIP: "4.151.48.133", endIP: "4.151.48.133" },
    { startIP: "4.151.247.225", endIP: "4.151.247.225" },
  ],
  westeurope: [
    { startIP: "52.166.126.216", endIP: "52.166.126.216" },
    { startIP: "108.142.162.20", endIP: "108.142.162.20" },
    { startIP: "52.178.13.125", endIP: "52.178.13.125" },
    { startIP: "172.201.33.160", endIP: "172.201.33.160" },
  ],
  westus: [
    { startIP: "20.245.161.131", endIP: "20.245.161.131" },
    { startIP: "57.154.182.51", endIP: "57.154.182.51" },
    { startIP: "40.118.133.244", endIP: "40.118.133.244" },
    { startIP: "20.253.192.12", endIP: "20.253.192.12" },
    { startIP: "20.43.245.209", endIP: "20.43.245.209" },
    { startIP: "20.66.22.66", endIP: "20.66.22.66" },
  ],
 } as const;
 export interface CloudShellIPRange {
  startIP: string;
  endIP: string;
 }
 export function getCloudShellIPsForRegion(region: string): readonly CloudShellIPRange[] {
  const normalizedRegion = region.toLowerCase();
  return CLOUDSHELL_IP_RECOMMENDATIONS[normalizedRegion as keyof typeof CLOUDSHELL_IP_RECOMMENDATIONS] || [];
 }
 export function getClusterRegion(): string {
  const location = userContext?.databaseAccount?.location;
  if (location) {
    return location.toLowerCase();
  }
  return "";
 }
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.test.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.test.tsx
@@ -106,6 +106,6 @@ describe("QueryTabComponent", () => {
        <QueryTabCopilotComponent {...propsMock} />
      </CopilotProvider>,
    );
-    expect(container.find(QueryCopilotPromptbar).exists()).toBe(false);
+    expect(container.find(QueryCopilotPromptbar).exists()).toBe(true);
  });
 });
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -9,6 +9,7 @@ import { useDialog } from "Explorer/Controls/Dialog";
 import { monaco } from "Explorer/LazyMonaco";
 import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal";
 import { useCopilotStore } from "Explorer/QueryCopilot/QueryCopilotContext";
 import { QueryCopilotPromptbar } from "Explorer/QueryCopilot/QueryCopilotPromptbar";
 import { readCopilotToggleStatus, saveCopilotToggleStatus } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { OnExecuteQueryClick, QueryDocumentsPerPage } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { QueryCopilotSidebar } from "Explorer/QueryCopilot/V2/Sidebar/QueryCopilotSidebar";
@@ -27,9 +28,8 @@ import { TabsState, useTabs } from "hooks/useTabs";
 import React, { Fragment, createRef } from "react";
 import "react-splitter-layout/lib/index.css";
 import { format } from "react-string-format";
-//TODO: Uncomment next two lines when query copilot is reinstated in DE
+import QueryCommandIcon from "../../../../images/CopilotCommand.svg";
-// import QueryCommandIcon from "../../../../images/CopilotCommand.svg";
+import LaunchCopilot from "../../../../images/CopilotTabIcon.svg";
 // import LaunchCopilot from "../../../../images/CopilotTabIcon.svg";
 import DownloadQueryIcon from "../../../../images/DownloadQuery.svg";
 import CancelQueryIcon from "../../../../images/Entity_cancel.svg";
 import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
@@ -494,55 +494,53 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
      });
    }
-    //TODO: Uncomment next section when query copilot is reinstated in DE
+    if (this.launchCopilotButton.visible && this.isCopilotTabActive) {
-    // if (this.launchCopilotButton.visible && this.isCopilotTabActive) {
+      const mainButtonLabel = "Launch Copilot";
-    //   const mainButtonLabel = "Launch Copilot";
+      const chatPaneLabel = "Open Copilot in chat pane (ALT+C)";
-    //   const chatPaneLabel = "Open Copilot in chat pane (ALT+C)";
+      const copilotSettingLabel = "Copilot settings";
    //   const copilotSettingLabel = "Copilot settings";
-    //   const openCopilotChatButton: CommandButtonComponentProps = {
+      const openCopilotChatButton: CommandButtonComponentProps = {
-    //     iconAlt: chatPaneLabel,
+        iconAlt: chatPaneLabel,
-    //     onCommandClick: this.launchQueryCopilotChat,
+        onCommandClick: this.launchQueryCopilotChat,
-    //     commandButtonLabel: chatPaneLabel,
+        commandButtonLabel: chatPaneLabel,
-    //     ariaLabel: chatPaneLabel,
+        ariaLabel: chatPaneLabel,
-    //     hasPopup: false,
+        hasPopup: false,
-    //   };
+      };
-    //   const copilotSettingsButton: CommandButtonComponentProps = {
+      const copilotSettingsButton: CommandButtonComponentProps = {
-    //     iconAlt: copilotSettingLabel,
+        iconAlt: copilotSettingLabel,
-    //     onCommandClick: () => undefined,
+        onCommandClick: () => undefined,
-    //     commandButtonLabel: copilotSettingLabel,
+        commandButtonLabel: copilotSettingLabel,
-    //     ariaLabel: copilotSettingLabel,
+        ariaLabel: copilotSettingLabel,
-    //     hasPopup: false,
+        hasPopup: false,
-    //   };
+      };
-    //   const launchCopilotButton: CommandButtonComponentProps = {
+      const launchCopilotButton: CommandButtonComponentProps = {
-    //     iconSrc: LaunchCopilot,
+        iconSrc: LaunchCopilot,
-    //     iconAlt: mainButtonLabel,
+        iconAlt: mainButtonLabel,
-    //     onCommandClick: this.launchQueryCopilotChat,
+        onCommandClick: this.launchQueryCopilotChat,
-    //     commandButtonLabel: mainButtonLabel,
+        commandButtonLabel: mainButtonLabel,
-    //     ariaLabel: mainButtonLabel,
+        ariaLabel: mainButtonLabel,
-    //     hasPopup: false,
+        hasPopup: false,
-    //     children: [openCopilotChatButton, copilotSettingsButton],
+        children: [openCopilotChatButton, copilotSettingsButton],
-    //   };
+      };
-    //   buttons.push(launchCopilotButton);
+      buttons.push(launchCopilotButton);
-    // }
+    }
-    //TODO: Uncomment next section when query copilot is reinstated in DE
+    if (this.props.copilotEnabled) {
-    // if (this.props.copilotEnabled) {
+      const toggleCopilotButton: CommandButtonComponentProps = {
-    //   const toggleCopilotButton: CommandButtonComponentProps = {
+        iconSrc: QueryCommandIcon,
-    //     iconSrc: QueryCommandIcon,
+        iconAlt: "Query Advisor",
-    //     iconAlt: "Query Advisor",
+        keyboardAction: KeyboardAction.TOGGLE_COPILOT,
-    //     keyboardAction: KeyboardAction.TOGGLE_COPILOT,
+        onCommandClick: () => {
-    //     onCommandClick: () => {
+          this._toggleCopilot(!this.state.copilotActive);
-    //       this._toggleCopilot(!this.state.copilotActive);
+        },
-    //     },
+        commandButtonLabel: this.state.copilotActive ? "Disable Query Advisor" : "Enable Query Advisor",
-    //     commandButtonLabel: this.state.copilotActive ? "Disable Query Advisor" : "Enable Query Advisor",
+        ariaLabel: this.state.copilotActive ? "Disable Query Advisor" : "Enable Query Advisor",
-    //     ariaLabel: this.state.copilotActive ? "Disable Query Advisor" : "Enable Query Advisor",
+        hasPopup: false,
-    //     hasPopup: false,
+      };
-    //   };
+      buttons.push(toggleCopilotButton);
-    //   buttons.push(toggleCopilotButton);
+    }
    // }
    if (!this.props.isPreferredApiMongoDB && this.state.isExecuting) {
      const label = "Cancel query";
@@ -727,7 +725,6 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
    return (
      <Fragment>
        <CosmosFluentProvider id={this.props.tabId} className={this.props.styles.queryTab} role="tabpanel">
          {/*TODO: Uncomment this section when query copilot is reinstated in DE
          {this.props.copilotEnabled && this.state.currentTabActive && this.state.copilotActive && (
            <QueryCopilotPromptbar
              explorer={this.props.collection.container}
@@ -735,7 +732,7 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
              databaseId={this.props.collection.databaseId}
              containerId={this.props.collection.id()}
            ></QueryCopilotPromptbar>
-          )} */}
+          )}
          {/* Set 'key' to the value of vertical to force re-rendering when vertical changes, to work around https://github.com/johnwalley/allotment/issues/457 */}
          <Allotment
            key={vertical.toString()}
--- a/src/Explorer/Tabs/Shared/CloudShellIPChecker.ts
+++ b/src/Explorer/Tabs/Shared/CloudShellIPChecker.ts
@@ -0,0 +1,78 @@
 import { configContext } from "ConfigContext";
 import * as DataModels from "Contracts/DataModels";
 import { userContext } from "UserContext";
 import { armRequest } from "Utils/arm/request";
 import {
  CloudShellIPRange,
  getCloudShellIPsForRegion,
  getClusterRegion,
 } from "../CloudShellTab/Utils/CloudShellIPUtils";
 import { getNormalizedRegion } from "../CloudShellTab/Utils/RegionUtils";
 // Constants
 const DEFAULT_CLOUDSHELL_REGION = "westus";
 /**
 * Check if user has added all CloudShell IPs for their normalized region
 * @param apiVersion - The API version to use for the ARM request
 * @returns Promise<boolean> - true if all CloudShell IPs are configured (don't show screenshot), false if missing (show screenshot)
 */
 export async function checkCloudShellIPsConfigured(apiVersion: string): Promise<boolean> {
  const clusterRegion = getClusterRegion();
  if (!clusterRegion) {
    return false;
  }
  const normalizedRegion = getNormalizedRegion(clusterRegion, DEFAULT_CLOUDSHELL_REGION);
  const cloudShellIPs = getCloudShellIPsForRegion(normalizedRegion);
  if (cloudShellIPs.length === 0) {
    return false;
  }
  const firewallRulesUri = `${userContext.databaseAccount.id}/firewallRules`;
  const response: any = await armRequest({
    host: configContext.ARM_ENDPOINT,
    path: firewallRulesUri,
    method: "GET",
    apiVersion: apiVersion,
  });
  const firewallRules: DataModels.FirewallRule[] = response?.data?.value || response?.value || [];
  const missingIPs: Array<{ startIP: string; endIP: string; reason?: string }> = [];
  const foundIPs: Array<{ startIP: string; endIP: string; ruleName?: string }> = [];
  for (const cloudShellIP of cloudShellIPs) {
    const matchingRule = firewallRules.find((rule) => {
      const startMatch = rule.properties.startIpAddress === cloudShellIP.startIP;
      const endMatch = rule.properties.endIpAddress === cloudShellIP.endIP;
      return startMatch && endMatch;
    });
    if (matchingRule) {
      foundIPs.push({ ...cloudShellIP, ruleName: matchingRule.name });
    } else {
      missingIPs.push({ ...cloudShellIP, reason: "No exact IP match in firewall rules" });
    }
  }
  const allConfigured = missingIPs.length === 0;
  return allConfigured;
 }
 /**
 * Get the normalized region and its CloudShell IPs for display in the guide
 * @returns Object with region and IPs for the guide
 */
 export function getCloudShellGuideInfo(): { region: string; cloudShellIPs: readonly CloudShellIPRange[] } {
  const clusterRegion = getClusterRegion();
  const normalizedRegion = getNormalizedRegion(clusterRegion || "", DEFAULT_CLOUDSHELL_REGION);
  const cloudShellIPs = getCloudShellIPsForRegion(normalizedRegion);
  return {
    region: normalizedRegion,
    cloudShellIPs: cloudShellIPs,
  };
 }
--- a/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
+++ b/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
@@ -22,10 +22,22 @@ export abstract class BaseTerminalComponentAdapter implements ReactAdapter {
    protected getUsername: () => string,
    protected isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
    protected kind: ViewModels.TerminalKind,
-  ) {}
+    protected isCloudShellIPsConfigured?: ko.Observable<boolean>,
  ) { }
  public renderComponent(): JSX.Element {
-    if (!this.isAllPublicIPAddressesEnabled()) {
+    const publicIPEnabled = this.isAllPublicIPAddressesEnabled();
    const cloudShellConfigured = this.isCloudShellIPsConfigured ? this.isCloudShellIPsConfigured() : true;
    let shouldShowScreenshot: boolean;
    if (this.isCloudShellIPsConfigured) {
      shouldShowScreenshot = !cloudShellConfigured;
    } else {
      shouldShowScreenshot = !publicIPEnabled;
    }
    if (shouldShowScreenshot) {
      return (
        <QuickstartFirewallNotification
          messageType={this.getMessageType()}
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -1,4 +1,5 @@
 import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
 import { checkCloudShellIPsConfigured } from "Explorer/Tabs/Shared/CloudShellIPChecker";
 import { CloudShellTerminalComponentAdapter } from "Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter";
 import * as ko from "knockout";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
@@ -23,11 +24,13 @@ export default class TerminalTab extends TabsBase {
  private container: Explorer;
  private notebookTerminalComponentAdapter: ReactAdapter;
  private isAllPublicIPAddressesEnabled: ko.Observable<boolean>;
  private isCloudShellIPsConfigured: ko.Observable<boolean>;
  constructor(options: TerminalTabOptions) {
    super(options);
    this.container = options.container;
    this.isAllPublicIPAddressesEnabled = ko.observable(true);
    this.isCloudShellIPsConfigured = ko.observable(true); // Start optimistic, will be updated
    const commonArgs: [
      () => DataModels.DatabaseAccount,
@@ -36,18 +39,33 @@ export default class TerminalTab extends TabsBase {
      ko.Observable<boolean>,
      ViewModels.TerminalKind,
    ] = [
-      () => userContext?.databaseAccount,
+        () => userContext?.databaseAccount,
-      () => this.tabId,
+        () => this.tabId,
-      () => this.getUsername(),
+        () => this.getUsername(),
-      this.isAllPublicIPAddressesEnabled,
+        this.isAllPublicIPAddressesEnabled,
-      options.kind,
+        options.kind,
-    ];
+      ];
    if (userContext.features.enableCloudShell) {
-      this.notebookTerminalComponentAdapter = new CloudShellTerminalComponentAdapter(...commonArgs);
+      this.notebookTerminalComponentAdapter = new CloudShellTerminalComponentAdapter(
        () => userContext?.databaseAccount,
        () => this.tabId,
        () => this.getUsername(),
        this.isAllPublicIPAddressesEnabled,
        options.kind,
        this.isCloudShellIPsConfigured,
      );
      this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
-        return this.isTemplateReady() && this.isAllPublicIPAddressesEnabled();
+        const cloudShellConfigured = this.isCloudShellIPsConfigured();
        return this.isTemplateReady() && cloudShellConfigured;
      });
      checkCloudShellIPsConfigured("2023-03-01-preview").then(result => {
        this.isCloudShellIPsConfigured(result);
      }).catch(error => {
        console.error(`CloudShell IP Check failed for ${ViewModels.TerminalKind[options.kind]} terminal:`, error);
        this.isCloudShellIPsConfigured(false);
      });
    } else {
      this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
@@ -65,22 +83,25 @@ export default class TerminalTab extends TabsBase {
      });
    }
-    if (options.kind === ViewModels.TerminalKind.Postgres) {
+    // Only run legacy firewall checks for NON-CloudShell terminals cloudShell terminals use the CloudShell IP checker instead
-      checkFirewallRules(
+    if (!userContext.features.enableCloudShell) {
-        "2022-11-08",
+      if (options.kind === ViewModels.TerminalKind.Postgres) {
-        (rule) => rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255",
+        checkFirewallRules(
-        this.isAllPublicIPAddressesEnabled,
+          "2022-11-08",
-      );
+          (rule) => rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255",
-    }
+          this.isAllPublicIPAddressesEnabled,
        );
      }
-    if (options.kind === ViewModels.TerminalKind.VCoreMongo) {
+      if (options.kind === ViewModels.TerminalKind.VCoreMongo) {
-      checkFirewallRules(
+        checkFirewallRules(
-        "2023-03-01-preview",
+          "2023-03-01-preview",
-        (rule) =>
+          (rule) =>
-          rule.name.startsWith("AllowAllAzureServicesAndResourcesWithinAzureIps") ||
+            rule.name.startsWith("AllowAllAzureServicesAndResourcesWithinAzureIps") ||
-          (rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255"),
+            (rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255"),
-        this.isAllPublicIPAddressesEnabled,
+          this.isAllPublicIPAddressesEnabled,
-      );
+        );
      }
    }
  }
--- a/src/Shared/StorageUtility.ts
+++ b/src/Shared/StorageUtility.ts
@@ -1,4 +1,3 @@
 import { MongoGuidRepresentation } from "Common/Constants";
 import { SplitterDirection } from "Common/Splitter";
 import * as LocalStorageUtility from "./LocalStorageUtility";
 import * as SessionStorageUtility from "./SessionStorageUtility";
@@ -34,7 +33,6 @@ export enum StorageKey {
  DocumentsTabPrefs,
  DefaultQueryResultsView,
  AppState,
  MongoGuidRepresentation,
 }
 export const hasRUThresholdBeenConfigured = (): boolean => {
@@ -67,13 +65,4 @@ export const getDefaultQueryResultsView = (): SplitterDirection => {
  return SplitterDirection.Horizontal;
 };
 export const getMongoGuidRepresentation = (): MongoGuidRepresentation => {
  const mongoGuidRepresentation: string | null = LocalStorageUtility.getEntryString(StorageKey.MongoGuidRepresentation);
  if (mongoGuidRepresentation) {
    return mongoGuidRepresentation as MongoGuidRepresentation;
  }
  return MongoGuidRepresentation.CSharpLegacy;
 };
 export const DefaultRUThreshold = 5000;
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -220,10 +220,6 @@ async function configureFabric(): Promise<Explorer> {
            explorer.onRefreshResourcesClick();
            break;
          }
          case "shortcutCreated": {
            explorer.onNewFabricShortcutClicked({ shortcutId: data.message.shortcutId });
            break;
          }
          default:
            console.error(`Unknown Fabric message type: ${JSON.stringify(data)}`);
            break;