migrate refreshNoteBookEnabledStateForAccount to react

.eslintignore

@@ -1,5 +1,4 @@
 **/node_modules/
-src/**/__mocks__/**/*
 dist/
 Contracts/
 src/Api/Apis.ts

.eslintrc.js

@@ -11,7 +11,6 @@ module.exports = {
   },
   parser: "@typescript-eslint/parser",
   parserOptions: {
-    project: ["./tsconfig.json", "./tsconfig.test.json"],
     ecmaFeatures: {
       jsx: true,
     },
@@ -36,7 +35,6 @@ module.exports = {
   rules: {
     "no-console": ["error", { allow: ["error", "warn", "dir"] }],
     curly: "error",
-    "@typescript-eslint/switch-exhaustiveness-check": "error",
     "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/no-extraneous-class": "error",
     "no-null/no-null": "error",

.github/workflows/ci.yml

@@ -138,7 +138,6 @@ jobs:
       matrix:
         test-file:
           - ./test/cassandra/container.spec.ts
-          - ./test/graph/container.spec.ts
           - ./test/sql/container.spec.ts
           - ./test/mongo/container.spec.ts
           - ./test/selfServe/selfServeExample.spec.ts

jest.config.js

@@ -69,8 +69,7 @@ module.exports = {
   moduleNameMapper: {
     "^.*[.](svg|png|gif|less|css)$": "<rootDir>/mockModule",
     "@nteract/stateful-components/(.*)$": "<rootDir>/mockModule",
-    "@fluentui/react/lib/(.*)$": "@fluentui/react/lib-commonjs/$1", // https://github.com/microsoft/fluentui/wiki/Version-8-release-notes
-    "monaco-editor/(.*)$": "<rootDir>/__mocks__/monaco-editor",
+    "office-ui-fabric-react/lib/(.*)$": "office-ui-fabric-react/lib-commonjs/$1", // https://github.com/OfficeDev/office-ui-fabric-react/wiki/Fabric-6-Release-Notes
     "^dnd-core$": "dnd-core/dist/cjs",
     "^react-dnd$": "react-dnd/dist/cjs",
     "^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs",

package.json

@@ -11,7 +11,6 @@
     "@azure/ms-rest-nodeauth": "3.0.7",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-decorators": "7.12.12",
-    "@fluentui/react": "8.10.1",
     "@jupyterlab/services": "6.0.2",
     "@jupyterlab/terminal": "3.0.3",
     "@microsoft/applicationinsights-web": "2.6.1",
@@ -44,6 +43,7 @@
     "@types/mkdirp": "1.0.1",
     "@types/node-fetch": "2.5.7",
     "@uifabric/react-cards": "0.109.110",
+    "@uifabric/styling": "7.13.7",
     "applicationinsights": "1.8.0",
     "bootstrap": "3.4.1",
     "canvas": "file:./canvas",
@@ -76,6 +76,7 @@
     "monaco-editor": "0.18.1",
     "ms": "2.1.3",
     "msal": "1.4.4",
+    "office-ui-fabric-react": "7.164.2",
     "p-retry": "4.2.0",
     "plotly.js-cartesian-dist-min": "1.52.3",
     "post-robot": "10.0.42",
@@ -127,8 +128,8 @@
     "@types/sinon": "2.3.3",
     "@types/styled-components": "5.1.1",
     "@types/underscore": "1.7.36",
-    "@typescript-eslint/eslint-plugin": "4.22.0",
-    "@typescript-eslint/parser": "4.22.0",
+    "@typescript-eslint/eslint-plugin": "4.0.1",
+    "@typescript-eslint/parser": "4.0.1",
     "babel-jest": "24.9.0",
     "babel-loader": "8.1.0",
     "buffer": "5.1.0",
@@ -190,7 +191,7 @@
     "pack:fast": "node --max_old_space_size=10196 ./node_modules/webpack/bin/webpack.js  --mode development --progress",
     "copyToConsumers": "node copyToConsumers",
     "test": "rimraf coverage && jest",
-    "test:e2e": "jest -c ./jest.config.playwright.js --detectOpenHandles",
+    "test:e2e": "jest -c ./jest.config.e2e.js --detectOpenHandles",
     "watch": "npm run start",
     "wait-for-server": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/",
     "build:ase": "gulp build:ase",

src/CellOutputViewer/CellOutputViewer.less

@@ -1,10 +0,0 @@
-.schema-analyzer-cell-outputs {
-  padding:  10px;
-}
-
-.schema-analyzer-cell-output {
-  margin-bottom: 20px;
-  padding: 10px;
-  border-radius: 2px;
-  box-shadow: rgba(0, 0, 0, 13%) 0px 1.6px 3.6px 0px, rgba(0, 0, 0, 11%) 0px 0.3px 0.9px 0px;
-}

src/CellOutputViewer/CellOutputViewer.tsx

@@ -11,14 +11,13 @@ import * as ReactDOM from "react-dom";
 import "../../externals/iframeResizer.contentWindow.min.js"; // Required for iFrameResizer to work
 import "../Explorer/Notebook/NotebookRenderer/base.css";
 import "../Explorer/Notebook/NotebookRenderer/default.css";
-import "./CellOutputViewer.less";
 import { TransformMedia } from "./TransformMedia";
 
 export interface CellOutputViewerProps {
   id: string;
   contentRef: ContentRef;
-  outputsContainerClassName: string;
-  outputClassName: string;
+  hidden: boolean;
+  expanded: boolean;
   outputs: OnDiskOutput[];
   onMetadataChange: (metadata: JSONObject, mediaType: string, index?: number) => void;
 }
@@ -35,26 +34,27 @@ const onInit = async () => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const props = (event as any).data as CellOutputViewerProps;
       const outputs = (
-        <div data-iframe-height className={props.outputsContainerClassName}>
+        <div
+          data-iframe-height
+          className={`nteract-cell-outputs ${props.hidden ? "hidden" : ""} ${props.expanded ? "expanded" : ""}`}
+        >
           {props.outputs?.map((output, index) => (
-            <div className={props.outputClassName} key={index}>
-              <Output output={createImmutableOutput(output)} key={index}>
-                <TransformMedia
-                  output_type={"display_data"}
-                  id={props.id}
-                  contentRef={props.contentRef}
-                  onMetadataChange={(metadata, mediaType) => props.onMetadataChange(metadata, mediaType, index)}
-                />
-                <TransformMedia
-                  output_type={"execute_result"}
-                  id={props.id}
-                  contentRef={props.contentRef}
-                  onMetadataChange={(metadata, mediaType) => props.onMetadataChange(metadata, mediaType, index)}
-                />
-                <KernelOutputError />
-                <StreamText />
-              </Output>
-            </div>
+            <Output output={createImmutableOutput(output)} key={index}>
+              <TransformMedia
+                output_type={"display_data"}
+                id={props.id}
+                contentRef={props.contentRef}
+                onMetadataChange={(metadata, mediaType) => props.onMetadataChange(metadata, mediaType, index)}
+              />
+              <TransformMedia
+                output_type={"execute_result"}
+                id={props.id}
+                contentRef={props.contentRef}
+                onMetadataChange={(metadata, mediaType) => props.onMetadataChange(metadata, mediaType, index)}
+              />
+              <KernelOutputError />
+              <StreamText />
+            </Output>
           ))}
         </div>
       );

src/Common/Constants.ts

@@ -65,18 +65,28 @@ export class ClientDefaults {
   public static readonly arcadiaTokenRefreshIntervalPaddingMs: number = 2000;
 }
 
-export enum AccountKind {
-  DocumentDB = "DocumentDB",
-  MongoDB = "MongoDB",
-  Parse = "Parse",
-  GlobalDocumentDB = "GlobalDocumentDB",
-  Default = "DocumentDB",
+export class AccountKind {
+  public static DocumentDB: string = "DocumentDB";
+  public static MongoDB: string = "MongoDB";
+  public static Parse: string = "Parse";
+  public static GlobalDocumentDB: string = "GlobalDocumentDB";
+  public static Default: string = AccountKind.DocumentDB;
 }
 
 export class CorrelationBackend {
   public static Url: string = "https://aka.ms/cosmosdbanalytics";
 }
 
+export class DefaultAccountExperience {
+  public static DocumentDB: string = "DocumentDB";
+  public static Graph: string = "Graph";
+  public static MongoDB: string = "MongoDB";
+  public static ApiForMongoDB: string = "Azure Cosmos DB for MongoDB API";
+  public static Table: string = "Table";
+  public static Cassandra: string = "Cassandra";
+  public static Default: string = DefaultAccountExperience.DocumentDB;
+}
+
 export class CapabilityNames {
   public static EnableTable: string = "EnableTable";
   public static EnableGremlin: string = "EnableGremlin";

src/Common/CosmosClient.test.ts

@@ -1,5 +1,5 @@
 import { ResourceType } from "@azure/cosmos/dist-esm/common/constants";
-import { Platform, resetConfigContext, updateConfigContext } from "../ConfigContext";
+import { configContext, Platform, updateConfigContext, resetConfigContext } from "../ConfigContext";
 import { updateUserContext } from "../UserContext";
 import { endpoint, getTokenFromAuthService, requestPlugin, tokenProvider } from "./CosmosClient";
 
@@ -91,6 +91,7 @@ describe("endpoint", () => {
         location: "foo",
         type: "foo",
         kind: "foo",
+        tags: [],
         properties: {
           documentEndpoint: "bar",
           gremlinEndpoint: "foo",

src/Common/CosmosClient.ts

@@ -43,7 +43,12 @@ export const endpoint = () => {
     const location = _global.parent ? _global.parent.location : _global.location;
     return configContext.EMULATOR_ENDPOINT || location.origin;
   }
-  return userContext.endpoint || userContext?.databaseAccount?.properties?.documentEndpoint;
+  return (
+    userContext.endpoint ||
+    (userContext.databaseAccount &&
+      userContext.databaseAccount.properties &&
+      userContext.databaseAccount.properties.documentEndpoint)
+  );
 };
 
 export async function getTokenFromAuthService(verb: string, resourceType: string, resourceId?: string): Promise<any> {

src/Common/EntityValue.tsx

@@ -1,4 +1,4 @@
-import { DatePicker, TextField } from "@fluentui/react";
+import { DatePicker, TextField } from "office-ui-fabric-react";
 import React, { FunctionComponent } from "react";
 
 export interface TableEntityProps {

src/Common/MongoProxyClient.ts

@@ -61,7 +61,7 @@ export function queryDocuments(
   query: string,
   continuationToken?: string
 ): Promise<QueryResponse> {
-  const { databaseAccount } = userContext;
+  const databaseAccount = userContext.databaseAccount;
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
   const params = {
     db: databaseId,
@@ -121,7 +121,7 @@ export function readDocument(
   collection: Collection,
   documentId: DocumentId
 ): Promise<DataModels.DocumentId> {
-  const { databaseAccount } = userContext;
+  const databaseAccount = userContext.databaseAccount;
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
   const idComponents = documentId.self.split("/");
   const path = idComponents.slice(0, 4).join("/");
@@ -167,7 +167,7 @@ export function createDocument(
   partitionKeyProperty: string,
   documentContent: unknown
 ): Promise<DataModels.DocumentId> {
-  const { databaseAccount } = userContext;
+  const databaseAccount = userContext.databaseAccount;
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
   const params = {
     db: databaseId,
@@ -206,7 +206,7 @@ export function updateDocument(
   documentId: DocumentId,
   documentContent: string
 ): Promise<DataModels.DocumentId> {
-  const { databaseAccount } = userContext;
+  const databaseAccount = userContext.databaseAccount;
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
   const idComponents = documentId.self.split("/");
   const path = idComponents.slice(0, 5).join("/");
@@ -247,7 +247,7 @@ export function updateDocument(
 }
 
 export function deleteDocument(databaseId: string, collection: Collection, documentId: DocumentId): Promise<void> {
-  const { databaseAccount } = userContext;
+  const databaseAccount = userContext.databaseAccount;
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
   const idComponents = documentId.self.split("/");
   const path = idComponents.slice(0, 5).join("/");
@@ -289,7 +289,7 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
 export function createMongoCollectionWithProxy(
   params: DataModels.CreateCollectionParams
 ): Promise<DataModels.Collection> {
-  const { databaseAccount } = userContext;
+  const databaseAccount = userContext.databaseAccount;
   const shardKey: string = params.partitionKey?.paths[0];
   const mongoParams: DataModels.MongoParameters = {
     resourceUrl: databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint,

src/Common/PortalNotifications.ts

@@ -1,8 +1,8 @@
-import { configContext, Platform } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import { userContext } from "../UserContext";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
+import { userContext } from "../UserContext";
+import { configContext, Platform } from "../ConfigContext";
 
 const notificationsPath = () => {
   switch (configContext.platform) {
@@ -20,7 +20,9 @@ export const fetchPortalNotifications = async (): Promise<DataModels.Notificatio
     return [];
   }
 
-  const { databaseAccount, resourceGroup, subscriptionId } = userContext;
+  const databaseAccount = userContext.databaseAccount;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
   const url = `${configContext.BACKEND_ENDPOINT}${notificationsPath()}?accountName=${
     databaseAccount.name
   }&subscriptionId=${subscriptionId}&resourceGroup=${resourceGroup}`;

src/Common/QueriesClient.ts

@@ -182,8 +182,11 @@ export class QueriesClient {
   }
 
   public getResourceId(): string {
-    const { databaseAccount, subscriptionId = "", resourceGroup = "" } = userContext;
-    const databaseAccountName = databaseAccount?.name || "";
+    const databaseAccount = userContext.databaseAccount;
+    const databaseAccountName = (databaseAccount && databaseAccount.name) || "";
+    const subscriptionId = userContext.subscriptionId || "";
+    const resourceGroup = userContext.resourceGroup || "";
+
     return `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDb/databaseAccounts/${databaseAccountName}`;
   }
 

src/Common/TableEntity.tsx

@@ -8,7 +8,7 @@ import {
   Stack,
   TextField,
   TooltipHost,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import React, { FunctionComponent } from "react";
 import DeleteIcon from "../../images/delete.svg";
 import EditIcon from "../../images/Edit_entity.svg";

src/Common/Tooltip/Tooltip.tsx

@@ -1,5 +1,5 @@
-import { ITooltipHostStyles, TooltipHost } from "@fluentui/react";
-import { useId } from "@fluentui/react-hooks";
+import { useId } from "@uifabric/react-hooks";
+import { ITooltipHostStyles, TooltipHost } from "office-ui-fabric-react/lib/Tooltip";
 import * as React from "react";
 import InfoBubble from "../../../images/info-bubble.svg";
 

src/Common/Upload/Upload.tsx

@@ -1,4 +1,4 @@
-import { Image, Stack, TextField } from "@fluentui/react";
+import { Image, Stack, TextField } from "office-ui-fabric-react";
 import React, { ChangeEvent, FunctionComponent, KeyboardEvent, useRef, useState } from "react";
 import FolderIcon from "../../../images/folder_16x16.svg";
 import * as Constants from "../Constants";

src/Common/dataAccess/createCollection.ts

@@ -62,8 +62,8 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
 };
 
 const createCollectionWithARM = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  const { apiType } = userContext;
-  switch (apiType) {
+  const defaultExperience = userContext.apiType;
+  switch (defaultExperience) {
     case "SQL":
       return createSqlContainer(params);
     case "Mongo":
@@ -75,7 +75,7 @@ const createCollectionWithARM = async (params: DataModels.CreateCollectionParams
     case "Tables":
       return createTable(params);
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 };
 

src/Common/dataAccess/createDatabase.ts

@@ -48,9 +48,8 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
 }
 
 async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  const { apiType } = userContext;
-
-  switch (apiType) {
+  const defaultExperience = userContext.apiType;
+  switch (defaultExperience) {
     case "SQL":
       return createSqlDatabase(params);
     case "Mongo":
@@ -60,7 +59,7 @@ async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): P
     case "Gremlin":
       return createGremlineDatabase(params);
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 }
 

src/Common/dataAccess/deleteCollection.ts

@@ -27,10 +27,12 @@ export async function deleteCollection(databaseId: string, collectionId: string)
 }
 
 function deleteCollectionWithARM(databaseId: string, collectionId: string): Promise<void> {
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
-  switch (apiType) {
+  switch (defaultExperience) {
     case "SQL":
       return deleteSqlContainer(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
     case "Mongo":
@@ -42,6 +44,6 @@ function deleteCollectionWithARM(databaseId: string, collectionId: string): Prom
     case "Tables":
       return deleteTable(subscriptionId, resourceGroup, accountName, collectionId);
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 }

src/Common/dataAccess/deleteDatabase.ts

@@ -30,10 +30,12 @@ export async function deleteDatabase(databaseId: string): Promise<void> {
 }
 
 function deleteDatabaseWithARM(databaseId: string): Promise<void> {
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
-  switch (apiType) {
+  switch (defaultExperience) {
     case "SQL":
       return deleteSqlDatabase(subscriptionId, resourceGroup, accountName, databaseId);
     case "Mongo":
@@ -43,6 +45,6 @@ function deleteDatabaseWithARM(databaseId: string): Promise<void> {
     case "Gremlin":
       return deleteGremlinDatabase(subscriptionId, resourceGroup, accountName, databaseId);
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 }

src/Common/dataAccess/getCollectionDataUsageSize.ts

@@ -1,8 +1,8 @@
 import { AuthType } from "../../AuthType";
-import { configContext } from "../../ConfigContext";
-import { userContext } from "../../UserContext";
 import { armRequest } from "../../Utils/arm/request";
+import { configContext } from "../../ConfigContext";
 import { handleError } from "../ErrorHandlingUtils";
+import { userContext } from "../../UserContext";
 
 interface TimeSeriesData {
   data: {
@@ -45,9 +45,9 @@ export const getCollectionUsageSizeInKB = async (databaseName: string, container
     return undefined;
   }
 
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
-
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
   const filter = `DatabaseName eq '${databaseName}' and CollectionName eq '${containerName}'`;
   const metricNames = "DataUsage,IndexUsage";
   const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/providers/microsoft.insights/metrics`;

src/Common/dataAccess/readCollectionOffer.ts

@@ -28,12 +28,14 @@ export const readCollectionOffer = async (params: ReadCollectionOfferParams): Pr
 };
 
 const readCollectionOfferWithARM = async (databaseId: string, collectionId: string): Promise<Offer> => {
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
   let rpResponse;
   try {
-    switch (apiType) {
+    switch (defaultExperience) {
       case "SQL":
         rpResponse = await getSqlContainerThroughput(
           subscriptionId,
@@ -74,7 +76,7 @@ const readCollectionOfferWithARM = async (databaseId: string, collectionId: stri
         rpResponse = await getTableThroughput(subscriptionId, resourceGroup, accountName, collectionId);
         break;
       default:
-        throw new Error(`Unsupported default experience type: ${apiType}`);
+        throw new Error(`Unsupported default experience type: ${defaultExperience}`);
     }
   } catch (error) {
     if (error.code !== "NotFound") {

src/Common/dataAccess/readCollections.ts

@@ -29,11 +29,12 @@ export async function readCollections(databaseId: string): Promise<DataModels.Co
 
 async function readCollectionsWithARM(databaseId: string): Promise<DataModels.Collection[]> {
   let rpResponse;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
-
-  switch (apiType) {
+  switch (defaultExperience) {
     case "SQL":
       rpResponse = await listSqlContainers(subscriptionId, resourceGroup, accountName, databaseId);
       break;
@@ -50,7 +51,7 @@ async function readCollectionsWithARM(databaseId: string): Promise<DataModels.Co
       rpResponse = await listTables(subscriptionId, resourceGroup, accountName);
       break;
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 
   return rpResponse?.value?.map((collection) => collection.properties?.resource as DataModels.Collection);

src/Common/dataAccess/readDatabaseOffer.ts

@@ -27,12 +27,14 @@ export const readDatabaseOffer = async (params: ReadDatabaseOfferParams): Promis
 };
 
 const readDatabaseOfferWithARM = async (databaseId: string): Promise<Offer> => {
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
   let rpResponse;
   try {
-    switch (apiType) {
+    switch (defaultExperience) {
       case "SQL":
         rpResponse = await getSqlDatabaseThroughput(subscriptionId, resourceGroup, accountName, databaseId);
         break;
@@ -46,7 +48,7 @@ const readDatabaseOfferWithARM = async (databaseId: string): Promise<Offer> => {
         rpResponse = await getGremlinDatabaseThroughput(subscriptionId, resourceGroup, accountName, databaseId);
         break;
       default:
-        throw new Error(`Unsupported default experience type: ${apiType}`);
+        throw new Error(`Unsupported default experience type: ${defaultExperience}`);
     }
   } catch (error) {
     if (error.code !== "NotFound") {

src/Common/dataAccess/readDatabases.ts

@@ -29,10 +29,12 @@ export async function readDatabases(): Promise<DataModels.Database[]> {
 
 async function readDatabasesWithARM(): Promise<DataModels.Database[]> {
   let rpResponse;
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
-  switch (apiType) {
+  switch (defaultExperience) {
     case "SQL":
       rpResponse = await listSqlDatabases(subscriptionId, resourceGroup, accountName);
       break;
@@ -46,7 +48,7 @@ async function readDatabasesWithARM(): Promise<DataModels.Database[]> {
       rpResponse = await listGremlinDatabases(subscriptionId, resourceGroup, accountName);
       break;
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 
   return rpResponse?.value?.map((database) => database.properties?.resource as DataModels.Database);

src/Common/dataAccess/readMongoDBCollection.tsx

@@ -1,9 +1,9 @@
-import { AuthType } from "../../AuthType";
 import { userContext } from "../../UserContext";
 import { getMongoDBCollection } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { MongoDBCollectionResource } from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { handleError } from "../ErrorHandlingUtils";
+import { AuthType } from "../../AuthType";
 
 export async function readMongoDBCollectionThroughRP(
   databaseId: string,
@@ -13,9 +13,9 @@ export async function readMongoDBCollectionThroughRP(
     return undefined;
   }
   let collection: MongoDBCollectionResource;
-
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   const clearMessage = logConsoleProgress(`Reading container ${collectionId}`);
   try {

src/Common/dataAccess/readUserDefinedFunctions.ts

@@ -11,13 +11,12 @@ export async function readUserDefinedFunctions(
   collectionId: string
 ): Promise<(UserDefinedFunctionDefinition & Resource)[]> {
   const clearMessage = logConsoleProgress(`Querying user defined functions for container ${collectionId}`);
-  const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
   try {
-    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
       const rpResponse = await listSqlUserDefinedFunctions(
-        subscriptionId,
-        resourceGroup,
-        databaseAccount.name,
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
         databaseId,
         collectionId
       );

src/Common/dataAccess/updateCollection.ts

@@ -63,10 +63,12 @@ async function updateCollectionWithARM(
   collectionId: string,
   newCollection: Partial<Collection>
 ): Promise<Collection> {
-  const { subscriptionId, resourceGroup, apiType, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
+  const defaultExperience = userContext.apiType;
 
-  switch (apiType) {
+  switch (defaultExperience) {
     case "SQL":
       return updateSqlContainer(databaseId, collectionId, subscriptionId, resourceGroup, accountName, newCollection);
     case "Cassandra":
@@ -85,7 +87,7 @@ async function updateCollectionWithARM(
         newCollection
       );
     default:
-      throw new Error(`Unsupported default experience type: ${apiType}`);
+      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
   }
 }
 

src/Common/dataAccess/updateOffer.ts

@@ -144,8 +144,9 @@ const updateDatabaseOfferWithARM = async (params: UpdateOfferParams): Promise<Of
 };
 
 const updateSqlContainerOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateSqlContainerToAutoscale(
@@ -177,8 +178,9 @@ const updateSqlContainerOffer = async (params: UpdateOfferParams): Promise<void>
 };
 
 const updateMongoCollectionOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateMongoDBCollectionToAutoscale(
@@ -210,8 +212,9 @@ const updateMongoCollectionOffer = async (params: UpdateOfferParams): Promise<vo
 };
 
 const updateCassandraTableOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateCassandraTableToAutoscale(
@@ -243,8 +246,9 @@ const updateCassandraTableOffer = async (params: UpdateOfferParams): Promise<voi
 };
 
 const updateGremlinGraphOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateGremlinGraphToAutoscale(
@@ -276,8 +280,9 @@ const updateGremlinGraphOffer = async (params: UpdateOfferParams): Promise<void>
 };
 
 const updateTableOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateTableToAutoscale(subscriptionId, resourceGroup, accountName, params.collectionId);
@@ -290,8 +295,9 @@ const updateTableOffer = async (params: UpdateOfferParams): Promise<void> => {
 };
 
 const updateSqlDatabaseOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateSqlDatabaseToAutoscale(subscriptionId, resourceGroup, accountName, params.databaseId);
@@ -304,8 +310,9 @@ const updateSqlDatabaseOffer = async (params: UpdateOfferParams): Promise<void>
 };
 
 const updateMongoDatabaseOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateMongoDBDatabaseToAutoscale(subscriptionId, resourceGroup, accountName, params.databaseId);
@@ -318,8 +325,9 @@ const updateMongoDatabaseOffer = async (params: UpdateOfferParams): Promise<void
 };
 
 const updateCassandraKeyspaceOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateCassandraKeyspaceToAutoscale(subscriptionId, resourceGroup, accountName, params.databaseId);
@@ -332,8 +340,9 @@ const updateCassandraKeyspaceOffer = async (params: UpdateOfferParams): Promise<
 };
 
 const updateGremlinDatabaseOffer = async (params: UpdateOfferParams): Promise<void> => {
-  const { subscriptionId, resourceGroup, databaseAccount } = userContext;
-  const accountName = databaseAccount.name;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const accountName = userContext.databaseAccount.name;
 
   if (params.migrateToAutoPilot) {
     await migrateGremlinDatabaseToAutoscale(subscriptionId, resourceGroup, accountName, params.databaseId);

src/Common/dataAccess/updateStoredProcedure.ts

@@ -20,13 +20,11 @@ export async function updateStoredProcedure(
 ): Promise<StoredProcedureDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Updating stored procedure ${storedProcedure.id}`);
   try {
-    const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
-
-    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
       const getResponse = await getSqlStoredProcedure(
-        subscriptionId,
-        resourceGroup,
-        databaseAccount.name,
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
         databaseId,
         collectionId,
         storedProcedure.id
@@ -40,9 +38,9 @@ export async function updateStoredProcedure(
           },
         };
         const rpResponse = await createUpdateSqlStoredProcedure(
-          subscriptionId,
-          resourceGroup,
-          databaseAccount.name,
+          userContext.subscriptionId,
+          userContext.resourceGroup,
+          userContext.databaseAccount.name,
           databaseId,
           collectionId,
           storedProcedure.id,

src/Common/dataAccess/updateTrigger.ts

@@ -16,13 +16,12 @@ export async function updateTrigger(
   trigger: TriggerDefinition
 ): Promise<TriggerDefinition> {
   const clearMessage = logConsoleProgress(`Updating trigger ${trigger.id}`);
-  const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
   try {
-    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
       const getResponse = await getSqlTrigger(
-        subscriptionId,
-        resourceGroup,
-        databaseAccount.name,
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
         databaseId,
         collectionId,
         trigger.id
@@ -36,9 +35,9 @@ export async function updateTrigger(
           },
         };
         const rpResponse = await createUpdateSqlTrigger(
-          subscriptionId,
-          resourceGroup,
-          databaseAccount.name,
+          userContext.subscriptionId,
+          userContext.resourceGroup,
+          userContext.databaseAccount.name,
           databaseId,
           collectionId,
           trigger.id,

src/Common/dataAccess/updateUserDefinedFunction.ts

@@ -19,13 +19,12 @@ export async function updateUserDefinedFunction(
   userDefinedFunction: UserDefinedFunctionDefinition
 ): Promise<UserDefinedFunctionDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Updating user defined function ${userDefinedFunction.id}`);
-  const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
   try {
-    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
       const getResponse = await getSqlUserDefinedFunction(
-        subscriptionId,
-        resourceGroup,
-        databaseAccount.name,
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
         databaseId,
         collectionId,
         userDefinedFunction.id
@@ -39,9 +38,9 @@ export async function updateUserDefinedFunction(
           },
         };
         const rpResponse = await createUpdateSqlUserDefinedFunction(
-          subscriptionId,
-          resourceGroup,
-          databaseAccount.name,
+          userContext.subscriptionId,
+          userContext.resourceGroup,
+          userContext.databaseAccount.name,
           databaseId,
           collectionId,
           userDefinedFunction.id,

src/Contracts/DataModels.ts

@@ -4,6 +4,7 @@ export interface DatabaseAccount {
   location: string;
   type: string;
   kind: string;
+  tags: any;
   properties: DatabaseAccountExtendedProperties;
 }
 

src/Explorer/ComponentRegisterer.ts

@@ -25,3 +25,4 @@ ko.components.register("graph-styling-pane", new PaneComponents.GraphStylingPane
 ko.components.register("table-add-entity-pane", new PaneComponents.TableAddEntityPaneComponent());
 ko.components.register("table-edit-entity-pane", new PaneComponents.TableEditEntityPaneComponent());
 ko.components.register("cassandra-add-collection-pane", new PaneComponents.CassandraAddCollectionPaneComponent());
+ko.components.register("github-repos-pane", new PaneComponents.GitHubReposPaneComponent());

src/Explorer/ContextMenuButtonFactory.ts

@@ -29,11 +29,11 @@ export interface DatabaseContextMenuButtonParams {
  * New resource tree (in ReactJS)
  */
 export class ResourceTreeContextMenuButtonFactory {
-  public static createDatabaseContextMenu(container: Explorer, databaseId: string): TreeNodeMenuItem[] {
+  public static createDatabaseContextMenu(container: Explorer): TreeNodeMenuItem[] {
     const items: TreeNodeMenuItem[] = [
       {
         iconSrc: AddCollectionIcon,
-        onClick: () => container.onNewCollectionClicked(databaseId),
+        onClick: () => container.onNewCollectionClicked(),
         label: container.addCollectionText(),
       },
     ];

src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx

@@ -1,8 +1,9 @@
-import { DefaultButton, IButtonStyles, IContextualMenuItem, IContextualMenuProps } from "@fluentui/react";
 import * as React from "react";
-import { getErrorMessage } from "../../../Common/ErrorHandlingUtils";
-import * as Logger from "../../../Common/Logger";
 import { ArcadiaWorkspace, SparkPool } from "../../../Contracts/DataModels";
+import { DefaultButton, IButtonStyles } from "office-ui-fabric-react/lib/Button";
+import { IContextualMenuItem, IContextualMenuProps } from "office-ui-fabric-react/lib/ContextualMenu";
+import * as Logger from "../../../Common/Logger";
+import { getErrorMessage } from "../../../Common/ErrorHandlingUtils";
 
 export interface ArcadiaMenuPickerProps {
   selectText?: string;

src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx

@@ -1,11 +1,10 @@
-import { Icon, Label, Stack } from "@fluentui/react";
+import { Icon, Label, Stack } from "office-ui-fabric-react";
 import * as React from "react";
 import { accordionStackTokens } from "../Settings/SettingsRenderUtils";
 
 export interface CollapsibleSectionProps {
   title: string;
   isExpandedByDefault: boolean;
-  onExpand?: () => void;
 }
 
 export interface CollapsibleSectionState {
@@ -24,12 +23,6 @@ export class CollapsibleSectionComponent extends React.Component<CollapsibleSect
     this.setState({ isExpanded: !this.state.isExpanded });
   };
 
-  public componentDidUpdate(): void {
-    if (this.state.isExpanded && this.props.onExpand) {
-      this.props.onExpand();
-    }
-  }
-
   public render(): JSX.Element {
     return (
       <>

src/Explorer/Controls/Dialog.tsx

@@ -1,20 +1,14 @@
 import {
   ChoiceGroup,
-  DefaultButton,
-  Dialog as FluentDialog,
-  DialogFooter,
-  DialogType,
   FontIcon,
-  IButtonProps,
   IChoiceGroupProps,
-  IDialogProps,
   IProgressIndicatorProps,
-  ITextFieldProps,
-  Link,
-  PrimaryButton,
   ProgressIndicator,
-  TextField,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
+import { DefaultButton, IButtonProps, PrimaryButton } from "office-ui-fabric-react/lib/Button";
+import { Dialog as FluentDialog, DialogFooter, DialogType, IDialogProps } from "office-ui-fabric-react/lib/Dialog";
+import { Link } from "office-ui-fabric-react/lib/Link";
+import { ITextFieldProps, TextField } from "office-ui-fabric-react/lib/TextField";
 import React, { FunctionComponent } from "react";
 
 export interface TextFieldProps extends ITextFieldProps {

src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.tsx

@@ -2,9 +2,9 @@
  * React component for Switch Directory
  */
 
-import { Dropdown, IDropdownOption, IDropdownProps } from "@fluentui/react";
-import * as React from "react";
 import _ from "underscore";
+import * as React from "react";
+import { Dropdown, IDropdownOption, IDropdownProps } from "office-ui-fabric-react/lib/Dropdown";
 import { Tenant } from "../../../Contracts/DataModels";
 
 export interface DefaultDirectoryDropdownProps {

src/Explorer/Controls/Directory/DirectoryListComponent.tsx

@@ -1,15 +1,11 @@
-import {
-  DefaultButton,
-  IButtonProps,
-  ITextFieldProps,
-  List,
-  ScrollablePane,
-  Sticky,
-  StickyPositionType,
-  TextField,
-} from "@fluentui/react";
-import * as React from "react";
 import _ from "underscore";
+import * as React from "react";
+
+import { DefaultButton, IButtonProps } from "office-ui-fabric-react/lib/Button";
+import { List } from "office-ui-fabric-react/lib/List";
+import { ScrollablePane } from "office-ui-fabric-react/lib/ScrollablePane";
+import { Sticky, StickyPositionType } from "office-ui-fabric-react/lib/Sticky";
+import { TextField, ITextFieldProps } from "office-ui-fabric-react/lib/TextField";
 import { Tenant } from "../../../Contracts/DataModels";
 
 export interface DirectoryListProps {

src/Explorer/Controls/Directory/__snapshots__/DefaultDirectoryDropdownComponent.test.tsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`test render renders with directories and default 1`] = `
-<Dropdown
+<StyledWithResponsiveMode
   className="defaultDirectoryDropdown"
   defaultSelectedKey="asdfghjklzxcvbnm9876543210"
   label="Set your default directory"
@@ -26,7 +26,7 @@ exports[`test render renders with directories and default 1`] = `
 `;
 
 exports[`test render renders with directories and last visit default 1`] = `
-<Dropdown
+<StyledWithResponsiveMode
   className="defaultDirectoryDropdown"
   defaultSelectedKey="lastVisited"
   label="Set your default directory"
@@ -51,7 +51,7 @@ exports[`test render renders with directories and last visit default 1`] = `
 `;
 
 exports[`test render renders with directories but no default 1`] = `
-<Dropdown
+<StyledWithResponsiveMode
   className="defaultDirectoryDropdown"
   defaultSelectedKey="lastVisited"
   label="Set your default directory"
@@ -76,7 +76,7 @@ exports[`test render renders with directories but no default 1`] = `
 `;
 
 exports[`test render renders with no directories 1`] = `
-<Dropdown
+<StyledWithResponsiveMode
   className="defaultDirectoryDropdown"
   defaultSelectedKey="lastVisited"
   label="Set your default directory"

src/Explorer/Controls/Directory/__snapshots__/DirectoryListComponent.test.tsx.snap

@@ -350,11 +350,11 @@ exports[`test render renders with filters 1`] = `
       }
     >
       <div
-        className="ms-ScrollablePane root-53"
+        className="ms-ScrollablePane root-40"
         data-is-scrollable="true"
       >
         <div
-          className="stickyAbove-55"
+          className="stickyAbove-42"
           style={
             Object {
               "height": 0,
@@ -365,7 +365,7 @@ exports[`test render renders with filters 1`] = `
           }
         />
         <div
-          className="ms-ScrollablePane--contentContainer contentContainer-54"
+          className="ms-ScrollablePane--contentContainer contentContainer-41"
           data-is-scrollable={true}
         >
           <Sticky
@@ -408,6 +408,7 @@ exports[`test render renders with filters 1`] = `
                   >
                     <TextFieldBase
                       ariaLabel="Directory filter text box"
+                      canRevealPassword={false}
                       className="directoryListFilterTextBox"
                       deferredValidationTime={200}
                       onChange={[Function]}
@@ -690,18 +691,18 @@ exports[`test render renders with filters 1`] = `
                       validateOnLoad={true}
                     >
                       <div
-                        className="ms-TextField directoryListFilterTextBox root-59"
+                        className="ms-TextField directoryListFilterTextBox root-46"
                       >
                         <div
                           className="ms-TextField-wrapper"
                         >
                           <div
-                            className="ms-TextField-fieldGroup fieldGroup-60"
+                            className="ms-TextField-fieldGroup fieldGroup-47"
                           >
                             <input
                               aria-invalid={false}
                               aria-label="Directory filter text box"
-                              className="ms-TextField-field field-61"
+                              className="ms-TextField-field field-48"
                               id="TextField0"
                               onBlur={[Function]}
                               onChange={[Function]}
@@ -1265,6 +1266,7 @@ exports[`test render renders with filters 1`] = `
                                   "borderColor": "#f3f2f1",
                                   "color": "#a19f9d",
                                   "cursor": "default",
+                                  "pointerEvents": "none",
                                   "selectors": Object {
                                     ":focus": Object {
                                       "outline": 0,
@@ -1609,35 +1611,6 @@ exports[`test render renders with filters 1`] = `
                                   },
                                 },
                               },
-                              "splitButtonMenuFocused": Object {
-                                "outline": "transparent",
-                                "position": "relative",
-                                "selectors": Object {
-                                  ".ms-Fabric--isFocusVisible &:focus:after": Object {
-                                    "border": "1px solid #ffffff",
-                                    "bottom": 3,
-                                    "content": "\\"\\"",
-                                    "left": 3,
-                                    "outline": "1px solid #605e5c",
-                                    "position": "absolute",
-                                    "right": 3,
-                                    "selectors": Object {
-                                      "@media screen and (-ms-high-contrast: active), (forced-colors: active)": Object {
-                                        "border": "none",
-                                        "bottom": -2,
-                                        "left": -2,
-                                        "right": -2,
-                                        "top": -2,
-                                      },
-                                    },
-                                    "top": 3,
-                                    "zIndex": 1,
-                                  },
-                                  "::-moz-focus-inner": Object {
-                                    "border": "0",
-                                  },
-                                },
-                              },
                               "splitButtonMenuIcon": Object {
                                 "color": "#323130",
                               },
@@ -1927,7 +1900,7 @@ exports[`test render renders with filters 1`] = `
                         >
                           <button
                             aria-disabled={true}
-                            className="ms-Button ms-Button--default is-disabled directoryListButton root-70"
+                            className="ms-Button ms-Button--default is-disabled directoryListButton root-57"
                             data-is-focusable={false}
                             disabled={true}
                             onClick={[Function]}
@@ -1939,7 +1912,7 @@ exports[`test render renders with filters 1`] = `
                             type="button"
                           >
                             <span
-                              className="ms-Button-flexContainer flexContainer-71"
+                              className="ms-Button-flexContainer flexContainer-58"
                               data-automationid="splitbuttonprimary"
                             >
                               <div
@@ -1970,7 +1943,7 @@ exports[`test render renders with filters 1`] = `
           </List>
         </div>
         <div
-          className="stickyBelow-56"
+          className="stickyBelow-43"
           style={
             Object {
               "bottom": "0px",
@@ -1981,7 +1954,7 @@ exports[`test render renders with filters 1`] = `
           }
         >
           <div
-            className="stickyBelowItems-57"
+            className="stickyBelowItems-44"
           />
         </div>
       </div>

src/Explorer/Controls/FeaturePanel/FeaturePanelComponent.tsx

@@ -1,14 +1,9 @@
-import {
-  Checkbox,
-  DefaultButton,
-  Dropdown,
-  IDropdownOption,
-  IDropdownStyles,
-  ITextFieldStyles,
-  Stack,
-  TextField,
-} from "@fluentui/react";
 import * as React from "react";
+import { Stack } from "office-ui-fabric-react/lib/Stack";
+import { Dropdown, IDropdownOption, IDropdownStyles } from "office-ui-fabric-react/lib/Dropdown";
+import { Checkbox } from "office-ui-fabric-react/lib/Checkbox";
+import { TextField, ITextFieldStyles } from "office-ui-fabric-react/lib/TextField";
+import { DefaultButton } from "office-ui-fabric-react";
 import "./FeaturePanelComponent.less";
 
 export const FeaturePanelComponent: React.FunctionComponent = () => {

src/Explorer/Controls/FeaturePanel/FeaturePanelLauncher.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { FeaturePanelComponent } from "./FeaturePanelComponent";
-import { getTheme, mergeStyleSets, FontWeights, Modal, IconButton, IIconProps } from "@fluentui/react";
+import { getTheme, mergeStyleSets, FontWeights, Modal, IconButton, IIconProps } from "office-ui-fabric-react";
 import "./FeaturePanelLauncher.less";
 
 // Modal wrapper

src/Explorer/Controls/FeaturePanel/__snapshots__/FeaturePanelComponent.test.tsx.snap

@@ -57,7 +57,7 @@ exports[`Feature panel renders all flags 1`] = `
         }
       }
     >
-      <Dropdown
+      <StyledWithResponsiveMode
         label="Base Url"
         onChange={[Function]}
         options={
@@ -85,7 +85,7 @@ exports[`Feature panel renders all flags 1`] = `
           }
         }
       />
-      <Dropdown
+      <StyledWithResponsiveMode
         label="Platform"
         onChange={[Function]}
         options={

src/Explorer/Controls/GitHub/AddRepoComponent.tsx

@@ -1,4 +1,4 @@
-import { DefaultButton, IButtonProps, ITextFieldProps, TextField } from "@fluentui/react";
+import { DefaultButton, IButtonProps, ITextFieldProps, TextField } from "office-ui-fabric-react";
 import * as React from "react";
 import * as Constants from "../../../Common/Constants";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";

src/Explorer/Controls/GitHub/AuthorizeAccessComponent.tsx

@@ -1,4 +1,10 @@
-import { ChoiceGroup, IButtonProps, IChoiceGroupProps, PrimaryButton, IChoiceGroupOption } from "@fluentui/react";
+import {
+  ChoiceGroup,
+  IButtonProps,
+  IChoiceGroupProps,
+  PrimaryButton,
+  IChoiceGroupOption,
+} from "office-ui-fabric-react";
 import * as React from "react";
 import { ChildrenMargin } from "./GitHubStyleConstants";
 

src/Explorer/Controls/GitHub/GitHubReposComponent.tsx

@@ -1,4 +1,4 @@
-import { DefaultButton, IButtonProps, Link, PrimaryButton } from "@fluentui/react";
+import { DefaultButton, IButtonProps, Link, PrimaryButton } from "office-ui-fabric-react";
 import * as React from "react";
 import { IGitHubBranch, IGitHubRepo } from "../../../GitHub/GitHubClient";
 import { AddRepoComponent, AddRepoComponentProps } from "./AddRepoComponent";
@@ -23,6 +23,8 @@ export interface RepoListItem {
 }
 
 export class GitHubReposComponent extends React.Component<GitHubReposComponentProps> {
+  public static readonly ConnectToGitHubTitle = "Connect to GitHub";
+  public static readonly ManageGitHubRepoTitle = "Manage GitHub settings";
   private static readonly ManageGitHubRepoDescription =
     "Select your GitHub repos and branch(es) to pin to your notebooks workspace.";
   private static readonly ManageGitHubRepoResetConnection = "View or change your GitHub authorization settings.";
@@ -30,6 +32,14 @@ export class GitHubReposComponent extends React.Component<GitHubReposComponentPr
   private static readonly CancelButtonText = "Cancel";
 
   public render(): JSX.Element {
+    const header: JSX.Element = (
+      <p>
+        {this.props.showAuthorizeAccess
+          ? GitHubReposComponent.ConnectToGitHubTitle
+          : GitHubReposComponent.ManageGitHubRepoTitle}
+      </p>
+    );
+
     const content: JSX.Element = this.props.showAuthorizeAccess ? (
       <AuthorizeAccessComponent {...this.props.authorizeAccessProps} />
     ) : (
@@ -56,6 +66,9 @@ export class GitHubReposComponent extends React.Component<GitHubReposComponentPr
 
     return (
       <>
+        <div className={"firstdivbg headerline"} role="heading" aria-level={2}>
+          {header}
+        </div>
         <div className={"paneMainContent"}>{content}</div>
         {!this.props.showAuthorizeAccess && (
           <>

src/Explorer/Controls/GitHub/GitHubStyleConstants.ts

@@ -1,21 +1,19 @@
 import {
+  IStyleFunctionOrObject,
   ICheckboxStyleProps,
   ICheckboxStyles,
-  IDropdownStyleProps,
   IDropdownStyles,
-  IStyleFunctionOrObject,
-} from "@fluentui/react";
+  IDropdownStyleProps,
+} from "office-ui-fabric-react";
 
 export const ButtonsFooterStyle: React.CSSProperties = {
-  paddingTop: 14,
+  padding: 14,
   height: "auto",
-  borderTop: "2px solid lightGray",
 };
 
 export const ContentFooterStyle: React.CSSProperties = {
-  paddingTop: "10px",
+  padding: "10px 24px 10px 24px",
   height: "auto",
-  borderTop: "2px solid lightGray",
 };
 
 export const ChildrenMargin = 10;
@@ -55,11 +53,6 @@ export const BranchesDropdownOptionContainerStyle: React.CSSProperties = {
   padding: 8,
 };
 
-export const ContentMainStyle: React.CSSProperties = {
-  display: "flex",
-  flexDirection: "column",
-};
-
 export const ReposListRepoColumnMinWidth = 192;
 export const ReposListBranchesColumnWidth = 116;
 export const BranchesDropdownWidth = 200;

src/Explorer/Controls/GitHub/ReposListComponent.tsx

@@ -16,7 +16,7 @@ import {
   ResponsiveMode,
   SelectionMode,
   Text,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import * as React from "react";
 import { IGitHubBranch, IGitHubPageInfo } from "../../../GitHub/GitHubClient";
 import * as GitHubUtils from "../../../Utils/GitHubUtils";

src/Explorer/Controls/Header/GalleryHeaderComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Stack, Text, Separator, FontIcon, CommandButton, FontWeights, ITextProps } from "@fluentui/react";
+import { Stack, Text, Separator, FontIcon, CommandButton, FontWeights, ITextProps } from "office-ui-fabric-react";
 
 export class GalleryHeaderComponent extends React.Component {
   private static readonly azureText = "Microsoft Azure";

src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx

@@ -13,6 +13,7 @@ const createTestDatabaseAccount = (): DataModels.DatabaseAccount => {
       gremlinEndpoint: null,
       tableEndpoint: null,
     },
+    tags: "testTags",
     type: "testType",
   };
 };
@@ -29,6 +30,7 @@ const createTestMongo32DatabaseAccount = (): DataModels.DatabaseAccount => {
       gremlinEndpoint: null,
       tableEndpoint: null,
     },
+    tags: "testTags",
     type: "testType",
   };
 };
@@ -46,6 +48,7 @@ const createTestMongo36DatabaseAccount = (): DataModels.DatabaseAccount => {
       tableEndpoint: null,
       mongoEndpoint: "https://testMongoEndpoint.azure.com/",
     },
+    tags: "testTags",
     type: "testType",
   };
 };
@@ -62,6 +65,7 @@ const createTestCassandraDatabaseAccount = (): DataModels.DatabaseAccount => {
       gremlinEndpoint: null,
       tableEndpoint: null,
     },
+    tags: "testTags",
     type: "testType",
   };
 };

src/Explorer/Controls/NotebookGallery/Cards/GalleryCardComponent.tsx

@@ -1,3 +1,4 @@
+import { Card } from "@uifabric/react-cards";
 import {
   BaseButton,
   Button,
@@ -7,14 +8,14 @@ import {
   Image,
   ImageFit,
   Link,
+  LinkBase,
   Persona,
   Separator,
   Spinner,
   SpinnerSize,
   Text,
   TooltipHost,
-} from "@fluentui/react";
-import { Card } from "@uifabric/react-cards";
+} from "office-ui-fabric-react";
 import React, { FunctionComponent, useState } from "react";
 import CosmosDBLogo from "../../../../../images/CosmosDB-logo.svg";
 import { IGalleryItem } from "../../../../Juno/JunoClient";
@@ -109,7 +110,7 @@ export const GalleryCardComponent: FunctionComponent<GalleryCardComponentProps>
 
   const handlerOnClick = (
     event:
-      | React.MouseEvent<HTMLElement | HTMLAnchorElement | HTMLButtonElement | MouseEvent>
+      | React.MouseEvent<HTMLElement | HTMLAnchorElement | HTMLButtonElement | LinkBase, MouseEvent>
       | React.MouseEvent<
           HTMLAnchorElement | HTMLButtonElement | HTMLDivElement | BaseButton | Button | HTMLSpanElement,
           MouseEvent

src/Explorer/Controls/NotebookGallery/Cards/__snapshots__/GalleryCardComponent.test.tsx.snap

@@ -31,7 +31,7 @@ exports[`GalleryCardComponent renders 1`] = `
     />
   </CardItem>
   <CardItem>
-    <Image
+    <StyledImageBase
       alt="name cover image"
       height={144}
       imageFit={2}

src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx

@@ -1,123 +0,0 @@
-import * as React from "react";
-import { JunoClient } from "../../../Juno/JunoClient";
-import { HttpStatusCodes, CodeOfConductEndpoints } from "../../../Common/Constants";
-import { Stack, Text, Checkbox, PrimaryButton, Link } from "@fluentui/react";
-import { getErrorMessage, getErrorStack, handleError } from "../../../Common/ErrorHandlingUtils";
-import { trace, traceFailure, traceStart, traceSuccess } from "../../../Shared/Telemetry/TelemetryProcessor";
-import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
-
-export interface CodeOfConductComponentProps {
-  junoClient: JunoClient;
-  onAcceptCodeOfConduct: (result: boolean) => void;
-}
-
-interface CodeOfConductComponentState {
-  readCodeOfConduct: boolean;
-}
-
-export class CodeOfConductComponent extends React.Component<CodeOfConductComponentProps, CodeOfConductComponentState> {
-  private viewCodeOfConductTraced: boolean;
-  private descriptionPara1: string;
-  private descriptionPara2: string;
-  private descriptionPara3: string;
-  private link1: { label: string; url: string };
-
-  constructor(props: CodeOfConductComponentProps) {
-    super(props);
-
-    this.state = {
-      readCodeOfConduct: false,
-    };
-
-    this.descriptionPara1 = "Azure Cosmos DB Notebook Gallery - Code of Conduct";
-    this.descriptionPara2 = "The notebook public gallery contains notebook samples shared by users of Azure Cosmos DB.";
-    this.descriptionPara3 = "In order to view and publish your samples to the gallery, you must accept the ";
-    this.link1 = { label: "code of conduct.", url: CodeOfConductEndpoints.codeOfConduct };
-  }
-
-  private async acceptCodeOfConduct(): Promise<void> {
-    const startKey = traceStart(Action.NotebooksGalleryAcceptCodeOfConduct);
-
-    try {
-      const response = await this.props.junoClient.acceptCodeOfConduct();
-      if (response.status !== HttpStatusCodes.OK && response.status !== HttpStatusCodes.NoContent) {
-        throw new Error(`Received HTTP ${response.status} when accepting code of conduct`);
-      }
-
-      traceSuccess(Action.NotebooksGalleryAcceptCodeOfConduct, {}, startKey);
-
-      this.props.onAcceptCodeOfConduct(response.data);
-    } catch (error) {
-      traceFailure(
-        Action.NotebooksGalleryAcceptCodeOfConduct,
-        {
-          error: getErrorMessage(error),
-          errorStack: getErrorStack(error),
-        },
-        startKey
-      );
-
-      handleError(error, "CodeOfConductComponent/acceptCodeOfConduct", "Failed to accept code of conduct");
-    }
-  }
-
-  private onChangeCheckbox = (): void => {
-    this.setState({ readCodeOfConduct: !this.state.readCodeOfConduct });
-  };
-
-  public render(): JSX.Element {
-    if (!this.viewCodeOfConductTraced) {
-      this.viewCodeOfConductTraced = true;
-      trace(Action.NotebooksGalleryViewCodeOfConduct);
-    }
-
-    return (
-      <Stack tokens={{ childrenGap: 20 }}>
-        <Stack.Item>
-          <Text style={{ fontWeight: 500, fontSize: "20px" }}>{this.descriptionPara1}</Text>
-        </Stack.Item>
-
-        <Stack.Item>
-          <Text>{this.descriptionPara2}</Text>
-        </Stack.Item>
-
-        <Stack.Item>
-          <Text>
-            {this.descriptionPara3}
-            <Link href={this.link1.url} target="_blank">
-              {this.link1.label}
-            </Link>
-          </Text>
-        </Stack.Item>
-
-        <Stack.Item>
-          <Checkbox
-            styles={{
-              label: {
-                margin: 0,
-                padding: "2 0 2 0",
-              },
-              text: {
-                fontSize: 12,
-              },
-            }}
-            label="I have read and accept the code of conduct."
-            onChange={this.onChangeCheckbox}
-          />
-        </Stack.Item>
-
-        <Stack.Item>
-          <PrimaryButton
-            ariaLabel="Continue"
-            title="Continue"
-            onClick={async () => await this.acceptCodeOfConduct()}
-            tabIndex={0}
-            className="genericPaneSubmitBtn"
-            text="Continue"
-            disabled={!this.state.readCodeOfConduct}
-          />
-        </Stack.Item>
-      </Stack>
-    );
-  }
-}

src/Explorer/Controls/NotebookGallery/CodeOfConductComponent/index.test.tsx

@@ -9,7 +9,7 @@ describe("CodeOfConductComponent", () => {
   let codeOfConductProps: CodeOfConductComponentProps;
 
   beforeEach(() => {
-    const junoClient = new JunoClient();
+    const junoClient = new JunoClient(undefined);
     junoClient.acceptCodeOfConduct = jest.fn().mockReturnValue({
       status: HttpStatusCodes.OK,
       data: true,

src/Explorer/Controls/NotebookGallery/CodeOfConductComponent/index.tsx

@@ -1,4 +1,4 @@
-import { Checkbox, Link, PrimaryButton, Stack, Text } from "@fluentui/react";
+import { Checkbox, Link, PrimaryButton, Stack, Text } from "office-ui-fabric-react";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import { CodeOfConductEndpoints, HttpStatusCodes } from "../../../../Common/Constants";
 import { getErrorMessage, getErrorStack, handleError } from "../../../../Common/ErrorHandlingUtils";

src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.tsx

@@ -19,7 +19,7 @@ import {
   SpinnerSize,
   Stack,
   Text,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import * as React from "react";
 import { HttpStatusCodes } from "../../../Common/Constants";
 import { handleError } from "../../../Common/ErrorHandlingUtils";

src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Icon, Label, Stack, HoverCard, HoverCardType, Link } from "@fluentui/react";
+import { Icon, Label, Stack, HoverCard, HoverCardType, Link } from "office-ui-fabric-react";
 import { CodeOfConductEndpoints } from "../../../../Common/Constants";
 import "./InfoComponent.less";
 

src/Explorer/Controls/NotebookGallery/__snapshots__/GalleryViewerComponent.test.tsx.snap

@@ -4,7 +4,7 @@ exports[`GalleryViewerComponent renders 1`] = `
 <div
   className="galleryContainer"
 >
-  <StyledPivot
+  <StyledPivotBase
     onLinkClick={[Function]}
     selectedKey="OfficialSamples"
   >
@@ -41,7 +41,7 @@ exports[`GalleryViewerComponent renders 1`] = `
             <StackItem
               grow={true}
             >
-              <StyledSearchBox
+              <StyledSearchBoxBase
                 onChange={[Function]}
                 placeholder="Search"
               />
@@ -60,7 +60,7 @@ exports[`GalleryViewerComponent renders 1`] = `
                 }
               }
             >
-              <Dropdown
+              <StyledWithResponsiveMode
                 onChange={[Function]}
                 options={
                   Array [
@@ -127,7 +127,7 @@ exports[`GalleryViewerComponent renders 1`] = `
           <StackItem
             grow={true}
           >
-            <StyledSearchBox
+            <StyledSearchBoxBase
               onChange={[Function]}
               placeholder="Search"
             />
@@ -146,7 +146,7 @@ exports[`GalleryViewerComponent renders 1`] = `
               }
             }
           >
-            <Dropdown
+            <StyledWithResponsiveMode
               onChange={[Function]}
               options={
                 Array [
@@ -182,6 +182,6 @@ exports[`GalleryViewerComponent renders 1`] = `
         </StackItem>
       </Stack>
     </PivotItem>
-  </StyledPivot>
+  </StyledPivotBase>
 </div>
 `;

src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.tsx

@@ -1,7 +1,17 @@
 /**
  * Wrapper around Notebook metadata
  */
-import { FontWeights, Icon, IconButton, Link, Persona, PersonaSize, PrimaryButton, Stack, Text } from "@fluentui/react";
+import {
+  FontWeights,
+  Icon,
+  IconButton,
+  Link,
+  Persona,
+  PersonaSize,
+  PrimaryButton,
+  Stack,
+  Text,
+} from "office-ui-fabric-react";
 import * as React from "react";
 import { IGalleryItem } from "../../../Juno/JunoClient";
 import * as FileSystemUtil from "../../Notebook/FileSystemUtil";

src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx

@@ -3,7 +3,7 @@
  */
 import { Notebook } from "@nteract/commutable";
 import { createContentRef } from "@nteract/core";
-import { IChoiceGroupProps, Icon, IProgressIndicatorProps, Link, ProgressIndicator } from "@fluentui/react";
+import { IChoiceGroupProps, Icon, IProgressIndicatorProps, Link, ProgressIndicator } from "office-ui-fabric-react";
 import * as React from "react";
 import { contents } from "rx-jupyter";
 import { IGalleryItem, JunoClient } from "../../../Juno/JunoClient";

src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx

@@ -1,24 +1,22 @@
+import { IButtonProps, IconButton } from "office-ui-fabric-react/lib/Button";
+import { ContextualMenu, IContextualMenuProps } from "office-ui-fabric-react/lib/ContextualMenu";
 import {
-  ContextualMenu,
   DetailsList,
   DetailsListLayoutMode,
   DetailsRow,
-  FocusZone,
-  IButtonProps,
   IColumn,
-  IconButton,
-  IContextualMenuProps,
   IDetailsListProps,
   IDetailsRowProps,
+} from "office-ui-fabric-react/lib/DetailsList";
+import { FocusZone } from "office-ui-fabric-react/lib/FocusZone";
+import { ITextField, ITextFieldProps, TextField } from "office-ui-fabric-react/lib/TextField";
+import {
   IObjectWithKey,
   ISelectionZoneProps,
-  ITextField,
-  ITextFieldProps,
   Selection,
   SelectionMode,
   SelectionZone,
-  TextField,
-} from "@fluentui/react";
+} from "office-ui-fabric-react/lib/utilities/selection/index";
 import * as React from "react";
 import * as _ from "underscore";
 import SaveQueryBannerIcon from "../../../../images/save_query_banner.png";

src/Explorer/Controls/RadioSwitchComponent/RadioSwitchComponent.tsx

@@ -2,10 +2,10 @@
  * Horizontal switch component
  */
 
-import { Icon } from "@fluentui/react";
 import * as React from "react";
-import { NormalizedEventKey } from "../../../Common/Constants";
 import "./RadioSwitchComponent.less";
+import { Icon } from "office-ui-fabric-react/lib/Icon";
+import { NormalizedEventKey } from "../../../Common/Constants";
 
 export interface Choice {
   key: string;

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

@@ -154,20 +154,19 @@ describe("SettingsComponent", () => {
     expect(settingsComponentInstance.hasConflictResolution()).toEqual(undefined);
 
     const newContainer = new Explorer();
-    updateUserContext({
-      databaseAccount: {
-        id: undefined,
-        name: undefined,
-        location: undefined,
-        type: undefined,
-        kind: undefined,
-        properties: {
-          documentEndpoint: undefined,
-          tableEndpoint: undefined,
-          gremlinEndpoint: undefined,
-          cassandraEndpoint: undefined,
-          enableMultipleWriteLocations: true,
-        },
+    newContainer.databaseAccount = ko.observable({
+      id: undefined,
+      name: undefined,
+      location: undefined,
+      type: undefined,
+      kind: undefined,
+      tags: undefined,
+      properties: {
+        documentEndpoint: undefined,
+        tableEndpoint: undefined,
+        gremlinEndpoint: undefined,
+        cassandraEndpoint: undefined,
+        enableMultipleWriteLocations: true,
       },
     });
     const newCollection = { ...collection };

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -1,4 +1,4 @@
-import { IPivotItemProps, IPivotProps, Pivot, PivotItem } from "@fluentui/react";
+import { IPivotItemProps, IPivotProps, Pivot, PivotItem } from "office-ui-fabric-react";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
 import SaveIcon from "../../../../images/save-cosmos.svg";
@@ -233,7 +233,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   }
 
   public loadMongoIndexes = async (): Promise<void> => {
-    if (userContext.apiType === "Mongo" && userContext?.databaseAccount) {
+    if (
+      userContext.apiType === "Mongo" &&
+      this.container.isEnableMongoCapabilityPresent() &&
+      this.container.databaseAccount()
+    ) {
       this.mongoDBCollectionResource = await readMongoDBCollectionThroughRP(
         this.collection.databaseId,
         this.collection.id()
@@ -296,7 +300,8 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     this.container && userContext.apiType === "Cassandra" && hasDatabaseSharedThroughput(this.collection);
 
   public hasConflictResolution = (): boolean =>
-    userContext?.databaseAccount?.properties?.enableMultipleWriteLocations &&
+    this.container?.databaseAccount &&
+    this.container.databaseAccount()?.properties?.enableMultipleWriteLocations &&
     this.collection.conflictResolutionPolicy &&
     !!this.collection.conflictResolutionPolicy();
 
@@ -871,7 +876,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     mongoIndexingPolicyComponentProps: MongoIndexingPolicyComponentProps
   ): JSX.Element => {
     if (userContext.authType === AuthType.AAD) {
-      if (userContext.apiType === "Mongo") {
+      if (this.container.isEnableMongoCapabilityPresent()) {
         return <MongoIndexingPolicyComponent {...mongoIndexingPolicyComponentProps} />;
       }
       return undefined;

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

@@ -1,6 +1,6 @@
 import { shallow } from "enzyme";
 import React from "react";
-import { IColumn, Text } from "@fluentui/react";
+import { IColumn, Text } from "office-ui-fabric-react";
 import {
   getAutoPilotV3SpendElement,
   getEstimatedSpendingElement,

src/Explorer/Controls/Settings/SettingsRenderUtils.tsx

@@ -38,7 +38,7 @@ import {
   IDetailsRowProps,
   DetailsRow,
   IDetailsColumnStyles,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import { isDirtyTypes, isDirty } from "./SettingsUtils";
 
 export interface EstimatedSpendingDisplayProps {

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

@@ -9,7 +9,7 @@ import {
   subComponentStackProps,
   getChoiceGroupStyles,
 } from "../SettingsRenderUtils";
-import { TextField, ITextFieldProps, Stack, IChoiceGroupOption, ChoiceGroup } from "@fluentui/react";
+import { TextField, ITextFieldProps, Stack, IChoiceGroupOption, ChoiceGroup } from "office-ui-fabric-react";
 import { ToolTipLabelComponent } from "./ToolTipLabelComponent";
 import { isDirty } from "../SettingsUtils";
 

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

@@ -1,8 +1,7 @@
-import { MessageBar, MessageBarType, Stack } from "@fluentui/react";
-import * as monaco from "monaco-editor";
+import { MessageBar, MessageBarType, Stack } from "office-ui-fabric-react";
 import * as React from "react";
 import * as DataModels from "../../../../Contracts/DataModels";
-import { loadMonaco } from "../../../LazyMonaco";
+import { loadMonaco, monaco } from "../../../LazyMonaco";
 import { indexingPolicynUnsavedWarningMessage, titleAndInputStackProps } from "../SettingsRenderUtils";
 import { isDirty, isIndexTransforming } from "../SettingsUtils";
 import { IndexingPolicyRefreshComponent } from "./IndexingPolicyRefresh/IndexingPolicyRefreshComponent";

src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { MessageBar, MessageBarType } from "@fluentui/react";
+import { MessageBar, MessageBarType } from "office-ui-fabric-react";
 import {
   mongoIndexTransformationRefreshingMessage,
   renderMongoIndexTransformationRefreshMessage,

src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/__snapshots__/IndexingPolicyRefreshComponent.test.tsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`IndexingPolicyRefreshComponent renders 1`] = `
-<StyledMessageBar
+<StyledMessageBarBase
   messageBarType={5}
 >
   <Text
@@ -20,5 +20,5 @@ exports[`IndexingPolicyRefreshComponent renders 1`] = `
       Refresh to check the progress.
     </StyledLinkBase>
   </Text>
-</StyledMessageBar>
+</StyledMessageBarBase>
 `;

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/AddMongoIndexComponent.tsx

@@ -8,7 +8,7 @@ import {
   Dropdown,
   IDropdownOption,
   ITextField,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import {
   addMongoIndexSubElementsTokens,
   mongoErrorMessageStyles,

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.tsx

@@ -12,7 +12,7 @@ import {
   Spinner,
   SpinnerSize,
   Separator,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import {
   addMongoIndexStackProps,
   customDetailsListStyles,

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/AddMongoIndexComponent.test.tsx.snap

@@ -30,7 +30,7 @@ exports[`AddMongoIndexComponent renders 1`] = `
       }
       value="sample_key"
     />
-    <Dropdown
+    <StyledWithResponsiveMode
       ariaLabel="Index Type 1"
       onChange={[Function]}
       options={
@@ -67,7 +67,7 @@ exports[`AddMongoIndexComponent renders 1`] = `
       onClick={[Function]}
     />
   </Stack>
-  <StyledMessageBar
+  <StyledMessageBarBase
     messageBarType={1}
     styles={
       Object {
@@ -78,6 +78,6 @@ exports[`AddMongoIndexComponent renders 1`] = `
     }
   >
     sample error
-  </StyledMessageBar>
+  </StyledMessageBarBase>
 </Stack>
 `;

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

@@ -1,15 +1,14 @@
 import { shallow } from "enzyme";
-import ko from "knockout";
 import React from "react";
+import { ScaleComponent, ScaleComponentProps } from "./ScaleComponent";
+import { container, collection } from "../TestUtils";
+import { ThroughputInputAutoPilotV3Component } from "./ThroughputInputComponents/ThroughputInputAutoPilotV3Component";
+import Explorer from "../../../Explorer";
 import * as Constants from "../../../../Common/Constants";
 import * as DataModels from "../../../../Contracts/DataModels";
-import * as SharedConstants from "../../../../Shared/Constants";
-import { updateUserContext } from "../../../../UserContext";
-import Explorer from "../../../Explorer";
 import { throughputUnit } from "../SettingsRenderUtils";
-import { collection, container } from "../TestUtils";
-import { ScaleComponent, ScaleComponentProps } from "./ScaleComponent";
-import { ThroughputInputAutoPilotV3Component } from "./ThroughputInputComponents/ThroughputInputAutoPilotV3Component";
+import * as SharedConstants from "../../../../Shared/Constants";
+import ko from "knockout";
 
 describe("ScaleComponent", () => {
   const nonNationalCloudContainer = new Explorer();
@@ -81,25 +80,25 @@ describe("ScaleComponent", () => {
 
   it("autoScale enabled", () => {
     const newContainer = new Explorer();
-    updateUserContext({
-      databaseAccount: {
-        id: undefined,
-        name: undefined,
-        location: undefined,
-        type: undefined,
-        kind: "documentdb",
-        properties: {
-          documentEndpoint: undefined,
-          tableEndpoint: undefined,
-          gremlinEndpoint: undefined,
-          cassandraEndpoint: undefined,
-          capabilities: [
-            {
-              name: Constants.CapabilityNames.EnableAutoScale.toLowerCase(),
-              description: undefined,
-            },
-          ],
-        },
+
+    newContainer.databaseAccount({
+      id: undefined,
+      name: undefined,
+      location: undefined,
+      type: undefined,
+      kind: "documentdb",
+      tags: undefined,
+      properties: {
+        documentEndpoint: undefined,
+        tableEndpoint: undefined,
+        gremlinEndpoint: undefined,
+        cassandraEndpoint: undefined,
+        capabilities: [
+          {
+            name: Constants.CapabilityNames.EnableAutoScale.toLowerCase(),
+            description: undefined,
+          },
+        ],
       },
     });
     const props = { ...baseProps, container: newContainer };

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

@@ -1,4 +1,4 @@
-import { Label, Link, MessageBar, MessageBarType, Stack, Text, TextField } from "@fluentui/react";
+import { Label, Link, MessageBar, MessageBarType, Stack, Text, TextField } from "office-ui-fabric-react";
 import * as React from "react";
 import * as Constants from "../../../../Common/Constants";
 import { configContext, Platform } from "../../../../ConfigContext";
@@ -54,7 +54,8 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
   }
 
   public isAutoScaleEnabled = (): boolean => {
-    const accountCapabilities: DataModels.Capability[] = userContext?.databaseAccount?.properties?.capabilities;
+    const accountCapabilities: DataModels.Capability[] = this.props.container?.databaseAccount()?.properties
+      ?.capabilities;
     const enableAutoScaleCapability =
       accountCapabilities &&
       accountCapabilities.find((capability: DataModels.Capability) => {
@@ -169,7 +170,7 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
 
   private getThroughputInputComponent = (): JSX.Element => (
     <ThroughputInputAutoPilotV3Component
-      databaseAccount={userContext?.databaseAccount}
+      databaseAccount={this.props.container.databaseAccount()}
       databaseName={this.databaseId}
       collectionName={this.collectionId}
       throughput={this.props.throughput}
@@ -198,7 +199,8 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
   );
 
   private isFreeTierAccount(): boolean {
-    return userContext?.databaseAccount?.properties?.enableFreeTier;
+    const databaseAccount = this.props.container?.databaseAccount();
+    return databaseAccount?.properties?.enableFreeTier;
   }
 
   private getFreeTierInfoMessage(): JSX.Element {

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

@@ -1,4 +1,13 @@
-import { ChoiceGroup, IChoiceGroupOption, Label, Link, MessageBar, Stack, Text, TextField } from "@fluentui/react";
+import {
+  ChoiceGroup,
+  IChoiceGroupOption,
+  Label,
+  Link,
+  MessageBar,
+  Stack,
+  Text,
+  TextField,
+} from "office-ui-fabric-react";
 import * as React from "react";
 import * as ViewModels from "../../../../Contracts/ViewModels";
 import { userContext } from "../../../../UserContext";

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx

@@ -10,7 +10,7 @@ import {
   Stack,
   Text,
   TextField,
-} from "@fluentui/react";
+} from "office-ui-fabric-react";
 import React from "react";
 import * as DataModels from "../../../../../Contracts/DataModels";
 import { SubscriptionType } from "../../../../../Contracts/SubscriptionType";

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/__snapshots__/ThroughputInputAutoPilotV3Component.test.tsx.snap

@@ -8,7 +8,7 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
     }
   }
 >
-  <StyledMessageBar
+  <StyledMessageBarBase
     messageBarIconProps={
       Object {
         "className": "messageBarWarningIcon",
@@ -27,7 +27,7 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
     >
       Your bill will be affected as you update your throughput settings. Please review the updated cost estimate below before saving your changes
     </Text>
-  </StyledMessageBar>
+  </StyledMessageBarBase>
   <Stack>
     <StyledLabelBase
       id="settingsV2RadioButtonLabelId"
@@ -49,7 +49,7 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledMessageBar
+    <StyledMessageBarBase
       messageBarIconProps={
         Object {
           "className": "messageBarInfoIcon",
@@ -86,8 +86,8 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
           Learn more
         </a>
       </Text>
-    </StyledMessageBar>
-    <StyledChoiceGroup
+    </StyledMessageBarBase>
+    <StyledChoiceGroupBase
       ariaLabelledBy="settingsV2RadioButtonLabelId"
       onChange={[Function]}
       options={
@@ -196,7 +196,7 @@ exports[`ThroughputInputAutoPilotV3Component spendAck checkbox visible 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       ariaLabelledBy="settingsV2RadioButtonLabelId"
       onChange={[Function]}
       options={
@@ -415,7 +415,7 @@ exports[`ThroughputInputAutoPilotV3Component spendAck checkbox visible 1`] = `
       </Text>
       <Text>
         <em>
-          This cost is an estimate and may vary based on the regions where your account is deployed and potential discounts applied to your account
+          *This cost is an estimate and may vary based on the regions where your account is deployed and potential discounts applied to your account
         </em>
       </Text>
     </Stack>
@@ -470,7 +470,7 @@ exports[`ThroughputInputAutoPilotV3Component throughput input visible 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       ariaLabelledBy="settingsV2RadioButtonLabelId"
       onChange={[Function]}
       options={
@@ -689,7 +689,7 @@ exports[`ThroughputInputAutoPilotV3Component throughput input visible 1`] = `
       </Text>
       <Text>
         <em>
-          This cost is an estimate and may vary based on the regions where your account is deployed and potential discounts applied to your account
+          *This cost is an estimate and may vary based on the regions where your account is deployed and potential discounts applied to your account
         </em>
       </Text>
     </Stack>

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Stack, Text, IIconStyles, Icon, TooltipHost, DirectionalHint } from "@fluentui/react";
+import { Stack, Text, IIconStyles, Icon, TooltipHost, DirectionalHint } from "office-ui-fabric-react";
 import { toolTipLabelStackTokens } from "../SettingsRenderUtils";
 
 export interface ToolTipLabelComponentProps {

src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/ConflictResolutionComponent.test.tsx.snap

@@ -8,7 +8,7 @@ exports[`ConflictResolutionComponent Path text field displayed 1`] = `
     }
   }
 >
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     label="Mode"
     onChange={[Function]}
     options={
@@ -80,7 +80,7 @@ exports[`ConflictResolutionComponent Sproc text field displayed 1`] = `
     }
   }
 >
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     label="Mode"
     onChange={[Function]}
     options={

src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/ScaleComponent.test.tsx.snap

@@ -8,7 +8,7 @@ exports[`ScaleComponent renders with correct initial notification 1`] = `
     }
   }
 >
-  <StyledMessageBar
+  <StyledMessageBarBase
     messageBarType={5}
   >
     <Text
@@ -26,7 +26,7 @@ exports[`ScaleComponent renders with correct initial notification 1`] = `
       Database: test, Container: test 
       , Current autoscale throughput: 100 - 1000 RU/s, Target autoscale throughput: 600 - 6000 RU/s
     </Text>
-  </StyledMessageBar>
+  </StyledMessageBarBase>
   <Stack
     tokens={
       Object {

src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap

@@ -15,7 +15,7 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="timeToLive"
       label="Time to Live"
       onChange={[Function]}
@@ -85,7 +85,7 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
       value="1000"
     />
   </Stack>
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     id="geoSpatialConfig"
     label="Geospatial Configuration"
     onChange={[Function]}
@@ -146,7 +146,7 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       aria-labelledby="settingsV2ChangeFeedLabelId"
       id="changeFeedPolicy"
       onChange={[Function]}
@@ -238,7 +238,7 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="timeToLive"
       label="Time to Live"
       onChange={[Function]}
@@ -308,7 +308,7 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
       value="1000"
     />
   </Stack>
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     id="geoSpatialConfig"
     label="Geospatial Configuration"
     onChange={[Function]}
@@ -355,7 +355,7 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="analyticalStorageTimeToLive"
       label="Analytical Storage Time to Live"
       onChange={[Function]}
@@ -422,7 +422,7 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       aria-labelledby="settingsV2ChangeFeedLabelId"
       id="changeFeedPolicy"
       onChange={[Function]}
@@ -514,7 +514,7 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="timeToLive"
       label="Time to Live"
       onChange={[Function]}
@@ -584,7 +584,7 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
       value="1000"
     />
   </Stack>
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     id="geoSpatialConfig"
     label="Geospatial Configuration"
     onChange={[Function]}
@@ -631,7 +631,7 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="analyticalStorageTimeToLive"
       label="Analytical Storage Time to Live"
       onChange={[Function]}
@@ -753,7 +753,7 @@ exports[`SubSettingsComponent renders 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="timeToLive"
       label="Time to Live"
       onChange={[Function]}
@@ -823,7 +823,7 @@ exports[`SubSettingsComponent renders 1`] = `
       value="1000"
     />
   </Stack>
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     id="geoSpatialConfig"
     label="Geospatial Configuration"
     onChange={[Function]}
@@ -870,7 +870,7 @@ exports[`SubSettingsComponent renders 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="analyticalStorageTimeToLive"
       label="Analytical Storage Time to Live"
       onChange={[Function]}
@@ -962,7 +962,7 @@ exports[`SubSettingsComponent renders 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       aria-labelledby="settingsV2ChangeFeedLabelId"
       id="changeFeedPolicy"
       onChange={[Function]}
@@ -1054,7 +1054,7 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="timeToLive"
       label="Time to Live"
       onChange={[Function]}
@@ -1099,7 +1099,7 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
       }
     />
   </Stack>
-  <StyledChoiceGroup
+  <StyledChoiceGroupBase
     id="geoSpatialConfig"
     label="Geospatial Configuration"
     onChange={[Function]}
@@ -1146,7 +1146,7 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
       }
     }
   >
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       id="analyticalStorageTimeToLive"
       label="Analytical Storage Time to Live"
       onChange={[Function]}
@@ -1238,7 +1238,7 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
         }
       />
     </StyledLabelBase>
-    <StyledChoiceGroup
+    <StyledChoiceGroupBase
       aria-labelledby="settingsV2ChangeFeedLabelId"
       id="changeFeedPolicy"
       onChange={[Function]}

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

@@ -150,7 +150,7 @@ exports[`SettingsUtils functions render 1`] = `
     </Text>
     <Text>
       <em>
-        This cost is an estimate and may vary based on the regions where your account is deployed and potential discounts applied to your account
+        *This cost is an estimate and may vary based on the regions where your account is deployed and potential discounts applied to your account
       </em>
     </Text>
   </Stack>
@@ -338,7 +338,7 @@ exports[`SettingsUtils functions render 1`] = `
     </StyledLinkBase>
     are only used for sorting query results. If you need to add a compound index, you can create one using the Mongo shell.
   </Text>
-  <StyledMessageBar
+  <StyledMessageBarBase
     messageBarType={1}
   >
     <Text>
@@ -350,7 +350,7 @@ exports[`SettingsUtils functions render 1`] = `
         azure portal.
       </StyledLinkBase>
     </Text>
-  </StyledMessageBar>
+  </StyledMessageBarBase>
   <Stack
     horizontal={true}
     tokens={

src/Explorer/Controls/SmartUi/SmartUiComponent.tsx

@@ -1,20 +1,12 @@
-import {
-  Dropdown,
-  IDropdownOption,
-  IStackTokens,
-  Label,
-  Link,
-  MessageBar,
-  MessageBarType,
-  Position,
-  Slider,
-  SpinButton,
-  Stack,
-  Text,
-  TextField,
-  Toggle,
-} from "@fluentui/react";
 import { TFunction } from "i18next";
+import { Label, Link, MessageBar, MessageBarType, Toggle } from "office-ui-fabric-react";
+import { Dropdown, IDropdownOption } from "office-ui-fabric-react/lib/Dropdown";
+import { Slider } from "office-ui-fabric-react/lib/Slider";
+import { SpinButton } from "office-ui-fabric-react/lib/SpinButton";
+import { IStackTokens, Stack } from "office-ui-fabric-react/lib/Stack";
+import { Text } from "office-ui-fabric-react/lib/Text";
+import { TextField } from "office-ui-fabric-react/lib/TextField";
+import { Position } from "office-ui-fabric-react/lib/utilities/positioning";
 import * as React from "react";
 import {
   ChoiceItem,

src/Explorer/Controls/SmartUi/__snapshots__/SmartUiComponent.test.tsx.snap

@@ -77,11 +77,22 @@ exports[`SmartUiComponent disable all inputs 1`] = `
                 }
               }
             >
-              <StyledSpinButton
+              <CustomizedSpinButton
                 aria-labelledby="throughput-label"
                 ariaLabel="Throughput (input)"
+                decrementButtonIcon={
+                  Object {
+                    "iconName": "ChevronDownSmall",
+                  }
+                }
                 disabled={true}
                 id="throughput-spinner-input"
+                incrementButtonIcon={
+                  Object {
+                    "iconName": "ChevronUpSmall",
+                  }
+                }
+                label=""
                 labelPosition={0}
                 max={500}
                 min={400}
@@ -158,12 +169,12 @@ exports[`SmartUiComponent disable all inputs 1`] = `
       }
     >
       <StackItem>
-        <StyledMessageBar
+        <StyledMessageBarBase
           messageBarType={1}
         >
           Error: 
           label, truelabel and falselabel are required for boolean input 'throughput3'
-        </StyledMessageBar>
+        </StyledMessageBarBase>
       </StackItem>
     </Stack>
   </div>
@@ -271,7 +282,7 @@ exports[`SmartUiComponent disable all inputs 1`] = `
                 label="Database"
               />
             </StyledLabelBase>
-            <Dropdown
+            <StyledWithResponsiveMode
               aria-labelledby="database-label"
               disabled={true}
               id="database-dropdown-input"
@@ -391,10 +402,22 @@ exports[`SmartUiComponent should render and honor input's hidden, disabled state
                 }
               }
             >
-              <StyledSpinButton
+              <CustomizedSpinButton
                 aria-labelledby="throughput-label"
                 ariaLabel="Throughput (input)"
+                decrementButtonIcon={
+                  Object {
+                    "iconName": "ChevronDownSmall",
+                  }
+                }
+                disabled={false}
                 id="throughput-spinner-input"
+                incrementButtonIcon={
+                  Object {
+                    "iconName": "ChevronUpSmall",
+                  }
+                }
+                label=""
                 labelPosition={0}
                 max={500}
                 min={400}
@@ -470,12 +493,12 @@ exports[`SmartUiComponent should render and honor input's hidden, disabled state
       }
     >
       <StackItem>
-        <StyledMessageBar
+        <StyledMessageBarBase
           messageBarType={1}
         >
           Error: 
           label, truelabel and falselabel are required for boolean input 'throughput3'
-        </StyledMessageBar>
+        </StyledMessageBarBase>
       </StackItem>
     </Stack>
   </div>
@@ -581,7 +604,7 @@ exports[`SmartUiComponent should render and honor input's hidden, disabled state
                 label="Database"
               />
             </StyledLabelBase>
-            <Dropdown
+            <StyledWithResponsiveMode
               aria-labelledby="database-label"
               id="database-dropdown-input"
               onChange={[Function]}

src/Explorer/Controls/ThroughputInput/ThroughputInput.less

@@ -11,6 +11,10 @@
   padding: 0 @LargeSpace 0 @SmallSpace;
 }
 
-.throughputInputSpacing > :not(:last-child) {
-  margin-bottom: @DefaultSpace;
+.throughputInputSpacing {
+  margin-bottom: @SmallSpace;
+
+  & > * {
+    margin-bottom: @SmallSpace;
+  }
 }

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -1,15 +1,13 @@
-import { Checkbox, DirectionalHint, Icon, Link, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
+import { Checkbox, DirectionalHint, Icon, Link, Stack, Text, TextField, TooltipHost } from "office-ui-fabric-react";
 import React from "react";
 import * as Constants from "../../../Common/Constants";
 import * as SharedConstants from "../../../Shared/Constants";
 import { userContext } from "../../../UserContext";
-import { getCollectionName } from "../../../Utils/APITypeUtils";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import * as PricingUtils from "../../../Utils/PricingUtils";
 
 export interface ThroughputInputProps {
   isDatabase: boolean;
-  isSharded: boolean;
   showFreeTierExceedThroughputTooltip: boolean;
   setThroughputValue: (throughput: number) => void;
   setIsAutoscale: (isAutoscale: boolean) => void;
@@ -20,7 +18,6 @@ export interface ThroughputInputState {
   isAutoscaleSelected: boolean;
   throughput: number;
   isCostAcknowledged: boolean;
-  throughputError: string;
 }
 
 export class ThroughputInput extends React.Component<ThroughputInputProps, ThroughputInputState> {
@@ -31,7 +28,6 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
       isAutoscaleSelected: true,
       throughput: AutoPilotUtils.minAutoPilotThroughput,
       isCostAcknowledged: false,
-      throughputError: undefined,
     };
 
     this.props.setThroughputValue(AutoPilotUtils.minAutoPilotThroughput);
@@ -43,11 +39,11 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
       <div className="throughputInputContainer throughputInputSpacing">
         <Stack horizontal>
           <span className="mandatoryStar">*&nbsp;</span>
-          <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
+          <Text variant="small" style={{ lineHeight: "20px" }}>
             {this.getThroughputLabelText()}
           </Text>
           <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={PricingUtils.getRuToolTipText()}>
-            <Icon iconName="Info" className="panelInfoIcon" />
+            <Icon iconName="InfoSolid" className="panelInfoIcon" />
           </TooltipHost>
         </Stack>
 
@@ -78,7 +74,7 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
         {this.state.isAutoscaleSelected && (
           <Stack className="throughputInputSpacing">
             <Text variant="small">
-              Estimate your required RU/s with&nbsp;
+              Provision maximum RU/s required by this resource. Estimate your required RU/s with&nbsp;
               <Link target="_blank" href="https://cosmos.azure.com/capacitycalculator/">
                 capacity calculator
               </Link>
@@ -86,11 +82,11 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
             </Text>
 
             <Stack horizontal>
-              <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
-                {this.props.isDatabase ? "Database" : getCollectionName()} max RU/s
+              <Text variant="small" style={{ lineHeight: "20px" }}>
+                Max RU/s
               </Text>
               <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={this.getAutoScaleTooltip()}>
-                <Icon iconName="Info" className="panelInfoIcon" />
+                <Icon iconName="InfoSolid" className="panelInfoIcon" />
               </TooltipHost>
             </Stack>
 
@@ -105,12 +101,11 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
               min={AutoPilotUtils.minAutoPilotThroughput}
               value={this.state.throughput.toString()}
               aria-label="Max request units per second"
-              errorMessage={this.state.throughputError}
+              required={true}
             />
 
             <Text variant="small">
-              Your {this.props.isDatabase ? "database" : getCollectionName().toLocaleLowerCase()} throughput will
-              automatically scale from{" "}
+              Your {this.props.isDatabase ? "database" : "container"} throughput will automatically scale from{" "}
               <b>
                 {AutoPilotUtils.getMinRUsBasedOnUserInput(this.state.throughput)} RU/s (10% of max RU/s) -{" "}
                 {this.state.throughput} RU/s
@@ -152,7 +147,6 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
                 value={this.state.throughput.toString()}
                 aria-label="Max request units per second"
                 required={true}
-                errorMessage={this.state.throughputError}
               />
             </TooltipHost>
           </Stack>
@@ -162,7 +156,6 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
 
         {this.state.throughput > SharedConstants.CollectionCreation.DefaultCollectionRUs100K && (
           <Stack horizontal verticalAlign="start">
-            <span className="mandatoryStar">*&nbsp;</span>
             <Checkbox
               checked={this.state.isCostAcknowledged}
               styles={{
@@ -184,39 +177,34 @@ export class ThroughputInput extends React.Component<ThroughputInputProps, Throu
   }
 
   private getThroughputLabelText(): string {
-    let throughputHeaderText: string;
     if (this.state.isAutoscaleSelected) {
-      throughputHeaderText = AutoPilotUtils.getAutoPilotHeaderText().toLocaleLowerCase();
-    } else {
-      const minRU: string = SharedConstants.CollectionCreation.DefaultCollectionRUs400.toLocaleString();
-      const maxRU: string = userContext.isTryCosmosDBSubscription
-        ? Constants.TryCosmosExperience.maxRU.toLocaleString()
-        : "unlimited";
-      throughputHeaderText = `throughput (${minRU} - ${maxRU} RU/s)`;
+      return AutoPilotUtils.getAutoPilotHeaderText();
     }
 
-    return `${this.props.isDatabase ? "Database" : getCollectionName()} ${throughputHeaderText}`;
+    const minRU: string = SharedConstants.CollectionCreation.DefaultCollectionRUs400.toLocaleString();
+    const maxRU: string = userContext.isTryCosmosDBSubscription
+      ? Constants.TryCosmosExperience.maxRU.toLocaleString()
+      : "unlimited";
+    return this.state.isAutoscaleSelected
+      ? AutoPilotUtils.getAutoPilotHeaderText()
+      : `Throughput (${minRU} - ${maxRU} RU/s)`;
   }
 
   private onThroughputValueChange(newInput: string): void {
     const newThroughput = parseInt(newInput);
     this.setState({ throughput: newThroughput });
     this.props.setThroughputValue(newThroughput);
-
-    if (!this.props.isSharded && newThroughput > 10000) {
-      this.setState({ throughputError: "Unsharded collections support up to 10,000 RUs" });
-    } else {
-      this.setState({ throughputError: undefined });
-    }
   }
 
   private getAutoScaleTooltip(): string {
-    const collectionName = getCollectionName().toLocaleLowerCase();
-    return `Set the max RU/s to the highest RU/s you want your ${collectionName} to scale to. The ${collectionName} will scale between 10% of max RU/s to the max RU/s based on usage.`;
+    return `After the first ${AutoPilotUtils.getStorageBasedOnUserInput(
+      this.state.throughput
+    )} GB of data stored, the max
+    RU/s will be automatically upgraded based on the new storage value.`;
   }
 
   private getCostAcknowledgeText(): string {
-    const { databaseAccount } = userContext;
+    const databaseAccount = userContext.databaseAccount;
     if (!databaseAccount || !databaseAccount.properties) {
       return "";
     }
@@ -259,8 +247,8 @@ interface CostEstimateTextProps {
 
 const CostEstimateText: React.FunctionComponent<CostEstimateTextProps> = (props: CostEstimateTextProps) => {
   const { requestUnits, isAutoscale } = props;
-  const { databaseAccount } = userContext;
-  if (!databaseAccount?.properties) {
+  const databaseAccount = userContext.databaseAccount;
+  if (!databaseAccount || !databaseAccount.properties) {
     return <></>;
   }
 
@@ -283,20 +271,10 @@ const CostEstimateText: React.FunctionComponent<CostEstimateTextProps> = (props:
     ? PricingUtils.getAutoscalePricePerRu(serverId, multiplier) * multiplier
     : PricingUtils.getPricePerRu(serverId) * multiplier;
 
-  const iconWithEstimatedCostDisclaimer: JSX.Element = (
-    <TooltipHost
-      directionalHint={DirectionalHint.bottomLeftEdge}
-      content={PricingUtils.estimatedCostDisclaimer}
-      styles={{ root: { verticalAlign: "bottom" } }}
-    >
-      <Icon iconName="Info" className="panelInfoIcon" />
-    </TooltipHost>
-  );
-
   if (isAutoscale) {
     return (
       <Text variant="small">
-        Estimated monthly cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
+        Estimated monthly cost ({currency}):{" "}
         <b>
           {currencySign + PricingUtils.calculateEstimateNumber(monthlyPrice / 10)} -{" "}
           {currencySign + PricingUtils.calculateEstimateNumber(monthlyPrice)}{" "}
@@ -309,7 +287,7 @@ const CostEstimateText: React.FunctionComponent<CostEstimateTextProps> = (props:
 
   return (
     <Text variant="small">
-      Estimated cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
+      Cost ({currency}):{" "}
       <b>
         {currencySign + PricingUtils.calculateEstimateNumber(hourlyPrice)} hourly /{" "}
         {currencySign + PricingUtils.calculateEstimateNumber(dailyPrice)} daily /{" "}
@@ -317,6 +295,8 @@ const CostEstimateText: React.FunctionComponent<CostEstimateTextProps> = (props:
       </b>
       ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits}RU/s,{" "}
       {currencySign + pricePerRu}/RU)
+      <br />
+      <em>{PricingUtils.estimatedCostDisclaimer}</em>
     </Text>
   );
 };

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -5,21 +5,21 @@
  * - context menu
  */
 
+import * as React from "react";
+import * as Constants from "../../../Common/Constants";
+import AnimateHeight from "react-animate-height";
+import { IconButton, IButtonStyles } from "office-ui-fabric-react/lib/Button";
 import {
   DirectionalHint,
-  IButtonStyles,
-  IconButton,
   IContextualMenuItemProps,
   IContextualMenuProps,
-} from "@fluentui/react";
-import * as React from "react";
-import AnimateHeight from "react-animate-height";
-import LoadingIndicator_3Squares from "../../../../images/LoadingIndicator_3Squares.gif";
+} from "office-ui-fabric-react/lib/ContextualMenu";
+
 import TriangleDownIcon from "../../../../images/Triangle-down.svg";
 import TriangleRightIcon from "../../../../images/Triangle-right.svg";
-import * as Constants from "../../../Common/Constants";
-import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
+import LoadingIndicator_3Squares from "../../../../images/LoadingIndicator_3Squares.gif";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 
 export interface TreeNodeMenuItem {
   label: string;

src/Explorer/DataSamples/ContainerSampleGenerator.test.ts

@@ -79,6 +79,7 @@ describe("ContainerSampleGenerator", () => {
         location: "foo",
         type: "foo",
         kind: "foo",
+        tags: [],
         properties: {
           documentEndpoint: "bar",
           gremlinEndpoint: "foo",

src/Explorer/DataSamples/ContainerSampleGenerator.ts

@@ -80,7 +80,7 @@ export class ContainerSampleGenerator {
       if (!queries || queries.length < 1) {
         return;
       }
-      const { databaseAccount: account } = userContext;
+      const account = userContext.databaseAccount;
       const databaseId = collection.databaseId;
       const gremlinClient = new GremlinClient();
       gremlinClient.initialize({

src/Explorer/Explorer.tsx

@@ -1,5 +1,5 @@
-import { IChoiceGroupProps } from "@fluentui/react";
 import * as ko from "knockout";
+import { IChoiceGroupProps } from "office-ui-fabric-react";
 import * as path from "path";
 import Q from "q";
 import React from "react";
@@ -7,21 +7,19 @@ import _ from "underscore";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import * as Constants from "../Common/Constants";
-import { ExplorerMetrics, HttpStatusCodes } from "../Common/Constants";
+import { ExplorerMetrics } from "../Common/Constants";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
-import { sendCachedDataMessage } from "../Common/MessageHandler";
+import { sendCachedDataMessage, sendMessage } from "../Common/MessageHandler";
 import { QueriesClient } from "../Common/QueriesClient";
 import { Splitter, SplitterBounds, SplitterDirection } from "../Common/Splitter";
 import { configContext, Platform } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import * as ViewModels from "../Contracts/ViewModels";
-import { GitHubClient } from "../GitHub/GitHubClient";
-import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
-import { IGalleryItem, JunoClient } from "../Juno/JunoClient";
+import { IGalleryItem } from "../Juno/JunoClient";
 import { NotebookWorkspaceManager } from "../NotebookWorkspaceManager/NotebookWorkspaceManager";
 import { ResourceProviderClientFactory } from "../ResourceProvider/ResourceProviderClientFactory";
 import { RouteHandler } from "../RouteHandlers/RouteHandler";
@@ -31,13 +29,13 @@ import { ExplorerSettings } from "../Shared/ExplorerSettings";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 import { ArcadiaResourceManager } from "../SparkClusterManager/ArcadiaResourceManager";
-import { updateUserContext, userContext } from "../UserContext";
-import { getCollectionName } from "../Utils/APITypeUtils";
-import { decryptJWTToken, getAuthorizationHeader } from "../Utils/AuthorizationUtils";
+import { userContext } from "../UserContext";
+import { decryptJWTToken } from "../Utils/AuthorizationUtils";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { fromContentUri, toRawContentUri } from "../Utils/GitHubUtils";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../Utils/NotificationConsoleUtils";
+import * as PricingUtils from "../Utils/PricingUtils";
 import * as ComponentRegisterer from "./ComponentRegisterer";
 import { ArcadiaWorkspaceItem } from "./Controls/Arcadia/ArcadiaMenuPicker";
 import { CommandButtonComponentProps } from "./Controls/CommandButton/CommandButtonComponent";
@@ -59,7 +57,6 @@ import { ContextualPaneBase } from "./Panes/ContextualPaneBase";
 import { DeleteCollectionConfirmationPane } from "./Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane";
 import { DeleteDatabaseConfirmationPanel } from "./Panes/DeleteDatabaseConfirmationPanel";
 import { ExecuteSprocParamsPane } from "./Panes/ExecuteSprocParamsPane/ExecuteSprocParamsPane";
-import { GitHubReposPanel } from "./Panes/GitHubReposPanel/GitHubReposPanel";
 import GraphStylingPane from "./Panes/GraphStylingPane";
 import { LoadQueryPane } from "./Panes/LoadQueryPane/LoadQueryPane";
 import { SaveQueryPane } from "./Panes/SaveQueryPane/SaveQueryPane";
@@ -97,8 +94,8 @@ export interface ExplorerParams {
   closeDialog: () => void;
   openDialog: (props: DialogProps) => void;
   tabsManager: TabsManager;
-  refreshSparkEnabledStateForAccount: () => void;
-  isSparkEnabledForAccount: boolean;
+  refreshNotebooksEnabledStateForAccount: () => void;
+  isNotebooksEnabledForAccount: ko.Observable<boolean>;
 }
 
 export default class Explorer {
@@ -111,8 +108,23 @@ export default class Explorer {
   public refreshTreeTitle: ko.Observable<string>;
   public collapsedResourceTreeWidth: number = ExplorerMetrics.CollapsedResourceTreeWidth;
 
+  /**
+   * @deprecated
+   * Use userContext.databaseAccount instead
+   * */
+  public databaseAccount: ko.Observable<DataModels.DatabaseAccount>;
   public collectionCreationDefaults: ViewModels.CollectionCreationDefaults = SharedConstants.CollectionCreationDefaults;
+  /**
+   * @deprecated
+   * Use userContext.apiType instead
+   * */
+  public defaultExperience: ko.Observable<string>;
   public isFixedCollectionWithSharedThroughputSupported: ko.Computed<boolean>;
+  /**
+   * @deprecated
+   * Compare a string with userContext.apiType instead: userContext.apiType === "Mongo"
+   * */
+  public isEnableMongoCapabilityPresent: ko.Computed<boolean>;
   public isServerlessEnabled: ko.Computed<boolean>;
   public isAccountReady: ko.Observable<boolean>;
   public canSaveQueries: ko.Computed<boolean>;
@@ -156,13 +168,13 @@ export default class Explorer {
   public addCollectionPane: AddCollectionPane;
   public graphStylingPane: GraphStylingPane;
   public cassandraAddCollectionPane: CassandraAddCollectionPane;
-  private gitHubClient: GitHubClient;
-  public gitHubOAuthService: GitHubOAuthService;
-  public junoClient: JunoClient;
+  public gitHubReposPane: ContextualPaneBase;
 
   // features
+  public isGitHubPaneEnabled: ko.Observable<boolean>;
   public isPublishNotebookPaneEnabled: ko.Observable<boolean>;
   public isHostedDataExplorerEnabled: ko.Computed<boolean>;
+  public isRightPanelV2Enabled: ko.Computed<boolean>;
   public isMongoIndexingEnabled: ko.Observable<boolean>;
   public canExceedMaximumValue: ko.Computed<boolean>;
   public isAutoscaleDefaultEnabled: ko.Observable<boolean>;
@@ -176,6 +188,7 @@ export default class Explorer {
   public notebookWorkspaceManager: NotebookWorkspaceManager;
   public sparkClusterConnectionInfo: ko.Observable<DataModels.SparkClusterConnectionInfo>;
   public isSparkEnabled: ko.Observable<boolean>;
+  public isSparkEnabledForAccount: ko.Observable<boolean>;
   public arcadiaToken: ko.Observable<string>;
   public arcadiaWorkspaces: ko.ObservableArray<ArcadiaWorkspaceItem>;
   public hasStorageAnalyticsAfecFeature: ko.Observable<boolean>;
@@ -184,6 +197,7 @@ export default class Explorer {
   public notebookManager?: NotebookManager;
   public openDialog: ExplorerParams["openDialog"];
   public closeDialog: ExplorerParams["closeDialog"];
+  public refreshNotebooksEnabledStateForAccount: ExplorerParams["refreshNotebooksEnabledStateForAccount"];
 
   private _panes: ContextualPaneBase[] = [];
   private _isInitializingNotebooks: boolean;
@@ -194,18 +208,12 @@ export default class Explorer {
     content: string;
   };
 
-  // Refresh spark
-  public refreshSparkEnabledStateForAccount: () => void;
-  public isSparkEnabledForAccount: boolean;
-
   // React adapters
   private commandBarComponentAdapter: CommandBarComponentAdapter;
 
   private static readonly MaxNbDatabasesToAutoExpand = 5;
 
   constructor(params?: ExplorerParams) {
-    this.gitHubClient = new GitHubClient(this.onGitHubClientError);
-    this.junoClient = new JunoClient();
     this.setIsNotificationConsoleExpanded = params?.setIsNotificationConsoleExpanded;
     this.setNotificationConsoleData = params?.setNotificationConsoleData;
     this.setInProgressConsoleDataIdToBeDeleted = params?.setInProgressConsoleDataIdToBeDeleted;
@@ -213,8 +221,8 @@ export default class Explorer {
     this.closeSidePanel = params?.closeSidePanel;
     this.closeDialog = params?.closeDialog;
     this.openDialog = params?.openDialog;
-    this.refreshSparkEnabledStateForAccount = params?.refreshSparkEnabledStateForAccount;
-    this.isSparkEnabledForAccount = params?.isSparkEnabledForAccount;
+    this.refreshNotebooksEnabledStateForAccount = params?.refreshNotebooksEnabledStateForAccount;
+    this.isNotebooksEnabledForAccount = params?.isNotebooksEnabledForAccount;
 
     const startKey: number = TelemetryProcessor.traceStart(Action.InitializeDataExplorer, {
       dataExplorerArea: Constants.Areas.ResourceTree,
@@ -227,6 +235,7 @@ export default class Explorer {
     this.deleteDatabaseText = ko.observable<string>("Delete Database");
     this.refreshTreeTitle = ko.observable<string>("Refresh collections");
 
+    this.databaseAccount = ko.observable<DataModels.DatabaseAccount>();
     this.isAccountReady = ko.observable<boolean>(false);
     this._isInitializingNotebooks = false;
     this.arcadiaToken = ko.observable<string>();
@@ -238,9 +247,9 @@ export default class Explorer {
         });
       }
     });
-    this.isNotebooksEnabledForAccount = ko.observable(false);
     this.isNotebooksEnabledForAccount.subscribe((isEnabledForAccount: boolean) => this.refreshCommandBarButtons());
-    // this.isSparkEnabledForAccount.subscribe((isEnabledForAccount: boolean) => this.refreshCommandBarButtons());
+    this.isSparkEnabledForAccount = ko.observable(false);
+    this.isSparkEnabledForAccount.subscribe((isEnabledForAccount: boolean) => this.refreshCommandBarButtons());
     this.hasStorageAnalyticsAfecFeature = ko.observable(false);
     this.hasStorageAnalyticsAfecFeature.subscribe((enabled: boolean) => this.refreshCommandBarButtons());
     this.isSynapseLinkUpdating = ko.observable<boolean>(false);
@@ -256,11 +265,11 @@ export default class Explorer {
         this._isAfecFeatureRegistered(Constants.AfecFeatures.StorageAnalytics).then((isRegistered) =>
           this.hasStorageAnalyticsAfecFeature(isRegistered)
         );
-        Promise.all([this._refreshNotebooksEnabledStateForAccount(), this.refreshSparkEnabledStateForAccount()]).then(
+        Promise.all([this.refreshNotebooksEnabledStateForAccount(), this._refreshSparkEnabledStateForAccount()]).then(
           async () => {
             this.isNotebookEnabled(
               userContext.authType !== AuthType.ResourceToken &&
-                ((await this._containsDefaultNotebookWorkspace(userContext.databaseAccount)) ||
+                ((await this._containsDefaultNotebookWorkspace(this.databaseAccount())) ||
                   userContext.features.enableNotebooks)
             );
             TelemetryProcessor.trace(Action.NotebookEnabled, ActionModifiers.Mark, {
@@ -269,7 +278,7 @@ export default class Explorer {
             });
 
             if (this.isNotebookEnabled()) {
-              await this.initNotebooks(userContext.databaseAccount);
+              await this.initNotebooks(this.databaseAccount());
               const workspaces = await this._getArcadiaWorkspaces();
               this.arcadiaWorkspaces(workspaces);
             } else if (this.notebookToImport) {
@@ -279,7 +288,7 @@ export default class Explorer {
 
             this.isSparkEnabled(
               (this.isNotebookEnabled() &&
-                this.isSparkEnabledForAccount &&
+                this.isSparkEnabledForAccount() &&
                 this.arcadiaWorkspaces() &&
                 this.arcadiaWorkspaces().length > 0) ||
                 userContext.features.enableSpark
@@ -312,6 +321,7 @@ export default class Explorer {
     this.resourceTokenCollectionId = ko.observable<string>();
     this.resourceTokenCollection = ko.observable<ViewModels.CollectionBase>();
     this.resourceTokenPartitionKey = ko.observable<string>();
+    this.isGitHubPaneEnabled = ko.observable<boolean>(false);
     this.isMongoIndexingEnabled = ko.observable<boolean>(false);
     this.isPublishNotebookPaneEnabled = ko.observable<boolean>(false);
 
@@ -365,32 +375,60 @@ export default class Explorer {
       bounds: splitterBounds,
       direction: SplitterDirection.Vertical,
     });
+    this.defaultExperience = ko.observable<string>();
+    // this.databaseAccount.subscribe((databaseAccount) => {
+    //   const defaultExperience: string = DefaultExperienceUtility.getDefaultExperienceFromDatabaseAccount(
+    //     databaseAccount
+    //   );
+    //   this.defaultExperience(defaultExperience);
+    //   // TODO. Remove this entirely
+    //   updateUserContext({
+    //     apiType: DefaultExperienceUtility.mapDefaultExperienceStringToEnum(defaultExperience),
+    //   });
+    // });
 
     this.isFixedCollectionWithSharedThroughputSupported = ko.computed(() => {
       if (userContext.features.enableFixedCollectionWithSharedThroughput) {
         return true;
       }
 
-      if (!userContext.databaseAccount) {
+      if (this.databaseAccount && !this.databaseAccount()) {
         return false;
       }
 
-      return userContext.apiType === "Mongo";
+      return this.isEnableMongoCapabilityPresent();
     });
 
     this.isServerlessEnabled = ko.computed(
       () =>
-        userContext.databaseAccount?.properties?.capabilities?.find(
+        this.databaseAccount &&
+        this.databaseAccount()?.properties?.capabilities?.find(
           (item) => item.name === Constants.CapabilityNames.EnableServerless
         ) !== undefined
     );
 
+    this.isEnableMongoCapabilityPresent = ko.computed(() => {
+      const capabilities = this.databaseAccount && this.databaseAccount()?.properties?.capabilities;
+      if (!capabilities) {
+        return false;
+      }
+
+      for (let i = 0; i < capabilities.length; i++) {
+        if (typeof capabilities[i] === "object" && capabilities[i].name === Constants.CapabilityNames.EnableMongo) {
+          return true;
+        }
+      }
+
+      return false;
+    });
+
     this.isHostedDataExplorerEnabled = ko.computed<boolean>(
       () =>
         configContext.platform === Platform.Portal &&
         !this.isRunningOnNationalCloud() &&
         userContext.apiType !== "Gremlin"
     );
+    this.isRightPanelV2Enabled = ko.computed<boolean>(() => userContext.features.enableRightPanelV2);
     this.selectedDatabaseId = ko.computed<string>(() => {
       const selectedNode = this.selectedNode();
       if (!selectedNode) {
@@ -563,6 +601,9 @@ export default class Explorer {
           refreshCommandBarButtons: () => this.refreshCommandBarButtons(),
           refreshNotebookList: () => this.refreshNotebookList(),
         });
+
+        this.gitHubReposPane = this.notebookManager.gitHubReposPane;
+        this.isGitHubPaneEnabled(true);
       }
 
       this.refreshCommandBarButtons();
@@ -610,23 +651,6 @@ export default class Explorer {
     }
   }
 
-  private onGitHubClientError = (error: any): void => {
-    Logger.logError(getErrorMessage(error), "NotebookManager/onGitHubClientError");
-
-    if (error.status === HttpStatusCodes.Unauthorized) {
-      this.gitHubOAuthService.resetToken();
-
-      this.showOkCancelModalDialog(
-        undefined,
-        "Cosmos DB cannot access your Github account anymore. Please connect to GitHub again.",
-        "Connect to GitHub",
-        () => this.openGitHubReposPanel("Connect to GitHub"),
-        "Cancel",
-        undefined
-      );
-    }
-  };
-
   public openEnableSynapseLinkDialog(): void {
     const addSynapseLinkDialogProps: DialogProps = {
       linkProps: {
@@ -649,11 +673,11 @@ export default class Explorer {
         this.isSynapseLinkUpdating(true);
         this._closeSynapseLinkModalDialog();
 
-        const resourceProviderClient = new ResourceProviderClientFactory().getOrCreate(userContext.databaseAccount.id);
+        const resourceProviderClient = new ResourceProviderClientFactory().getOrCreate(this.databaseAccount().id);
 
         try {
           const databaseAccount: DataModels.DatabaseAccount = await resourceProviderClient.patchAsync(
-            userContext.databaseAccount.id,
+            this.databaseAccount().id,
             "2019-12-12",
             {
               properties: {
@@ -664,7 +688,7 @@ export default class Explorer {
           clearInProgressMessage();
           logConsoleInfo("Enabled Azure Synapse Link for this account");
           TelemetryProcessor.traceSuccess(Action.EnableAzureSynapseLink, {}, startTime);
-          updateUserContext({ databaseAccount });
+          this.databaseAccount(databaseAccount);
         } catch (error) {
           clearInProgressMessage();
           logConsoleError(`Enabling Azure Synapse Link for this account failed. ${getErrorMessage(error)}`);
@@ -713,6 +737,10 @@ export default class Explorer {
     this.setIsNotificationConsoleExpanded(true);
   }
 
+  public collapseConsole(): void {
+    this.setIsNotificationConsoleExpanded(false);
+  }
+
   public toggleLeftPaneExpanded() {
     this.isLeftPaneExpanded(!this.isLeftPaneExpanded());
 
@@ -983,14 +1011,14 @@ export default class Explorer {
   }
 
   private async ensureNotebookWorkspaceRunning() {
-    if (!userContext.databaseAccount) {
+    if (!this.databaseAccount()) {
       return;
     }
 
     let clearMessage;
     try {
       const notebookWorkspace = await this.notebookWorkspaceManager.getNotebookWorkspaceAsync(
-        userContext.databaseAccount.id,
+        this.databaseAccount().id,
         "default"
       );
       if (
@@ -1000,7 +1028,7 @@ export default class Explorer {
         notebookWorkspace.properties.status.toLowerCase() === "stopped"
       ) {
         clearMessage = NotificationConsoleUtils.logConsoleProgress("Initializing notebook workspace");
-        await this.notebookWorkspaceManager.startNotebookWorkspaceAsync(userContext.databaseAccount.id, "default");
+        await this.notebookWorkspaceManager.startNotebookWorkspaceAsync(this.databaseAccount().id, "default");
       }
     } catch (error) {
       handleError(error, "Explorer/ensureNotebookWorkspaceRunning", "Failed to initialize notebook workspace");
@@ -1085,10 +1113,21 @@ export default class Explorer {
       if (process.env.NODE_ENV === "development") {
         sessionStorage.setItem("portalDataExplorerInitMessage", JSON.stringify(inputs));
       }
+
+      const databaseAccount = inputs.databaseAccount || null;
       if (inputs.defaultCollectionThroughput) {
         this.collectionCreationDefaults = inputs.defaultCollectionThroughput;
       }
+      this.databaseAccount(databaseAccount);
       this.setFeatureFlagsFromFlights(inputs.flights);
+      TelemetryProcessor.traceSuccess(
+        Action.LoadDatabaseAccount,
+        {
+          dataExplorerArea: Constants.Areas.ResourceTree,
+        },
+        inputs.loadDatabaseAccountTimestamp
+      );
+
       this.isAccountReady(true);
     }
   }
@@ -1127,6 +1166,38 @@ export default class Explorer {
     this.commandBarComponentAdapter.onUpdateTabsButtons(buttons);
   }
 
+  public signInAad = () => {
+    TelemetryProcessor.trace(Action.SignInAad, undefined, { area: "Explorer" });
+    sendMessage({
+      type: MessageTypes.AadSignIn,
+    });
+  };
+
+  public onSwitchToConnectionString = () => {
+    $("#connectWithAad").hide();
+    $("#connectWithConnectionString").show();
+  };
+
+  public clickHostedAccountSwitch = () => {
+    sendMessage({
+      type: MessageTypes.UpdateAccountSwitch,
+      click: true,
+    });
+  };
+
+  public clickHostedDirectorySwitch = () => {
+    sendMessage({
+      type: MessageTypes.UpdateDirectoryControl,
+      click: true,
+    });
+  };
+
+  public refreshDatabaseAccount = () => {
+    sendMessage({
+      type: MessageTypes.RefreshDatabaseAccount,
+    });
+  };
+
   private refreshAndExpandNewDatabases(newDatabases: ViewModels.Database[]): Q.Promise<void> {
     // we reload collections for all databases so the resource tree reflects any collection-level changes
     // i.e addition of stored procedures, etc.
@@ -1545,57 +1616,39 @@ export default class Explorer {
     );
   }
 
-  private async _refreshNotebooksEnabledStateForAccount(): Promise<void> {
-    const { databaseAccount, authType } = userContext;
-    if (
-      authType === AuthType.EncryptedToken ||
-      authType === AuthType.ResourceToken ||
-      authType === AuthType.MasterKey
-    ) {
-      this.isNotebooksEnabledForAccount(false);
+  public _refreshSparkEnabledStateForAccount = async (): Promise<void> => {
+    const subscriptionId = userContext.subscriptionId;
+    const armEndpoint = configContext.ARM_ENDPOINT;
+    const authType = userContext.authType;
+    if (!subscriptionId || !armEndpoint || authType === AuthType.EncryptedToken) {
+      // explorer is not aware of the database account yet
+      this.isSparkEnabledForAccount(false);
       return;
     }
 
-    const firstWriteLocation =
-      databaseAccount?.properties?.writeLocations &&
-      databaseAccount?.properties?.writeLocations[0]?.locationName.toLowerCase();
-    const disallowedLocationsUri = `${configContext.BACKEND_ENDPOINT}/api/disallowedLocations`;
-    const authorizationHeader = getAuthorizationHeader();
+    const featureUri = `subscriptions/${subscriptionId}/providers/Microsoft.Features/providers/Microsoft.DocumentDb/features/${Constants.AfecFeatures.Spark}`;
+    const resourceProviderClient = new ResourceProviderClientFactory().getOrCreate(featureUri);
     try {
-      const response = await fetch(disallowedLocationsUri, {
-        method: "POST",
-        body: JSON.stringify({
-          resourceTypes: [Constants.ArmResourceTypes.notebookWorkspaces],
-        }),
-        headers: {
-          [authorizationHeader.header]: authorizationHeader.token,
-          [Constants.HttpHeaders.contentType]: "application/json",
-        },
-      });
-
-      if (!response.ok) {
-        throw new Error("Failed to fetch disallowed locations");
-      }
-
-      const disallowedLocations: string[] = await response.json();
-      if (!disallowedLocations) {
-        Logger.logInfo("No disallowed locations found", "Explorer/isNotebooksEnabledForAccount");
-        this.isNotebooksEnabledForAccount(true);
-        return;
-      }
-
-      // firstWriteLocation should not be disallowed
-      const isAccountInAllowedLocation = firstWriteLocation && disallowedLocations.indexOf(firstWriteLocation) === -1;
-      this.isNotebooksEnabledForAccount(isAccountInAllowedLocation);
+      const sparkNotebooksFeature: DataModels.AfecFeature = await resourceProviderClient.getAsync(
+        featureUri,
+        Constants.ArmApiVersions.armFeatures
+      );
+      const isEnabled =
+        (sparkNotebooksFeature &&
+          sparkNotebooksFeature.properties &&
+          sparkNotebooksFeature.properties.state === "Registered") ||
+        false;
+      this.isSparkEnabledForAccount(isEnabled);
     } catch (error) {
-      Logger.logError(getErrorMessage(error), "Explorer/isNotebooksEnabledForAccount");
-      this.isNotebooksEnabledForAccount(false);
+      Logger.logError(getErrorMessage(error), "Explorer/isSparkEnabledForAccount");
+      this.isSparkEnabledForAccount(false);
     }
-  }
+  };
 
   public _isAfecFeatureRegistered = async (featureName: string): Promise<boolean> => {
-    const { subscriptionId, authType } = userContext;
+    const subscriptionId = userContext.subscriptionId;
     const armEndpoint = configContext.ARM_ENDPOINT;
+    const authType = userContext.authType;
     if (!featureName || !subscriptionId || !armEndpoint || authType === AuthType.EncryptedToken) {
       // explorer is not aware of the database account yet
       return false;
@@ -1854,14 +1907,14 @@ export default class Explorer {
     }
   }
 
-  public onNewCollectionClicked(databaseId?: string): void {
+  public onNewCollectionClicked(): void {
     if (userContext.apiType === "Cassandra") {
       this.cassandraAddCollectionPane.open();
-    } else if (userContext.features.enableKOPanel) {
+    } else if (userContext.features.enableReactPane) {
+      this.openAddCollectionPanel();
+    } else {
       this.addCollectionPane.open(this.selectedDatabaseId());
       document.getElementById("linkAddCollection").focus();
-    } else {
-      this.openAddCollectionPanel(databaseId);
     }
   }
 
@@ -1907,7 +1960,7 @@ export default class Explorer {
   }
 
   public async handleOpenFileAction(path: string): Promise<void> {
-    if (this.isAccountReady() && !(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))) {
+    if (this.isAccountReady() && !(await this._containsDefaultNotebookWorkspace(this.databaseAccount()))) {
       this.closeAllPanes();
       this._openSetupNotebooksPaneForQuickstart();
     }
@@ -1965,9 +2018,14 @@ export default class Explorer {
   }
 
   public openDeleteCollectionConfirmationPane(): void {
+    let collectionName = PricingUtils.getCollectionName(userContext.apiType);
     this.openSidePanel(
-      "Delete " + getCollectionName(),
-      <DeleteCollectionConfirmationPane explorer={this} closePanel={this.closeSidePanel} />
+      "Delete " + collectionName,
+      <DeleteCollectionConfirmationPane
+        explorer={this}
+        collectionName={collectionName}
+        closePanel={this.closeSidePanel}
+      />
     );
   }
 
@@ -2005,15 +2063,14 @@ export default class Explorer {
     );
   }
 
-  public async openAddCollectionPanel(databaseId?: string): Promise<void> {
+  public async openAddCollectionPanel(): Promise<void> {
     await this.loadDatabaseOffers();
     this.openSidePanel(
-      "New " + getCollectionName(),
+      "New Collection",
       <AddCollectionPanel
         explorer={this}
         closePanel={() => this.closeSidePanel()}
         openNotificationConsole={() => this.expandConsole()}
-        databaseId={databaseId}
       />
     );
   }
@@ -2042,19 +2099,6 @@ export default class Explorer {
     );
   }
 
-  public openGitHubReposPanel(header: string, junoClient?: JunoClient): void {
-    this.openSidePanel(
-      header,
-      <GitHubReposPanel
-        explorer={this}
-        closePanel={this.closeSidePanel}
-        gitHubClientProp={this.notebookManager.gitHubClient}
-        junoClientProp={junoClient}
-        openNotificationConsole={() => this.expandConsole()}
-      />
-    );
-  }
-
   public openAddTableEntityPanel(queryTablesTab: QueryTablesTab, tableEntityListViewModel: TableListViewModal): void {
     this.openSidePanel(
       "Add Table Entity",

src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx

@@ -1,5 +1,5 @@
-import { FocusZone } from "@fluentui/react";
 import * as React from "react";
+import { FocusZone } from "office-ui-fabric-react/lib/FocusZone";
 import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 
 export interface CaptionId {

src/Explorer/Graph/NewVertexComponent/NewVertexComponent.tsx

@@ -1,4 +1,4 @@
-import { Dropdown, IDropdownOption, Stack, TextField } from "@fluentui/react";
+import { Dropdown, IDropdownOption, Stack, TextField } from "office-ui-fabric-react";
 import React, { FunctionComponent, useRef, useState } from "react";
 import AddIcon from "../../../../images/Add-property.svg";
 import DeleteIcon from "../../../../images/delete.svg";

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -3,13 +3,12 @@
  * If the component signals a change through the callback passed in the properties, it must render the React component when appropriate
  * and update any knockout observables passed from the parent.
  */
-import { CommandBar, ICommandBarItemProps } from "@fluentui/react";
 import * as ko from "knockout";
+import { CommandBar, ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
 import * as React from "react";
 import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
 import { StyleConstants } from "../../../Common/Constants";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { userContext } from "../../../UserContext";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
@@ -40,7 +39,7 @@ export class CommandBarComponentAdapter implements ReactAdapter {
       container.isResourceTokenCollectionNodeSelected,
       container.isHostedDataExplorerEnabled,
       container.isSynapseLinkUpdating,
-      userContext?.databaseAccount,
+      container.databaseAccount,
       this.isNotebookTabActive,
       container.isServerlessEnabled,
     ];

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -19,8 +19,11 @@ import SettingsIcon from "../../../../images/settings_15x15.svg";
 import SynapseIcon from "../../../../images/synapse-link.svg";
 import { AuthType } from "../../../AuthType";
 import * as Constants from "../../../Common/Constants";
+import { Areas } from "../../../Common/Constants";
 import { configContext, Platform } from "../../../ConfigContext";
 import * as ViewModels from "../../../Contracts/ViewModels";
+import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../UserContext";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
@@ -239,11 +242,21 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
     return undefined;
   }
 
-  if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
+  if (
+    container.databaseAccount &&
+    container.databaseAccount() &&
+    container.databaseAccount().properties &&
+    container.databaseAccount().properties.enableAnalyticalStorage
+  ) {
     return undefined;
   }
 
-  const capabilities = userContext?.databaseAccount?.properties?.capabilities || [];
+  const capabilities =
+    (container.databaseAccount &&
+      container.databaseAccount() &&
+      container.databaseAccount().properties &&
+      container.databaseAccount().properties.capabilities) ||
+    [];
   if (capabilities.some((capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics)) {
     return undefined;
   }
@@ -525,7 +538,14 @@ function createManageGitHubAccountButton(container: Explorer): CommandButtonComp
   return {
     iconSrc: GitHubIcon,
     iconAlt: label,
-    onCommandClick: () => container.openGitHubReposPanel(label),
+    onCommandClick: () => {
+      if (!connectedToGitHub) {
+        TelemetryProcessor.trace(Action.NotebooksGitHubConnect, ActionModifiers.Mark, {
+          dataExplorerArea: Areas.Notebook,
+        });
+      }
+      container.gitHubReposPane.open();
+    },
     commandButtonLabel: label,
     hasPopup: false,
     disabled: false,