Merge branch 'master' of https://github.com/Azure/cosmos-explorer into tsStrict/fixed-hoverablecell-inputparameter-file

Add initializeGitHubRepos function in useNotebooks store (#957 )
Fix validateCollectionId for new tables account (#958 )
2025-12-24 11:21:23 +00:00 · 2021-07-26 18:08:24 +05:30 · 2021-07-23 18:44:24 -07:00 · 2021-07-23 18:44:16 -07:00 · 2021-07-22 17:11:19 -07:00 · 2021-07-22 16:18:48 -07:00
56 changed files with 5218 additions and 6460 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,16 +1 @@
-PORTAL_RUNNER_USERNAME=
-PORTAL_RUNNER_PASSWORD=
-PORTAL_RUNNER_SUBSCRIPTION=
-PORTAL_RUNNER_RESOURCE_GROUP=
-PORTAL_RUNNER_DATABASE_ACCOUNT=
-PORTAL_RUNNER_DATABASE_ACCOUNT_KEY=
-PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT=
-PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY=
-PORTAL_RUNNER_CONNECTION_STRING=
-NOTEBOOKS_TEST_RUNNER_TENANT_ID=
-NOTEBOOKS_TEST_RUNNER_CLIENT_ID=
-NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET=
-CASSANDRA_CONNECTION_STRING=
-MONGO_CONNECTION_STRING=
-TABLES_CONNECTION_STRING=
 DATA_EXPLORER_ENDPOINT=https://localhost:1234/hostedExplorer.html
--- a/.eslintignore
+++ b/.eslintignore
@@ -191,4 +191,4 @@ src/Explorer/Notebook/NotebookRenderer/decorators/kbd-shortcuts/index.tsx
 src/Explorer/Notebook/temp/inputs/connected-editors/codemirror.tsx
 src/Explorer/Tree/ResourceTreeAdapter.tsx
 __mocks__/monaco-editor.ts
-src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx
+src/Explorer/Tree/ResourceTree.tsx
--- a/less/resourceTree.less
+++ b/less/resourceTree.less
@@ -2,6 +2,7 @@

 .dataResourceTree {
  margin-left: @MediumSpace;
+  overflow: auto;

  .databaseHeader {
    font-size: 14px;
--- a/less/tree.less
+++ b/less/tree.less
@@ -1,273 +1,270 @@
@import "./Common/Constants";

-
 .resourceTree {
+  height: 100%;
+  flex: 0 0 auto;
+  .main {
    height: 100%;
-    width: 20%;
-    flex: 0 0 auto;
-    .main {
-        height: 100%;
-    }
+  }
 }

 .resourceTreeScroll {
-    height: 100%;
-    display: flex;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding-right: 10px;
+  height: 100%;
+  display: flex;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding-right: 10px;
 }

 .userSelectNone {
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
 }

 .treeHovermargin {
-    margin-left: 16px;
+  margin-left: 16px;
 }

 .highlight {
-    padding: @SmallSpace 2px;
-    outline: 0;
+  padding: @SmallSpace 2px;
+  outline: 0;

-    &:hover {
-        .hover();
-    }
+  &:hover {
+    .hover();
+  }

-    &:active {
-        .active();
-    }
+  &:active {
+    .active();
+  }

-    &:focus {
-        .focus();
-    }
+  &:focus {
+    .focus();
+  }
 }

 .contextmenushowing {
-    background-color: #EEE;
+  background-color: #eee;
 }

 .collectionstree {
-    width: 100%;
-    margin-top: @DefaultSpace;
+  width: 100%;
+  margin-top: @DefaultSpace;

+  .databaseList {
+    list-style-type: none;
+    padding-left: 0px;

-    .databaseList {
-        list-style-type: none;
-        padding-left: 0px;
-
-        .collectionList {
-            padding-left:(2 * @MediumSpace);
-        }
-
-        .collectionChildList {
-            padding-left: @LargeSpace;
-        }
-
-        .databaseDocuments {
-            padding-left: (5 * @MediumSpace);
-        }
+    .collectionList {
+      padding-left: (2 * @MediumSpace);
    }
+
+    .collectionChildList {
+      padding-left: @LargeSpace;
+    }
+
+    .databaseDocuments {
+      padding-left: (5 * @MediumSpace);
+    }
+  }
 }

 .pointerCursor {
-    cursor: pointer;
+  cursor: pointer;
 }

 .menuEllipsis {
-    padding-right: 6px;
-    font-weight: bold;
-    font-size: 18px;
-    position: relative;
-    top: -5px;
-    left: 0px;
-    float: right;
-    display: none;
-    padding-left: 6px!important;
-    line-height: @TreeLineHeight;
+  padding-right: 6px;
+  font-weight: bold;
+  font-size: 18px;
+  position: relative;
+  top: -5px;
+  left: 0px;
+  float: right;
+  display: none;
+  padding-left: 6px !important;
+  line-height: @TreeLineHeight;
 }

 .databaseMenu {
-    .flex-display();
+  .flex-display();
 }

 .databaseMenu:hover .menuEllipsis,
 .databaseMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .databaseCollChildTextOverflow {
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    flex: 1;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  flex: 1;
 }

 .collectionMenu {
-    .flex-display();
+  .flex-display();
 }

 .collectionMenu:hover .menuEllipsis,
 .collectionMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .documentsMenu:hover .menuEllipsis,
 .documentsMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .treeChildMenu {
-    display: flex;
+  display: flex;
 }

 .storedProcedureMenu:hover .menuEllipsis,
 .storedProcedureMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .childMenu {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    padding-left: (6 * @MediumSpace);
-    width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-left: (6 * @MediumSpace);
+  width: 100%;
 }

 .storedChildMenu:hover .menuEllipsis,
 .storedChildMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .contextmenu6 {
-    top: -29px;
+  top: -29px;
 }

 .userDefinedMenu:hover .contextmenu6 {
-    display: block;
+  display: block;
 }

 .userDefinedchildMenu:hover .menuEllipsis,
 .userDefinedchildMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .triggersMenu:hover .menuEllipsis,
 .triggersMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .triggersChildMenu:hover .menuEllipsis,
 .triggersChildMenu:focus .menuEllipsis {
-    display: block;
+  display: block;
 }

 .databaseId {
-    font-size: 14px;
+  font-size: 14px;
 }

 .storedUdfTriggerMenu {
-    padding-left: 0px;
+  padding-left: 0px;
 }

 .collectionstree img {
-    width: 16px;
-    height: 16px;
-    vertical-align: text-top;
+  width: 16px;
+  height: 16px;
+  vertical-align: text-top;
 }

 img.collectionsTreeCollapseExpand {
-    width: 10px;
-    height: 10px;
-    vertical-align: middle;
-    margin-bottom: 5px;
+  width: 10px;
+  height: 10px;
+  vertical-align: middle;
+  margin-bottom: 5px;
 }

 .collapsed::before {
-    content: "\23F5";
-    margin-left: 0px;
-    font-size: 15px;
+  content: "\23F5";
+  margin-left: 0px;
+  font-size: 15px;
 }

 .expanded::before {
-    content: '\23F7';
-    margin-left: 0px;
-    font-size: 15px;
+  content: "\23F7";
+  margin-left: 0px;
+  font-size: 15px;
 }

 .collectionMenuChildren {
-    padding-left: 42px;
+  padding-left: 42px;
 }

 .main-nav {
-    width: 100vh;
-    height: 40px;
-    background: white;
-    transform-origin: left top;
-    -webkit-transform-origin: left top;
-    -ms-transform-origin: left top;
-    transform: rotate(-90deg) translateX(-100%);
-    -webkit-transform: rotate(-90deg) translateX(-100%);
-    -ms-transform: rotate(-90deg) translateX(-100%);
-    border-bottom: 1px solid #CCC;
+  width: 100vh;
+  height: 40px;
+  background: white;
+  transform-origin: left top;
+  -webkit-transform-origin: left top;
+  -ms-transform-origin: left top;
+  transform: rotate(-90deg) translateX(-100%);
+  -webkit-transform: rotate(-90deg) translateX(-100%);
+  -ms-transform: rotate(-90deg) translateX(-100%);
+  border-bottom: 1px solid #ccc;
 }

 .main-nav-img {
-    width: 16px;
-    height: 16px;
-    margin: -32px 0 0 0;
-    transform: rotate(-90deg) translateX(-100%);
-    -webkit-transform: rotate(-90deg) translateX(-100%);
-    -ms-transform: rotate(-90deg) translateX(-100%);
+  width: 16px;
+  height: 16px;
+  margin: -32px 0 0 0;
+  transform: rotate(-90deg) translateX(-100%);
+  -webkit-transform: rotate(-90deg) translateX(-100%);
+  -ms-transform: rotate(-90deg) translateX(-100%);
 }

 .main-nav-img.main-nav-sub-img {
-    width: 16px;
-    height: 16px;
-    margin: 0px 0px 0 0;
-    transform: rotate(180deg) translateX(0%);
-    -webkit-transform: rotate(180deg) translateX(0%);
-    -ms-transform: rotate(180deg) translateX(0%);
-    position: absolute;
-    right: -8px;
-    top: 16px;
+  width: 16px;
+  height: 16px;
+  margin: 0px 0px 0 0;
+  transform: rotate(180deg) translateX(0%);
+  -webkit-transform: rotate(180deg) translateX(0%);
+  -ms-transform: rotate(180deg) translateX(0%);
+  position: absolute;
+  right: -8px;
+  top: 16px;
 }

 ul.nav {
-    margin: 0 auto;
-    margin-top: 0px;
-    margin-left: 0px;
+  margin: 0 auto;
+  margin-top: 0px;
+  margin-left: 0px;
 }

 .mini ul.nav li {
-    float: right;
-    line-height: 25px;
-    height: auto;
-    margin-top: 3px;
+  float: right;
+  line-height: 25px;
+  height: auto;
+  margin-top: 3px;
 }

 .spancolchildstyle {
-    padding: 4px;
+  padding: 4px;
 }

 .contextmenubutton {
-    float: right;
-    display: none;
+  float: right;
+  display: none;
 }

-.highlight:hover>.contextmenubutton {
-    display: unset;
+.highlight:hover > .contextmenubutton {
+  display: unset;
 }

-.highlight:hover>.contextmenubutton::after {
-    content: "\2026";
-    font-size: 12px;
+.highlight:hover > .contextmenubutton::after {
+  content: "\2026";
+  font-size: 12px;
 }

 .showEllipsis {
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-}
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -5583,6 +5583,11 @@
      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="
    },
+    "@types/lodash": {
+      "version": "4.14.171",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz",
+      "integrity": "sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg=="
+    },
    "@types/minimatch": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -20618,9 +20623,9 @@
      }
    },
    "playwright": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.10.0.tgz",
-      "integrity": "sha512-b7SGBcCPq4W3pb4ImEDmNXtO0ZkJbZMuWiShsaNJd+rGfY/6fqwgllsAojmxGSgFmijYw7WxCoPiAIEDIH16Kw==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.13.0.tgz",
+      "integrity": "sha512-GA5OyEeKx1v/pRcANmYncCT67Y7Y4N5zLRU5E690dn/Id10sooR5hQZmCDYsjXlutZb/1q0R3sITALnvhEjCjg==",
      "dev": true,
      "requires": {
        "commander": "^6.1.0",
@@ -20635,7 +20640,8 @@
        "proxy-from-env": "^1.1.0",
        "rimraf": "^3.0.2",
        "stack-utils": "^2.0.3",
-        "ws": "^7.3.1"
+        "ws": "^7.4.6",
+        "yazl": "^2.5.1"
      },
      "dependencies": {
        "commander": {
@@ -20667,6 +20673,12 @@
          "requires": {
            "escape-string-regexp": "^2.0.0"
          }
+        },
+        "ws": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+          "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+          "dev": true
        }
      }
    },
@@ -26157,6 +26169,15 @@
        "fd-slicer": "~1.1.0"
      }
    },
+    "yazl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3"
+      }
+    },
    "yocto-queue": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
    "@octokit/rest": "17.9.2",
    "@phosphor/widgets": "1.9.3",
    "@testing-library/jest-dom": "5.11.9",
+    "@types/lodash": "4.14.171",
    "@types/mkdirp": "1.0.1",
    "@types/node-fetch": "2.5.7",
    "applicationinsights": "1.8.0",
@@ -163,7 +164,7 @@
    "mini-css-extract-plugin": "0.4.3",
    "monaco-editor-webpack-plugin": "1.7.0",
    "node-fetch": "2.6.1",
-    "playwright": "1.10.0",
+    "playwright": "1.13.0",
    "prettier": "2.2.1",
    "raw-loader": "0.5.1",
    "react-dev-utils": "11.0.4",
--- a/src/Common/ResourceTreeContainer.tsx
+++ b/src/Common/ResourceTreeContainer.tsx
@@ -2,17 +2,22 @@ import React, { FunctionComponent } from "react";
 import arrowLeftImg from "../../images/imgarrowlefticon.svg";
 import refreshImg from "../../images/refresh-cosmos.svg";
 import { AuthType } from "../AuthType";
+import Explorer from "../Explorer/Explorer";
+import { ResourceTokenTree } from "../Explorer/Tree/ResourceTokenTree";
+import { ResourceTree } from "../Explorer/Tree/ResourceTree";
 import { userContext } from "../UserContext";

-export interface ResourceTreeProps {
+export interface ResourceTreeContainerProps {
  toggleLeftPaneExpanded: () => void;
  isLeftPaneExpanded: boolean;
+  container: Explorer;
 }

-export const ResourceTree: FunctionComponent<ResourceTreeProps> = ({
+export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps> = ({
  toggleLeftPaneExpanded,
  isLeftPaneExpanded,
-}: ResourceTreeProps): JSX.Element => {
+  container,
+}: ResourceTreeContainerProps): JSX.Element => {
  return (
    <div id="main" className={isLeftPaneExpanded ? "main" : "hiddenMain"}>
      {/* Collections Window - - Start */}
@@ -48,9 +53,11 @@ export const ResourceTree: FunctionComponent<ResourceTreeProps> = ({
          </div>
        </div>
        {userContext.authType === AuthType.ResourceToken ? (
-          <div style={{ overflowY: "auto" }} data-bind="react:resourceTreeForResourceToken" />
-        ) : (
+          <ResourceTokenTree />
+        ) : userContext.features.enableKOResourceTree ? (
          <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
+        ) : (
+          <ResourceTree container={container} />
        )}
      </div>
      {/*  Collections Window - End */}
--- a/src/Common/dataAccess/createCollection.test.ts
+++ b/src/Common/dataAccess/createCollection.test.ts
@@ -1,7 +1,10 @@
 jest.mock("../../Utils/arm/request");
 jest.mock("../CosmosClient");
+import ko from "knockout";
 import { AuthType } from "../../AuthType";
 import { CreateCollectionParams, DatabaseAccount } from "../../Contracts/DataModels";
+import { Database } from "../../Contracts/ViewModels";
+import { useDatabases } from "../../Explorer/useDatabases";
 import { updateUserContext } from "../../UserContext";
 import { armRequest } from "../../Utils/arm/request";
 import { client } from "../CosmosClient";
@@ -23,6 +26,15 @@ describe("createCollection", () => {
      } as DatabaseAccount,
      apiType: "SQL",
    });
+    useDatabases.setState({
+      databases: [
+        {
+          id: ko.observable("testDatabase"),
+          loadCollections: () => undefined,
+          collections: ko.observableArray([]),
+        } as Database,
+      ],
+    });
  });

  it("should call ARM if logged in with AAD", async () => {
--- a/src/Common/dataAccess/createCollection.ts
+++ b/src/Common/dataAccess/createCollection.ts
@@ -4,20 +4,16 @@ import { ContainerRequest } from "@azure/cosmos/dist-esm/client/Container/Contai
 import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
+import { useDatabases } from "../../Explorer/useDatabases";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
-import {
-  createUpdateCassandraTable,
-  getCassandraTable,
-} from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
-import { createUpdateGremlinGraph, getGremlinGraph } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
-import {
-  createUpdateMongoDBCollection,
-  getMongoDBCollection,
-} from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
-import { createUpdateSqlContainer, getSqlContainer } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
-import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/cosmos/tableResources";
+import { getCollectionName } from "../../Utils/APITypeUtils";
+import { createUpdateCassandraTable } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
+import { createUpdateGremlinGraph } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
+import { createUpdateMongoDBCollection } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
+import { createUpdateSqlContainer } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import { createUpdateTable } from "../../Utils/arm/generatedClients/cosmos/tableResources";
 import * as ARMTypes from "../../Utils/arm/generatedClients/cosmos/types";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
@@ -59,6 +55,16 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
 };

 const createCollectionWithARM = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
+  if (!params.createNewDatabase) {
+    const isValid = await useDatabases.getState().validateCollectionId(params.databaseId, params.collectionId);
+    if (!isValid) {
+      const collectionName = getCollectionName().toLocaleLowerCase();
+      throw new Error(
+        `Create ${collectionName} failed: ${collectionName} with id ${params.collectionId} already exists`
+      );
+    }
+  }
+
  const { apiType } = userContext;
  switch (apiType) {
    case "SQL":
@@ -77,23 +83,6 @@ const createCollectionWithARM = async (params: DataModels.CreateCollectionParams
 };

 const createSqlContainer = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  try {
-    const getResponse = await getSqlContainer(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId,
-      params.collectionId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create container failed: container with id ${params.collectionId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.SqlContainerResource = {
    id: params.collectionId,
@@ -131,23 +120,6 @@ const createSqlContainer = async (params: DataModels.CreateCollectionParams): Pr

 const createMongoCollection = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
  const mongoWildcardIndexOnAllFields: ARMTypes.MongoIndex[] = [{ key: { keys: ["$**"] } }, { key: { keys: ["_id"] } }];
-  try {
-    const getResponse = await getMongoDBCollection(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId,
-      params.collectionId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create collection failed: collection with id ${params.collectionId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.MongoDBCollectionResource = {
    id: params.collectionId,
@@ -189,23 +161,6 @@ const createMongoCollection = async (params: DataModels.CreateCollectionParams):
 };

 const createCassandraTable = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  try {
-    const getResponse = await getCassandraTable(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId,
-      params.collectionId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create table failed: table with id ${params.collectionId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.CassandraTableResource = {
    id: params.collectionId,
@@ -233,23 +188,6 @@ const createCassandraTable = async (params: DataModels.CreateCollectionParams):
 };

 const createGraph = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  try {
-    const getResponse = await getGremlinGraph(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId,
-      params.collectionId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create graph failed: graph with id ${params.collectionId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.GremlinGraphResource = {
    id: params.collectionId,
@@ -284,22 +222,6 @@ const createGraph = async (params: DataModels.CreateCollectionParams): Promise<D
 };

 const createTable = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  try {
-    const getResponse = await getTable(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.collectionId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create table failed: table with id ${params.collectionId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.TableResource = {
    id: params.collectionId,
--- a/src/Common/dataAccess/createDatabase.ts
+++ b/src/Common/dataAccess/createDatabase.ts
@@ -2,20 +2,13 @@ import { DatabaseResponse } from "@azure/cosmos";
 import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
+import { useDatabases } from "../../Explorer/useDatabases";
 import { userContext } from "../../UserContext";
-import {
-  createUpdateCassandraKeyspace,
-  getCassandraKeyspace,
-} from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
-import {
-  createUpdateGremlinDatabase,
-  getGremlinDatabase,
-} from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
-import {
-  createUpdateMongoDBDatabase,
-  getMongoDBDatabase,
-} from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
-import { createUpdateSqlDatabase, getSqlDatabase } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import { getDatabaseName } from "../../Utils/APITypeUtils";
+import { createUpdateCassandraKeyspace } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
+import { createUpdateGremlinDatabase } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
+import { createUpdateMongoDBDatabase } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
+import { createUpdateSqlDatabase } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
 import {
  CassandraKeyspaceCreateUpdateParameters,
  CreateUpdateOptions,
@@ -48,6 +41,11 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
 }

 async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
+  if (!useDatabases.getState().validateDatabaseId(params.databaseId)) {
+    const databaseName = getDatabaseName().toLocaleLowerCase();
+    throw new Error(`Create ${databaseName} failed: ${databaseName} with id ${params.databaseId} already exists`);
+  }
+
  const { apiType } = userContext;

  switch (apiType) {
@@ -65,22 +63,6 @@ async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): P
 }

 async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getSqlDatabase(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: SqlDatabaseCreateUpdateParameters = {
    properties: {
@@ -101,22 +83,6 @@ async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promi
 }

 async function createMongoDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getMongoDBDatabase(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: MongoDBDatabaseCreateUpdateParameters = {
    properties: {
@@ -137,22 +103,6 @@ async function createMongoDatabase(params: DataModels.CreateDatabaseParams): Pro
 }

 async function createCassandraKeyspace(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getCassandraKeyspace(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: CassandraKeyspaceCreateUpdateParameters = {
    properties: {
@@ -173,22 +123,6 @@ async function createCassandraKeyspace(params: DataModels.CreateDatabaseParams):
 }

 async function createGremlineDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getGremlinDatabase(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: GremlinDatabaseCreateUpdateParameters = {
    properties: {
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -42,19 +42,6 @@ exports[`SettingsComponent renders 1`] = `
                "resourceTree": ResourceTreeAdapter {
                  "container": [Circular],
                  "copyNotebook": [Function],
-                  "gitHubOAuthService": GitHubOAuthService {
-                    "junoClient": JunoClient {
-                      "cachedPinnedRepos": [Function],
-                    },
-                    "token": [Function],
-                  },
-                  "junoClient": JunoClient {
-                    "cachedPinnedRepos": [Function],
-                  },
-                  "parameters": [Function],
-                },
-                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
-                  "container": [Circular],
                  "parameters": [Function],
                },
              },
@@ -122,19 +109,6 @@ exports[`SettingsComponent renders 1`] = `
                "resourceTree": ResourceTreeAdapter {
                  "container": [Circular],
                  "copyNotebook": [Function],
-                  "gitHubOAuthService": GitHubOAuthService {
-                    "junoClient": JunoClient {
-                      "cachedPinnedRepos": [Function],
-                    },
-                    "token": [Function],
-                  },
-                  "junoClient": JunoClient {
-                    "cachedPinnedRepos": [Function],
-                  },
-                  "parameters": [Function],
-                },
-                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
-                  "container": [Circular],
                  "parameters": [Function],
                },
              },
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -59,7 +59,6 @@ import TerminalTab from "./Tabs/TerminalTab";
 import Database from "./Tree/Database";
 import ResourceTokenCollection from "./Tree/ResourceTokenCollection";
 import { ResourceTreeAdapter } from "./Tree/ResourceTreeAdapter";
-import { ResourceTreeAdapterForResourceToken } from "./Tree/ResourceTreeAdapterForResourceToken";
 import StoredProcedure from "./Tree/StoredProcedure";
 import { useDatabases } from "./useDatabases";
 import { useSelectedNode } from "./useSelectedNode";
@@ -74,9 +73,6 @@ export default class Explorer {
  // Resource Tree
  private resourceTree: ResourceTreeAdapter;

-  // Resource Token
-  public resourceTreeForResourceToken: ResourceTreeAdapterForResourceToken;
-
  // Tabs
  public isTabsContentExpanded: ko.Observable<boolean>;

@@ -186,7 +182,6 @@ export default class Explorer {
    );

    this.resourceTree = new ResourceTreeAdapter(this);
-    this.resourceTreeForResourceToken = new ResourceTreeAdapterForResourceToken(this);

    // Override notebook server parameters from URL parameters
    if (userContext.features.notebookServerUrl && userContext.features.notebookServerToken) {
@@ -362,6 +357,9 @@ export default class Explorer {
      notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.notebookServerEndpoint,
      authToken: userContext.features.notebookServerToken || connectionInfo.authToken,
    });
+
+    useNotebook.getState().initializeNotebooksTree(this.notebookManager);
+
    this.refreshNotebookList();

    this._isInitializingNotebooks = false;
@@ -842,6 +840,8 @@ export default class Explorer {
    }

    await this.resourceTree.initialize();
+    await useNotebook.getState().initializeNotebooksTree(this.notebookManager);
+
    this.notebookManager?.refreshPinnedRepos();
    if (this.notebookToImport) {
      this.importAndOpenContent(this.notebookToImport.name, this.notebookToImport.content);
@@ -932,14 +932,15 @@ export default class Explorer {
      .finally(clearInProgressMessage);
  }

-  public refreshContentItem(item: NotebookContentItem): Promise<void> {
+  // TODO: Delete this function when ResourceTreeAdapter is removed.
+  public async refreshContentItem(item: NotebookContentItem): Promise<void> {
    if (!useNotebook.getState().isNotebookEnabled || !this.notebookManager?.notebookContentClient) {
      const error = "Attempt to refresh notebook list, but notebook is not enabled";
      handleError(error, "Explorer/refreshContentItem");
      return Promise.reject(new Error(error));
    }

-    return this.notebookManager?.notebookContentClient.updateItemChildren(item);
+    await this.notebookManager?.notebookContentClient.updateItemChildrenInPlace(item);
  }

  public openNotebookTerminal(kind: ViewModels.TerminalKind) {
--- a/src/Explorer/Notebook/NotebookComponent/actions.ts
+++ b/src/Explorer/Notebook/NotebookComponent/actions.ts
@@ -54,11 +54,11 @@ export const SET_HOVERED_CELL = "SET_HOVERED_CELL";
 export interface SetHoveredCellAction {
  type: "SET_HOVERED_CELL";
  payload: {
-    cellId: CellId;
+    cellId?: CellId;
  };
 }

-export const setHoveredCell = (payload: { cellId: CellId }): SetHoveredCellAction => {
+export const setHoveredCell = (payload: { cellId?: CellId }): SetHoveredCellAction => {
  return {
    type: SET_HOVERED_CELL,
    payload,
--- a/src/Explorer/Notebook/NotebookContentClient.ts
+++ b/src/Explorer/Notebook/NotebookContentClient.ts
@@ -1,5 +1,6 @@
 import { stringifyNotebook } from "@nteract/commutable";
 import { FileType, IContent, IContentProvider, IEmptyContent, ServerConfig } from "@nteract/core";
+import { cloneDeep } from "lodash";
 import { AjaxResponse } from "rxjs/ajax";
 import * as StringUtils from "../../Utils/StringUtils";
 import * as FileSystemUtil from "./FileSystemUtil";
@@ -14,7 +15,17 @@ export class NotebookContentClient {
   * This updates the item and points all the children's parent to this item
   * @param item
   */
-  public updateItemChildren(item: NotebookContentItem): Promise<void> {
+  public async updateItemChildren(item: NotebookContentItem): Promise<NotebookContentItem> {
+    const subItems = await this.fetchNotebookFiles(item.path);
+    const clonedItem = cloneDeep(item);
+    subItems.forEach((subItem) => (subItem.parent = clonedItem));
+    clonedItem.children = subItems;
+
+    return clonedItem;
+  }
+
+  // TODO: Delete this function when ResourceTreeAdapter is removed.
+  public async updateItemChildrenInPlace(item: NotebookContentItem): Promise<void> {
    return this.fetchNotebookFiles(item.path).then((subItems) => {
      item.children = subItems;
      subItems.forEach((subItem) => (subItem.parent = item));
@@ -55,18 +66,20 @@ export class NotebookContentClient {
      });
  }

-  public deleteContentItem(item: NotebookContentItem): Promise<void> {
-    return this.deleteNotebookFile(item.path).then((path: string) => {
-      if (!path || path !== item.path) {
-        throw new Error("No path provided");
-      }
+  public async deleteContentItem(item: NotebookContentItem): Promise<void> {
+    const path = await this.deleteNotebookFile(item.path);
+    useNotebook.getState().deleteNotebookItem(item);

-      if (item.parent && item.parent.children) {
-        // Remove deleted child
-        const newChildren = item.parent.children.filter((child) => child.path !== path);
-        item.parent.children = newChildren;
-      }
-    });
+    // TODO: Delete once old resource tree is removed
+    if (!path || path !== item.path) {
+      throw new Error("No path provided");
+    }
+
+    if (item.parent && item.parent.children) {
+      // Remove deleted child
+      const newChildren = item.parent.children.filter((child) => child.path !== path);
+      item.parent.children = newChildren;
+    }
  }

  /**
--- a/src/Explorer/Notebook/NotebookManager.tsx
+++ b/src/Explorer/Notebook/NotebookManager.tsx
@@ -29,6 +29,7 @@ import { SnapshotRequest } from "./NotebookComponent/types";
 import { NotebookContainerClient } from "./NotebookContainerClient";
 import { NotebookContentClient } from "./NotebookContentClient";
 import { SchemaAnalyzerNotebook } from "./SchemaAnalyzer/SchemaAnalyzerUtils";
+import { useNotebook } from "./useNotebook";

 type NotebookPaneContent = string | ImmutableNotebook;

@@ -110,6 +111,7 @@ export default class NotebookManager {
    this.junoClient.subscribeToPinnedRepos((pinnedRepos) => {
      this.params.resourceTree.initializeGitHubRepos(pinnedRepos);
      this.params.resourceTree.triggerRender();
+      useNotebook.getState().initializeGitHubRepos(pinnedRepos);
    });
    this.refreshPinnedRepos();
  }
@@ -141,6 +143,7 @@ export default class NotebookManager {
          notebookContentRef={notebookContentRef}
          onTakeSnapshot={onTakeSnapshot}
        />,
+        "440px",
        onClosePanel
      );
  }
--- a/src/Explorer/Notebook/useNotebook.ts
+++ b/src/Explorer/Notebook/useNotebook.ts
@@ -1,3 +1,4 @@
+import { cloneDeep } from "lodash";
 import create, { UseStore } from "zustand";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
@@ -5,8 +6,14 @@ import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
+import { IPinnedRepo } from "../../Juno/JunoClient";
+import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
 import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
+import * as GitHubUtils from "../../Utils/GitHubUtils";
+import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";
+import NotebookManager from "./NotebookManager";

 interface NotebookState {
  isNotebookEnabled: boolean;
@@ -18,6 +25,9 @@ interface NotebookState {
  isShellEnabled: boolean;
  notebookBasePath: string;
  isInitializingNotebooks: boolean;
+  myNotebooksContentRoot: NotebookContentItem;
+  gitHubNotebooksContentRoot: NotebookContentItem;
+  galleryContentRoot: NotebookContentItem;
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -27,9 +37,14 @@ interface NotebookState {
  setIsShellEnabled: (isShellEnabled: boolean) => void;
  setNotebookBasePath: (notebookBasePath: string) => void;
  refreshNotebooksEnabledStateForAccount: () => Promise<void>;
+  findItem: (root: NotebookContentItem, item: NotebookContentItem) => NotebookContentItem;
+  updateNotebookItem: (item: NotebookContentItem) => void;
+  deleteNotebookItem: (item: NotebookContentItem) => void;
+  initializeNotebooksTree: (notebookManager: NotebookManager) => Promise<void>;
+  initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]) => void;
 }

-export const useNotebook: UseStore<NotebookState> = create((set) => ({
+export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  isNotebookEnabled: false,
  isNotebooksEnabledForAccount: false,
  notebookServerInfo: {
@@ -46,6 +61,9 @@ export const useNotebook: UseStore<NotebookState> = create((set) => ({
  isShellEnabled: false,
  notebookBasePath: Constants.Notebook.defaultBasePath,
  isInitializingNotebooks: false,
+  myNotebooksContentRoot: undefined,
+  gitHubNotebooksContentRoot: undefined,
+  galleryContentRoot: undefined,
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -103,4 +121,115 @@ export const useNotebook: UseStore<NotebookState> = create((set) => ({
      set({ isNotebooksEnabledForAccount: false });
    }
  },
+  findItem: (root: NotebookContentItem, item: NotebookContentItem): NotebookContentItem => {
+    const currentItem = root || get().myNotebooksContentRoot;
+
+    if (currentItem) {
+      if (currentItem.path === item.path && currentItem.name === item.name) {
+        return currentItem;
+      }
+
+      if (currentItem.children) {
+        for (const childItem of currentItem.children) {
+          const result = get().findItem(childItem, item);
+          if (result) {
+            return result;
+          }
+        }
+      }
+    }
+
+    return undefined;
+  },
+  updateNotebookItem: (item: NotebookContentItem): void => {
+    const root = cloneDeep(get().myNotebooksContentRoot);
+    const parentItem = get().findItem(root, item.parent);
+    parentItem.children = parentItem.children.filter((child) => child.path !== item.path);
+    parentItem.children.push(item);
+    item.parent = parentItem;
+    set({ myNotebooksContentRoot: root });
+  },
+  deleteNotebookItem: (item: NotebookContentItem): void => {
+    const root = cloneDeep(get().myNotebooksContentRoot);
+    const parentItem = get().findItem(root, item.parent);
+    parentItem.children = parentItem.children.filter((child) => child.path !== item.path);
+    set({ myNotebooksContentRoot: root });
+  },
+  initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
+    const myNotebooksContentRoot = {
+      name: "My Notebooks",
+      path: get().notebookBasePath,
+      type: NotebookContentItemType.Directory,
+    };
+    const galleryContentRoot = {
+      name: "Gallery",
+      path: "Gallery",
+      type: NotebookContentItemType.File,
+    };
+    const gitHubNotebooksContentRoot = notebookManager?.gitHubOAuthService?.isLoggedIn()
+      ? {
+          name: "GitHub repos",
+          path: "PsuedoDir",
+          type: NotebookContentItemType.Directory,
+        }
+      : undefined;
+    set({
+      myNotebooksContentRoot,
+      galleryContentRoot,
+      gitHubNotebooksContentRoot,
+    });
+
+    if (get().notebookServerInfo?.notebookServerEndpoint) {
+      const updatedRoot = await notebookManager?.notebookContentClient?.updateItemChildren(myNotebooksContentRoot);
+      set({ myNotebooksContentRoot: updatedRoot });
+
+      if (updatedRoot?.children) {
+        // Count 1st generation children (tree is lazy-loaded)
+        const nodeCounts = { files: 0, notebooks: 0, directories: 0 };
+        updatedRoot.children.forEach((notebookItem) => {
+          switch (notebookItem.type) {
+            case NotebookContentItemType.File:
+              nodeCounts.files++;
+              break;
+            case NotebookContentItemType.Directory:
+              nodeCounts.directories++;
+              break;
+            case NotebookContentItemType.Notebook:
+              nodeCounts.notebooks++;
+              break;
+            default:
+              break;
+          }
+        });
+        TelemetryProcessor.trace(Action.RefreshResourceTreeMyNotebooks, ActionModifiers.Mark, { ...nodeCounts });
+      }
+    }
+  },
+  initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]): void => {
+    const gitHubNotebooksContentRoot = cloneDeep(get().gitHubNotebooksContentRoot);
+    if (gitHubNotebooksContentRoot) {
+      gitHubNotebooksContentRoot.children = [];
+      pinnedRepos?.forEach((pinnedRepo) => {
+        const repoFullName = GitHubUtils.toRepoFullName(pinnedRepo.owner, pinnedRepo.name);
+        const repoTreeItem: NotebookContentItem = {
+          name: repoFullName,
+          path: "PsuedoDir",
+          type: NotebookContentItemType.Directory,
+          children: [],
+        };
+
+        pinnedRepo.branches.forEach((branch) => {
+          repoTreeItem.children.push({
+            name: branch.name,
+            path: GitHubUtils.toContentUri(pinnedRepo.owner, pinnedRepo.name, branch.name, ""),
+            type: NotebookContentItemType.Directory,
+          });
+        });
+
+        gitHubNotebooksContentRoot.children.push(repoTreeItem);
+      });
+
+      set({ gitHubNotebooksContentRoot });
+    }
+  },
 }));
--- a/src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx
+++ b/src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx
@@ -26,7 +26,7 @@ export interface InputParameterProps {
  onDeleteParamKeyPress?: () => void;
  onAddNewParamKeyPress?: () => void;
  onParamValueChange: (event: React.FormEvent<HTMLElement>, newInput?: string) => void;
-  onParamKeyChange: (event: React.FormEvent<HTMLElement>, selectedParam: IDropdownOption) => void;
+  onParamKeyChange: (event: React.FormEvent<HTMLElement>, selectedParam?: IDropdownOption) => void;
  paramValue: string;
  selectedKey: string | number;
 }
--- a/src/Explorer/Panes/GitHubReposPanel/snapshots/GitHubReposPanel.test.tsx.snap
+++ b/src/Explorer/Panes/GitHubReposPanel/snapshots/GitHubReposPanel.test.tsx.snap
@@ -31,19 +31,6 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
            "resourceTree": ResourceTreeAdapter {
              "container": [Circular],
              "copyNotebook": [Function],
-              "gitHubOAuthService": GitHubOAuthService {
-                "junoClient": JunoClient {
-                  "cachedPinnedRepos": [Function],
-                },
-                "token": [Function],
-              },
-              "junoClient": JunoClient {
-                "cachedPinnedRepos": [Function],
-              },
-              "parameters": [Function],
-            },
-            "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
-              "container": [Circular],
              "parameters": [Function],
            },
          },
--- a/src/Explorer/Panes/PanelComponent.less
+++ b/src/Explorer/Panes/PanelComponent.less
@@ -150,9 +150,6 @@
 .backImageIcon {
  margin-top: 8px;
 }
-.entityValueTextField {
-  margin: 24px;
-}
 .addEntityDatePicker {
  max-width: 145px;
 }
--- a/src/Explorer/Panes/PanelContainerComponent.tsx
+++ b/src/Explorer/Panes/PanelContainerComponent.tsx
@@ -85,11 +85,12 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps

 export const SidePanel: React.FC = () => {
  const isConsoleExpanded = useNotificationConsole((state) => state.isExpanded);
-  const { isOpen, panelContent, headerText } = useSidePanel((state) => {
+  const { isOpen, panelContent, panelWidth, headerText } = useSidePanel((state) => {
    return {
      isOpen: state.isOpen,
      panelContent: state.panelContent,
      headerText: state.headerText,
+      panelWidth: state.panelWidth,
    };
  });
  // TODO Refactor PanelContainerComponent into a functional component and remove this wrapper
@@ -100,6 +101,7 @@ export const SidePanel: React.FC = () => {
      panelContent={panelContent}
      headerText={headerText}
      isConsoleExpanded={isConsoleExpanded}
+      panelWidth={panelWidth}
    />
  );
 };
--- a/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
+++ b/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
@@ -21,19 +21,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
      "resourceTree": ResourceTreeAdapter {
        "container": [Circular],
        "copyNotebook": [Function],
-        "gitHubOAuthService": GitHubOAuthService {
-          "junoClient": JunoClient {
-            "cachedPinnedRepos": [Function],
-          },
-          "token": [Function],
-        },
-        "junoClient": JunoClient {
-          "cachedPinnedRepos": [Function],
-        },
-        "parameters": [Function],
-      },
-      "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
-        "container": [Circular],
        "parameters": [Function],
      },
    }
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
@@ -1,11 +1,11 @@
-import { IDropdownOption, Image, IPanelProps, IRenderFunction, Label, Stack, Text, TextField } from "@fluentui/react";
+import { IDropdownOption, Image, Label, Stack, Text, TextField } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as _ from "underscore";
 import AddPropertyIcon from "../../../../images/Add-property.svg";
 import RevertBackIcon from "../../../../images/RevertBack.svg";
+import { getErrorMessage, handleError } from "../../../Common/ErrorHandlingUtils";
 import { TableEntity } from "../../../Common/TableEntity";
-import { useSidePanel } from "../../../hooks/useSidePanel";
 import { userContext } from "../../../UserContext";
 import * as TableConstants from "../../Tables/Constants";
 import * as DataTableUtilities from "../../Tables/DataTable/DataTableUtilities";
@@ -15,7 +15,7 @@ import { CassandraAPIDataClient, CassandraTableKey, TableDataClient } from "../.
 import * as TableEntityProcessor from "../../Tables/TableEntityProcessor";
 import * as Utilities from "../../Tables/Utilities";
 import QueryTablesTab from "../../Tabs/QueryTablesTab";
-import { PanelContainerComponent } from "../PanelContainerComponent";
+import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 import {
  attributeNameLabel,
  attributeValueLabel,
@@ -30,9 +30,7 @@ import {
  getCassandraDefaultEntities,
  getDefaultEntities,
  getEntityValuePlaceholder,
-  getPanelTitle,
  imageProps,
-  isValidEntities,
  options,
 } from "./Validators/EntityTableHelper";

@@ -61,7 +59,6 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
  tableEntityListViewModel,
  cassandraApiClient,
 }: AddTableEntityPanelProps): JSX.Element => {
-  const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
  const [entities, setEntities] = useState<EntityRowType[]>([]);
  const [selectedRow, setSelectedRow] = useState<number>(0);
  const [entityAttributeValue, setEntityAttributeValue] = useState<string>("");
@@ -70,6 +67,8 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
    isEntityValuePanelOpen,
    { setTrue: setIsEntityValuePanelTrue, setFalse: setIsEntityValuePanelFalse },
  ] = useBoolean(false);
+  const [formError, setFormError] = useState<string>("");
+  const [isExecuting, setIsExecuting] = useState<boolean>(false);

  /* Get default and previous saved entity headers */
  useEffect(() => {
@@ -98,19 +97,36 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
  };

  /* Add new entity attribute */
-  const submit = async (event: React.FormEvent<HTMLInputElement>): Promise<void> => {
-    if (!isValidEntities(entities)) {
-      return undefined;
-    }
-    event.preventDefault();
+  const onSubmit = async (): Promise<void> => {
+    for (let i = 0; i < entities.length; i++) {
+      const { property, type } = entities[i];
+      if (property === "" || property === undefined) {
+        setFormError(`Property name cannot be empty. Please enter a property name`);
+        return;
+      }

+      if (!type) {
+        setFormError(`Property type cannot be empty. Please select a type from the dropdown for property ${property}`);
+        return;
+      }
+    }
+
+    setIsExecuting(true);
    const entity: Entities.ITableEntity = entityFromAttributes(entities);
    const newEntity: Entities.ITableEntity = await tableDataClient.createDocument(queryTablesTab.collection, entity);
-    await tableEntityListViewModel.addEntityToCache(newEntity);
-    if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
-      tableEntityListViewModel.redrawTableThrottled();
+    try {
+      await tableEntityListViewModel.addEntityToCache(newEntity);
+      if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
+        tableEntityListViewModel.redrawTableThrottled();
+      }
+    } catch (error) {
+      const errorMessage = getErrorMessage(error);
+      setFormError(errorMessage);
+      handleError(errorMessage, "AddTableRow");
+      throw error;
+    } finally {
+      setIsExecuting(false);
    }
-    closeSidePanel();
  };

  const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
@@ -200,110 +216,80 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
    setIsEntityValuePanelTrue();
  };

-  const renderPanelContent = (): JSX.Element => {
-    return (
-      <form className="panelFormWrapper">
-        <div className="panelFormWrapper">
-          <div className="panelMainContent">
-            {entities.map((entity, index) => {
-              return (
-                <TableEntity
-                  key={"" + entity.id + index}
-                  isDeleteOptionVisible={entity.isDeleteOptionVisible}
-                  entityTypeLabel={index === 0 && dataTypeLabel}
-                  entityPropertyLabel={index === 0 && attributeNameLabel}
-                  entityValueLabel={index === 0 && attributeValueLabel}
-                  options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
-                  isPropertyTypeDisable={entity.isPropertyTypeDisable}
-                  entityProperty={entity.property}
-                  selectedKey={entity.type}
-                  entityPropertyPlaceHolder={detailedHelp}
-                  entityValuePlaceholder={entity.entityValuePlaceholder}
-                  entityValue={entity.value}
-                  isEntityTypeDate={entity.isEntityTypeDate}
-                  entityTimeValue={entity.entityTimeValue}
-                  onEditEntity={() => editEntity(index)}
-                  onSelectDate={(date: Date) => {
-                    entityChange(date, index, "value");
-                  }}
-                  onDeleteEntity={() => deleteEntityAtIndex(index)}
-                  onEntityPropertyChange={(event, newInput?: string) => {
-                    entityChange(newInput, index, "property");
-                  }}
-                  onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
-                    entityTypeChange(event, selectedParam, index);
-                  }}
-                  onEntityValueChange={(event, newInput?: string) => {
-                    entityChange(newInput, index, "value");
-                  }}
-                  onEntityTimeValueChange={(event, newInput?: string) => {
-                    entityChange(newInput, index, "time");
-                  }}
-                />
-              );
-            })}
-            {userContext.apiType !== "Cassandra" && (
-              <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
-                <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
-                <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
-              </Stack>
-            )}
-          </div>
-          <div className="paneFooter">
-            <div className="leftpanel-okbut">
-              <input
-                type="submit"
-                onClick={submit}
-                className="genericPaneSubmitBtn"
-                value={getButtonLabel(userContext.apiType)}
-              />
-            </div>
-          </div>
-        </div>
-      </form>
-    );
-  };
-
-  const onRenderNavigationContent: IRenderFunction<IPanelProps> = () => {
-    return (
-      <Stack horizontal {...columnProps}>
-        <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
-        <Label>{entityAttributeProperty}</Label>
-      </Stack>
-    );
-  };
-
  if (isEntityValuePanelOpen) {
    return (
-      <PanelContainerComponent
-        headerText=""
-        onRenderNavigationContent={onRenderNavigationContent}
-        panelWidth="700px"
-        isOpen={true}
-        panelContent={
-          <TextField
-            multiline
-            rows={5}
-            className="entityValueTextField"
-            value={entityAttributeValue}
-            onChange={(event, newInput?: string) => {
-              entityChange(newInput, selectedRow, "value");
-              setEntityAttributeValue(newInput);
-            }}
-          />
-        }
-        isConsoleExpanded={false}
-      />
+      <Stack style={{ padding: "20px 34px" }}>
+        <Stack horizontal {...columnProps}>
+          <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
+          <Label>{entityAttributeProperty}</Label>
+        </Stack>
+        <TextField
+          multiline
+          rows={5}
+          value={entityAttributeValue}
+          onChange={(event, newInput?: string) => {
+            entityChange(newInput, selectedRow, "value");
+            setEntityAttributeValue(newInput);
+          }}
+        />
+      </Stack>
    );
  }

+  const props: RightPaneFormProps = {
+    formError,
+    isExecuting,
+    submitButtonText: getButtonLabel(userContext.apiType),
+    onSubmit,
+  };
+
  return (
-    <PanelContainerComponent
-      headerText={getPanelTitle(userContext.apiType)}
-      panelWidth="700px"
-      isOpen={true}
-      panelContent={renderPanelContent()}
-      isConsoleExpanded={false}
-    />
+    <RightPaneForm {...props}>
+      <div className="panelMainContent">
+        {entities.map((entity, index) => {
+          return (
+            <TableEntity
+              key={"" + entity.id + index}
+              isDeleteOptionVisible={entity.isDeleteOptionVisible}
+              entityTypeLabel={index === 0 && dataTypeLabel}
+              entityPropertyLabel={index === 0 && attributeNameLabel}
+              entityValueLabel={index === 0 && attributeValueLabel}
+              options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
+              isPropertyTypeDisable={entity.isPropertyTypeDisable}
+              entityProperty={entity.property}
+              selectedKey={entity.type}
+              entityPropertyPlaceHolder={detailedHelp}
+              entityValuePlaceholder={entity.entityValuePlaceholder}
+              entityValue={entity.value}
+              isEntityTypeDate={entity.isEntityTypeDate}
+              entityTimeValue={entity.entityTimeValue}
+              onEditEntity={() => editEntity(index)}
+              onSelectDate={(date: Date) => {
+                entityChange(date, index, "value");
+              }}
+              onDeleteEntity={() => deleteEntityAtIndex(index)}
+              onEntityPropertyChange={(event, newInput?: string) => {
+                entityChange(newInput, index, "property");
+              }}
+              onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
+                entityTypeChange(event, selectedParam, index);
+              }}
+              onEntityValueChange={(event, newInput?: string) => {
+                entityChange(newInput, index, "value");
+              }}
+              onEntityTimeValueChange={(event, newInput?: string) => {
+                entityChange(newInput, index, "time");
+              }}
+            />
+          );
+        })}
+        {userContext.apiType !== "Cassandra" && (
+          <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
+            <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
+            <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
+          </Stack>
+        )}
+      </div>
+    </RightPaneForm>
  );
 };
--- a/src/Explorer/Panes/Tables/EditTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/EditTableEntityPanel.tsx
@@ -1,11 +1,11 @@
-import { IDropdownOption, Image, IPanelProps, IRenderFunction, Label, Stack, Text, TextField } from "@fluentui/react";
+import { IDropdownOption, Image, Label, Stack, Text, TextField } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as _ from "underscore";
 import AddPropertyIcon from "../../../../images/Add-property.svg";
 import RevertBackIcon from "../../../../images/RevertBack.svg";
+import { getErrorMessage, handleError } from "../../../Common/ErrorHandlingUtils";
 import { TableEntity } from "../../../Common/TableEntity";
-import { useSidePanel } from "../../../hooks/useSidePanel";
 import { userContext } from "../../../UserContext";
 import * as TableConstants from "../../Tables/Constants";
 import * as DataTableUtilities from "../../Tables/DataTable/DataTableUtilities";
@@ -14,7 +14,7 @@ import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TableDataClient } from "../../Tables/TableDataClient";
 import * as TableEntityProcessor from "../../Tables/TableEntityProcessor";
 import QueryTablesTab from "../../Tabs/QueryTablesTab";
-import { PanelContainerComponent } from "../PanelContainerComponent";
+import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 import {
  attributeNameLabel,
  attributeValueLabel,
@@ -29,7 +29,6 @@ import {
  getEntityValuePlaceholder,
  getFormattedTime,
  imageProps,
-  isValidEntities,
  options,
 } from "./Validators/EntityTableHelper";

@@ -59,12 +58,13 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
  tableEntityListViewModel,
  cassandraApiClient,
 }: EditTableEntityPanelProps): JSX.Element => {
-  const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
  const [entities, setEntities] = useState<EntityRowType[]>([]);
  const [selectedRow, setSelectedRow] = useState<number>(0);
  const [entityAttributeValue, setEntityAttributeValue] = useState<string>("");
  const [originalDocument, setOriginalDocument] = useState<Entities.ITableEntity>({});
  const [entityAttributeProperty, setEntityAttributeProperty] = useState<string>("");
+  const [formError, setFormError] = useState<string>("");
+  const [isExecuting, setIsExecuting] = useState<boolean>(false);

  const [
    isEntityValuePanelOpen,
@@ -190,26 +190,44 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
    return displayValue;
  };

-  const submit = async (event: React.FormEvent<HTMLInputElement>): Promise<void> => {
-    if (!isValidEntities(entities)) {
-      return undefined;
+  const onSubmit = async (): Promise<void> => {
+    for (let i = 0; i < entities.length; i++) {
+      const { property, type } = entities[i];
+      if (property === "" || property === undefined) {
+        setFormError(`Property name cannot be empty. Please enter a property name`);
+        return;
+      }
+
+      if (!type) {
+        setFormError(`Property type cannot be empty. Please select a type from the dropdown for property ${property}`);
+        return;
+      }
    }
-    event.preventDefault();
+
+    setIsExecuting(true);
    const entity: Entities.ITableEntity = entityFromAttributes(entities);
    const newTableDataClient = userContext.apiType === "Cassandra" ? cassandraApiClient : tableDataClient;
    const originalDocumentData = userContext.apiType === "Cassandra" ? originalDocument[0] : originalDocument;
-    const newEntity: Entities.ITableEntity = await newTableDataClient.updateDocument(
-      queryTablesTab.collection,
-      originalDocumentData,
-      entity
-    );
-    await tableEntityListViewModel.updateCachedEntity(newEntity);
-    if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
-      tableEntityListViewModel.redrawTableThrottled();
+
+    try {
+      const newEntity: Entities.ITableEntity = await newTableDataClient.updateDocument(
+        queryTablesTab.collection,
+        originalDocumentData,
+        entity
+      );
+      await tableEntityListViewModel.updateCachedEntity(newEntity);
+      if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
+        tableEntityListViewModel.redrawTableThrottled();
+      }
+      tableEntityListViewModel.selected.removeAll();
+      tableEntityListViewModel.selected.push(newEntity);
+    } catch (error) {
+      const errorMessage = getErrorMessage(error);
+      handleError(errorMessage, "EditTableRow");
+      throw error;
+    } finally {
+      setIsExecuting(false);
    }
-    tableEntityListViewModel.selected.removeAll();
-    tableEntityListViewModel.selected.push(newEntity);
-    closeSidePanel();
  };

  const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
@@ -299,109 +317,81 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
    setIsEntityValuePanelTrue();
  };

-  const renderPanelContent = (): JSX.Element => {
-    return (
-      <form className="panelFormWrapper">
-        <div className="panelFormWrapper">
-          <div className="panelMainContent">
-            {entities.map((entity, index) => {
-              return (
-                <TableEntity
-                  key={"" + entity.id + index}
-                  isDeleteOptionVisible={entity.isDeleteOptionVisible}
-                  entityTypeLabel={index === 0 && dataTypeLabel}
-                  entityPropertyLabel={index === 0 && attributeNameLabel}
-                  entityValueLabel={index === 0 && attributeValueLabel}
-                  options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
-                  isPropertyTypeDisable={entity.isPropertyTypeDisable}
-                  entityProperty={entity.property}
-                  selectedKey={entity.type}
-                  entityPropertyPlaceHolder={detailedHelp}
-                  entityValuePlaceholder={entity.entityValuePlaceholder}
-                  entityValue={entity.value?.toString()}
-                  isEntityTypeDate={entity.isEntityTypeDate}
-                  entityTimeValue={entity.entityTimeValue}
-                  isEntityValueDisable={entity.isEntityValueDisable}
-                  onEditEntity={() => editEntity(index)}
-                  onSelectDate={(date: Date) => {
-                    entityChange(date, index, "value");
-                  }}
-                  onDeleteEntity={() => deleteEntityAtIndex(index)}
-                  onEntityPropertyChange={(event, newInput?: string) => {
-                    entityChange(newInput, index, "property");
-                  }}
-                  onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
-                    entityTypeChange(event, selectedParam, index);
-                  }}
-                  onEntityValueChange={(event, newInput?: string) => {
-                    entityChange(newInput, index, "value");
-                  }}
-                  onEntityTimeValueChange={(event, newInput?: string) => {
-                    entityChange(newInput, index, "time");
-                  }}
-                />
-              );
-            })}
-            {userContext.apiType !== "Cassandra" && (
-              <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
-                <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
-                <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
-              </Stack>
-            )}
-          </div>
-          {renderPanelFooter()}
-        </div>
-      </form>
-    );
-  };
-
-  const renderPanelFooter = (): JSX.Element => {
-    return (
-      <div className="paneFooter">
-        <div className="leftpanel-okbut">
-          <input type="submit" onClick={submit} className="genericPaneSubmitBtn" value="Update Entity" />
-        </div>
-      </div>
-    );
-  };
-
-  const onRenderNavigationContent: IRenderFunction<IPanelProps> = () => (
-    <Stack horizontal {...columnProps}>
-      <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
-      <Label>{entityAttributeProperty}</Label>
-    </Stack>
-  );
  if (isEntityValuePanelOpen) {
    return (
-      <PanelContainerComponent
-        headerText=""
-        onRenderNavigationContent={onRenderNavigationContent}
-        panelWidth="700px"
-        isOpen={true}
-        panelContent={
-          <TextField
-            multiline
-            rows={5}
-            className="entityValueTextField"
-            value={entityAttributeValue}
-            onChange={(event, newInput?: string) => {
-              setEntityAttributeValue(newInput);
-              entityChange(newInput, selectedRow, "value");
-            }}
-          />
-        }
-        isConsoleExpanded={false}
-      />
+      <Stack style={{ padding: "20px 34px" }}>
+        <Stack horizontal {...columnProps}>
+          <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
+          <Label>{entityAttributeProperty}</Label>
+        </Stack>
+        <TextField
+          multiline
+          rows={5}
+          value={entityAttributeValue}
+          onChange={(event, newInput?: string) => {
+            setEntityAttributeValue(newInput);
+            entityChange(newInput, selectedRow, "value");
+          }}
+        />
+      </Stack>
    );
  }

+  const props: RightPaneFormProps = {
+    formError,
+    isExecuting,
+    submitButtonText: "Update",
+    onSubmit,
+  };
+
  return (
-    <PanelContainerComponent
-      headerText="Edit Table Entity"
-      panelWidth="700px"
-      isOpen={true}
-      panelContent={renderPanelContent()}
-      isConsoleExpanded={false}
-    />
+    <RightPaneForm {...props}>
+      <div className="panelMainContent">
+        {entities.map((entity, index) => {
+          return (
+            <TableEntity
+              key={"" + entity.id + index}
+              isDeleteOptionVisible={entity.isDeleteOptionVisible}
+              entityTypeLabel={index === 0 && dataTypeLabel}
+              entityPropertyLabel={index === 0 && attributeNameLabel}
+              entityValueLabel={index === 0 && attributeValueLabel}
+              options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
+              isPropertyTypeDisable={entity.isPropertyTypeDisable}
+              entityProperty={entity.property}
+              selectedKey={entity.type}
+              entityPropertyPlaceHolder={detailedHelp}
+              entityValuePlaceholder={entity.entityValuePlaceholder}
+              entityValue={entity.value?.toString()}
+              isEntityTypeDate={entity.isEntityTypeDate}
+              entityTimeValue={entity.entityTimeValue}
+              isEntityValueDisable={entity.isEntityValueDisable}
+              onEditEntity={() => editEntity(index)}
+              onSelectDate={(date: Date) => {
+                entityChange(date, index, "value");
+              }}
+              onDeleteEntity={() => deleteEntityAtIndex(index)}
+              onEntityPropertyChange={(event, newInput?: string) => {
+                entityChange(newInput, index, "property");
+              }}
+              onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
+                entityTypeChange(event, selectedParam, index);
+              }}
+              onEntityValueChange={(event, newInput?: string) => {
+                entityChange(newInput, index, "value");
+              }}
+              onEntityTimeValueChange={(event, newInput?: string) => {
+                entityChange(newInput, index, "time");
+              }}
+            />
+          );
+        })}
+        {userContext.apiType !== "Cassandra" && (
+          <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
+            <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
+            <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
+          </Stack>
+        )}
+      </div>
+    </RightPaneForm>
  );
 };
--- a/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
+++ b/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
@@ -80,7 +80,7 @@ export const int64Placeholder = "Enter a signed 64-bit integer, in the range (-2

 export const columnProps: Partial<IStackProps> = {
  tokens: { childrenGap: 10 },
-  styles: { root: { width: 680 } },
+  styles: { root: { marginBottom: 8 } },
 };

 // helper functions
@@ -134,8 +134,8 @@ export const getEntityValuePlaceholder = (entityType: string | number): string =

 export const isValidEntities = (entities: EntityRowType[]): boolean => {
  for (let i = 0; i < entities.length; i++) {
-    const { property } = entities[i];
-    if (property === "" || property === undefined) {
+    const { property, type } = entities[i];
+    if (property === "" || property === undefined || !type) {
      return false;
    }
  }
@@ -170,13 +170,6 @@ export const getDefaultEntities = (headers: string[], entityTypes: EntityType):
  return defaultEntities;
 };

-export const getPanelTitle = (apiType: string): string => {
-  if (apiType === "Cassandra") {
-    return "Add Table Row";
-  }
-  return "Add Table Row";
-};
-
 export const getAddButtonLabel = (apiType: string): string => {
  if (apiType === "Cassandra") {
    return "Add Row";
--- a/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
--- a/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
--- a/src/Explorer/Tabs/QueryTablesTab.tsx
+++ b/src/Explorer/Tabs/QueryTablesTab.tsx
@@ -137,13 +137,14 @@ export default class QueryTablesTab extends TabsBase {
    useSidePanel
      .getState()
      .openSidePanel(
-        "Add Table Entity",
+        "Add Table Row",
        <AddTableEntityPanel
          tableDataClient={this.tableDataClient}
          queryTablesTab={this}
          tableEntityListViewModel={this.tableEntityListViewModel()}
          cassandraApiClient={new CassandraAPIDataClient()}
-        />
+        />,
+        "700px"
      );
  };

@@ -157,7 +158,8 @@ export default class QueryTablesTab extends TabsBase {
          queryTablesTab={this}
          tableEntityListViewModel={this.tableEntityListViewModel()}
          cassandraApiClient={new CassandraAPIDataClient()}
-        />
+        />,
+        "700px"
      );
  };

--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -571,8 +571,8 @@ export default class Collection implements ViewModels.Collection {
  };

  public onSettingsClick = async (): Promise<void> => {
-    await this.loadOffer();
    useSelectedNode.getState().setSelectedNode(this);
+    await this.loadOffer();
    this.selectedSubnodeKind(ViewModels.CollectionTabKind.Settings);
    TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
      description: "Settings node",
--- a/src/Explorer/Tree/Database.tsx
+++ b/src/Explorer/Tree/Database.tsx
@@ -57,7 +57,7 @@ export default class Database implements ViewModels.Database {
    this.isOfferRead = false;
  }

-  public onSettingsClick = () => {
+  public onSettingsClick = (): void => {
    useSelectedNode.getState().setSelectedNode(this);
    this.selectedSubnodeKind(ViewModels.CollectionTabKind.DatabaseSettings);
    TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
@@ -193,6 +193,8 @@ export default class Database implements ViewModels.Database {
    //merge collections
    this.addCollectionsToList(collectionVMs);
    this.deleteCollectionsFromList(deltaCollections.toDelete);
+
+    useDatabases.getState().updateDatabase(this);
  }

  public async openAddCollection(database: Database): Promise<void> {
--- a/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
@@ -1,45 +1,18 @@
-import * as ko from "knockout";
-import * as React from "react";
+import React from "react";
 import CollectionIcon from "../../../images/tree-collection.svg";
-import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { useTabs } from "../../hooks/useTabs";
 import { userContext } from "../../UserContext";
 import { TreeComponent, TreeNode } from "../Controls/TreeComponent/TreeComponent";
-import Explorer from "../Explorer";
 import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
 import { mostRecentActivity } from "../MostRecentActivity/MostRecentActivity";
-import { NotebookContentItem } from "../Notebook/NotebookContentItem";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";

-export class ResourceTreeAdapterForResourceToken implements ReactAdapter {
-  public parameters: ko.Observable<number>;
-  public myNotebooksContentRoot: NotebookContentItem;
+export const ResourceTokenTree: React.FC = (): JSX.Element => {
+  const collection = useDatabases((state) => state.resourceTokenCollection);

-  public constructor(private container: Explorer) {
-    this.parameters = ko.observable(Date.now());
-
-    useDatabases.subscribe(
-      () => this.triggerRender(),
-      (state) => state.resourceTokenCollection
-    );
-    useSelectedNode.subscribe(() => this.triggerRender());
-    useTabs.subscribe(
-      () => this.triggerRender(),
-      (state) => state.activeTab
-    );
-
-    this.triggerRender();
-  }
-
-  public renderComponent(): JSX.Element {
-    const dataRootNode = this.buildCollectionNode();
-    return <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />;
-  }
-
-  public buildCollectionNode(): TreeNode {
-    const collection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
+  const buildCollectionNode = (): TreeNode => {
    if (!collection) {
      return {
        label: undefined,
@@ -86,9 +59,7 @@ export class ResourceTreeAdapterForResourceToken implements ReactAdapter {
      isExpanded: true,
      children: [collectionNode],
    };
-  }
+  };

-  public triggerRender() {
-    window.requestAnimationFrame(() => this.parameters(Date.now()));
-  }
-}
+  return <TreeComponent className="dataResourceTree" rootNode={buildCollectionNode()} />;
+};
--- a/src/Explorer/Tree/ResourceTree.tsx
+++ b/src/Explorer/Tree/ResourceTree.tsx
@@ -0,0 +1,722 @@
+import { Callout, DirectionalHint, ICalloutProps, ILinkProps, Link, Stack, Text } from "@fluentui/react";
+import * as React from "react";
+import CosmosDBIcon from "../../../images/Azure-Cosmos-DB.svg";
+import DeleteIcon from "../../../images/delete.svg";
+import GalleryIcon from "../../../images/GalleryIcon.svg";
+import FileIcon from "../../../images/notebook/file-cosmos.svg";
+import CopyIcon from "../../../images/notebook/Notebook-copy.svg";
+import NewNotebookIcon from "../../../images/notebook/Notebook-new.svg";
+import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
+import PublishIcon from "../../../images/notebook/publish_content.svg";
+import RefreshIcon from "../../../images/refresh-cosmos.svg";
+import CollectionIcon from "../../../images/tree-collection.svg";
+import { Areas } from "../../Common/Constants";
+import { isPublicInternetAccessAllowed } from "../../Common/DatabaseAccountUtility";
+import * as DataModels from "../../Contracts/DataModels";
+import * as ViewModels from "../../Contracts/ViewModels";
+import { useSidePanel } from "../../hooks/useSidePanel";
+import { useTabs } from "../../hooks/useTabs";
+import { LocalStorageUtility, StorageKey } from "../../Shared/StorageUtility";
+import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "../../UserContext";
+import { isServerlessAccount } from "../../Utils/CapabilityUtils";
+import * as GitHubUtils from "../../Utils/GitHubUtils";
+import * as ResourceTreeContextMenuButtonFactory from "../ContextMenuButtonFactory";
+import { AccordionComponent, AccordionItemComponent } from "../Controls/Accordion/AccordionComponent";
+import { TreeComponent, TreeNode, TreeNodeMenuItem } from "../Controls/TreeComponent/TreeComponent";
+import Explorer from "../Explorer";
+import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
+import { mostRecentActivity } from "../MostRecentActivity/MostRecentActivity";
+import { NotebookContentItem, NotebookContentItemType } from "../Notebook/NotebookContentItem";
+import { NotebookUtil } from "../Notebook/NotebookUtil";
+import { useNotebook } from "../Notebook/useNotebook";
+import { GitHubReposPanel } from "../Panes/GitHubReposPanel/GitHubReposPanel";
+import TabsBase from "../Tabs/TabsBase";
+import { useDatabases } from "../useDatabases";
+import { useSelectedNode } from "../useSelectedNode";
+import StoredProcedure from "./StoredProcedure";
+import Trigger from "./Trigger";
+import UserDefinedFunction from "./UserDefinedFunction";
+
+export const MyNotebooksTitle = "My Notebooks";
+export const GitHubReposTitle = "GitHub repos";
+
+interface ResourceTreeProps {
+  container: Explorer;
+}
+
+export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: ResourceTreeProps): JSX.Element => {
+  const databases = useDatabases((state) => state.databases);
+  const {
+    isNotebookEnabled,
+    myNotebooksContentRoot,
+    galleryContentRoot,
+    gitHubNotebooksContentRoot,
+    updateNotebookItem,
+  } = useNotebook();
+  const { activeTab, refreshActiveTab } = useTabs();
+  const showScriptNodes = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
+  const pseudoDirPath = "PsuedoDir";
+
+  const buildGalleryCallout = (): JSX.Element => {
+    if (
+      LocalStorageUtility.hasItem(StorageKey.GalleryCalloutDismissed) &&
+      LocalStorageUtility.getEntryBoolean(StorageKey.GalleryCalloutDismissed)
+    ) {
+      return undefined;
+    }
+
+    const calloutProps: ICalloutProps = {
+      calloutMaxWidth: 350,
+      ariaLabel: "New gallery",
+      role: "alertdialog",
+      gapSpace: 0,
+      target: ".galleryHeader",
+      directionalHint: DirectionalHint.leftTopEdge,
+      onDismiss: () => {
+        LocalStorageUtility.setEntryBoolean(StorageKey.GalleryCalloutDismissed, true);
+      },
+      setInitialFocus: true,
+    };
+
+    const openGalleryProps: ILinkProps = {
+      onClick: () => {
+        LocalStorageUtility.setEntryBoolean(StorageKey.GalleryCalloutDismissed, true);
+        container.openGallery();
+      },
+    };
+
+    return (
+      <Callout {...calloutProps}>
+        <Stack tokens={{ childrenGap: 10, padding: 20 }}>
+          <Text variant="xLarge" block>
+            New gallery
+          </Text>
+          <Text block>
+            Sample notebooks are now combined in gallery. View and try out samples provided by Microsoft and other
+            contributors.
+          </Text>
+          <Link {...openGalleryProps}>Open gallery</Link>
+        </Stack>
+      </Callout>
+    );
+  };
+
+  const buildNotebooksTree = (): TreeNode => {
+    const notebooksTree: TreeNode = {
+      label: undefined,
+      isExpanded: true,
+      children: [],
+    };
+
+    if (galleryContentRoot) {
+      notebooksTree.children.push(buildGalleryNotebooksTree());
+    }
+
+    if (myNotebooksContentRoot) {
+      notebooksTree.children.push(buildMyNotebooksTree());
+    }
+
+    if (container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
+      // collapse all other notebook nodes
+      notebooksTree.children.forEach((node) => (node.isExpanded = false));
+      notebooksTree.children.push(buildGitHubNotebooksTree());
+    }
+
+    return notebooksTree;
+  };
+
+  const buildGalleryNotebooksTree = (): TreeNode => {
+    return {
+      label: "Gallery",
+      iconSrc: GalleryIcon,
+      className: "notebookHeader galleryHeader",
+      onClick: () => container.openGallery(),
+      isSelected: () => activeTab?.tabKind === ViewModels.CollectionTabKind.Gallery,
+    };
+  };
+
+  const buildMyNotebooksTree = (): TreeNode => {
+    const myNotebooksTree: TreeNode = buildNotebookDirectoryNode(
+      myNotebooksContentRoot,
+      (item: NotebookContentItem) => {
+        container.openNotebook(item).then((hasOpened) => {
+          if (hasOpened) {
+            mostRecentActivity.notebookWasItemOpened(userContext.databaseAccount?.id, item);
+          }
+        });
+      }
+    );
+
+    myNotebooksTree.isExpanded = true;
+    myNotebooksTree.isAlphaSorted = true;
+    // Remove "Delete" menu item from context menu
+    myNotebooksTree.contextMenu = myNotebooksTree.contextMenu.filter((menuItem) => menuItem.label !== "Delete");
+    return myNotebooksTree;
+  };
+
+  const buildGitHubNotebooksTree = (): TreeNode => {
+    const gitHubNotebooksTree: TreeNode = buildNotebookDirectoryNode(
+      gitHubNotebooksContentRoot,
+      (item: NotebookContentItem) => {
+        container.openNotebook(item).then((hasOpened) => {
+          if (hasOpened) {
+            mostRecentActivity.notebookWasItemOpened(userContext.databaseAccount?.id, item);
+          }
+        });
+      }
+    );
+
+    gitHubNotebooksTree.contextMenu = [
+      {
+        label: "Manage GitHub settings",
+        onClick: () =>
+          useSidePanel
+            .getState()
+            .openSidePanel(
+              "Manage GitHub settings",
+              <GitHubReposPanel
+                explorer={container}
+                gitHubClientProp={container.notebookManager.gitHubClient}
+                junoClientProp={container.notebookManager.junoClient}
+              />
+            ),
+      },
+      {
+        label: "Disconnect from GitHub",
+        onClick: () => {
+          TelemetryProcessor.trace(Action.NotebooksGitHubDisconnect, ActionModifiers.Mark, {
+            dataExplorerArea: Areas.Notebook,
+          });
+          container.notebookManager?.gitHubOAuthService.logout();
+        },
+      },
+    ];
+
+    gitHubNotebooksTree.isExpanded = true;
+    gitHubNotebooksTree.isAlphaSorted = true;
+
+    return gitHubNotebooksTree;
+  };
+
+  const buildChildNodes = (
+    container: Explorer,
+    item: NotebookContentItem,
+    onFileClick: (item: NotebookContentItem) => void
+  ): TreeNode[] => {
+    if (!item || !item.children) {
+      return [];
+    } else {
+      return item.children.map((item) => {
+        const result =
+          item.type === NotebookContentItemType.Directory
+            ? buildNotebookDirectoryNode(item, onFileClick)
+            : buildNotebookFileNode(item, onFileClick);
+        result.timestamp = item.timestamp;
+        return result;
+      });
+    }
+  };
+
+  const buildNotebookFileNode = (
+    item: NotebookContentItem,
+    onFileClick: (item: NotebookContentItem) => void
+  ): TreeNode => {
+    return {
+      label: item.name,
+      iconSrc: NotebookUtil.isNotebookFile(item.path) ? NotebookIcon : FileIcon,
+      className: "notebookHeader",
+      onClick: () => onFileClick(item),
+      isSelected: () => {
+        return (
+          activeTab &&
+          activeTab.tabKind === ViewModels.CollectionTabKind.NotebookV2 &&
+          /* TODO Redesign Tab interface so that resource tree doesn't need to know about NotebookV2Tab.
+                     NotebookV2Tab could be dynamically imported, but not worth it to just get this type right.
+                   */
+          (activeTab as any).notebookPath() === item.path
+        );
+      },
+      contextMenu: createFileContextMenu(container, item),
+      data: item,
+    };
+  };
+
+  const createFileContextMenu = (container: Explorer, item: NotebookContentItem): TreeNodeMenuItem[] => {
+    let items: TreeNodeMenuItem[] = [
+      {
+        label: "Rename",
+        iconSrc: NotebookIcon,
+        onClick: () => container.renameNotebook(item),
+      },
+      {
+        label: "Delete",
+        iconSrc: DeleteIcon,
+        onClick: () => {
+          container.showOkCancelModalDialog(
+            "Confirm delete",
+            `Are you sure you want to delete "${item.name}"`,
+            "Delete",
+            () => container.deleteNotebookFile(item),
+            "Cancel",
+            undefined
+          );
+        },
+      },
+      {
+        label: "Copy to ...",
+        iconSrc: CopyIcon,
+        onClick: () => copyNotebook(container, item),
+      },
+      {
+        label: "Download",
+        iconSrc: NotebookIcon,
+        onClick: () => container.downloadFile(item),
+      },
+    ];
+
+    if (item.type === NotebookContentItemType.Notebook) {
+      items.push({
+        label: "Publish to gallery",
+        iconSrc: PublishIcon,
+        onClick: async () => {
+          TelemetryProcessor.trace(Action.NotebooksGalleryClickPublishToGallery, ActionModifiers.Mark, {
+            source: Source.ResourceTreeMenu,
+          });
+
+          const content = await container.readFile(item);
+          if (content) {
+            await container.publishNotebook(item.name, content);
+          }
+        },
+      });
+    }
+
+    // "Copy to ..." isn't needed if github locations are not available
+    if (!container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
+      items = items.filter((item) => item.label !== "Copy to ...");
+    }
+
+    return items;
+  };
+
+  const copyNotebook = async (container: Explorer, item: NotebookContentItem) => {
+    const content = await container.readFile(item);
+    if (content) {
+      container.copyNotebook(item.name, content);
+    }
+  };
+
+  const createDirectoryContextMenu = (container: Explorer, item: NotebookContentItem): TreeNodeMenuItem[] => {
+    let items: TreeNodeMenuItem[] = [
+      {
+        label: "Refresh",
+        iconSrc: RefreshIcon,
+        onClick: () => loadSubitems(item),
+      },
+      {
+        label: "Delete",
+        iconSrc: DeleteIcon,
+        onClick: () => {
+          container.showOkCancelModalDialog(
+            "Confirm delete",
+            `Are you sure you want to delete "${item.name}?"`,
+            "Delete",
+            () => container.deleteNotebookFile(item),
+            "Cancel",
+            undefined
+          );
+        },
+      },
+      {
+        label: "Rename",
+        iconSrc: NotebookIcon,
+        onClick: () => container.renameNotebook(item),
+      },
+      {
+        label: "New Directory",
+        iconSrc: NewNotebookIcon,
+        onClick: () => container.onCreateDirectory(item),
+      },
+      {
+        label: "New Notebook",
+        iconSrc: NewNotebookIcon,
+        onClick: () => container.onNewNotebookClicked(item),
+      },
+      {
+        label: "Upload File",
+        iconSrc: NewNotebookIcon,
+        onClick: () => container.openUploadFilePanel(item),
+      },
+    ];
+
+    // For GitHub paths remove "Delete", "Rename", "New Directory", "Upload File"
+    if (GitHubUtils.fromContentUri(item.path)) {
+      items = items.filter(
+        (item) =>
+          item.label !== "Delete" &&
+          item.label !== "Rename" &&
+          item.label !== "New Directory" &&
+          item.label !== "Upload File"
+      );
+    }
+
+    return items;
+  };
+
+  const buildNotebookDirectoryNode = (
+    item: NotebookContentItem,
+    onFileClick: (item: NotebookContentItem) => void
+  ): TreeNode => {
+    return {
+      label: item.name,
+      iconSrc: undefined,
+      className: "notebookHeader",
+      isAlphaSorted: true,
+      isLeavesParentsSeparate: true,
+      onClick: () => {
+        if (!item.children) {
+          loadSubitems(item);
+        }
+      },
+      isSelected: () => {
+        return (
+          activeTab &&
+          activeTab.tabKind === ViewModels.CollectionTabKind.NotebookV2 &&
+          /* TODO Redesign Tab interface so that resource tree doesn't need to know about NotebookV2Tab.
+                     NotebookV2Tab could be dynamically imported, but not worth it to just get this type right.
+                   */
+          (activeTab as any).notebookPath() === item.path
+        );
+      },
+      contextMenu: item.path !== pseudoDirPath ? createDirectoryContextMenu(container, item) : undefined,
+      data: item,
+      children: buildChildNodes(container, item, onFileClick),
+    };
+  };
+
+  const buildDataTree = (): TreeNode => {
+    const databaseTreeNodes: TreeNode[] = databases.map((database: ViewModels.Database) => {
+      const databaseNode: TreeNode = {
+        label: database.id(),
+        iconSrc: CosmosDBIcon,
+        isExpanded: false,
+        className: "databaseHeader",
+        children: [],
+        isSelected: () => useSelectedNode.getState().isDataNodeSelected(database.id()),
+        contextMenu: ResourceTreeContextMenuButtonFactory.createDatabaseContextMenu(container, database.id()),
+        onClick: async (isExpanded) => {
+          useSelectedNode.getState().setSelectedNode(database);
+          // Rewritten version of expandCollapseDatabase():
+          if (isExpanded) {
+            database.collapseDatabase();
+          } else {
+            if (databaseNode.children?.length === 0) {
+              databaseNode.isLoading = true;
+            }
+            await database.expandDatabase();
+          }
+          databaseNode.isLoading = false;
+          useCommandBar.getState().setContextButtons([]);
+          refreshActiveTab((tab: TabsBase) => tab.collection?.databaseId === database.id());
+        },
+        onContextMenuOpen: () => useSelectedNode.getState().setSelectedNode(database),
+      };
+
+      if (database.isDatabaseShared()) {
+        databaseNode.children.push({
+          label: "Scale",
+          isSelected: () =>
+            useSelectedNode
+              .getState()
+              .isDataNodeSelected(database.id(), undefined, [ViewModels.CollectionTabKind.DatabaseSettingsV2]),
+          onClick: database.onSettingsClick.bind(database),
+        });
+      }
+
+      // Find collections
+      database
+        .collections()
+        .forEach((collection: ViewModels.Collection) =>
+          databaseNode.children.push(buildCollectionNode(database, collection))
+        );
+
+      database.collections.subscribe((collections: ViewModels.Collection[]) => {
+        collections.forEach((collection: ViewModels.Collection) =>
+          databaseNode.children.push(buildCollectionNode(database, collection))
+        );
+      });
+
+      return databaseNode;
+    });
+
+    return {
+      label: undefined,
+      isExpanded: true,
+      children: databaseTreeNodes,
+    };
+  };
+
+  const buildCollectionNode = (database: ViewModels.Database, collection: ViewModels.Collection): TreeNode => {
+    const children: TreeNode[] = [];
+    children.push({
+      label: collection.getLabel(),
+      onClick: () => {
+        collection.openTab();
+        // push to most recent
+        mostRecentActivity.collectionWasOpened(userContext.databaseAccount?.id, collection);
+      },
+      isSelected: () =>
+        useSelectedNode
+          .getState()
+          .isDataNodeSelected(collection.databaseId, collection.id(), [
+            ViewModels.CollectionTabKind.Documents,
+            ViewModels.CollectionTabKind.Graph,
+          ]),
+      contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
+    });
+
+    if (isNotebookEnabled && userContext.apiType === "Mongo" && isPublicInternetAccessAllowed()) {
+      children.push({
+        label: "Schema (Preview)",
+        onClick: collection.onSchemaAnalyzerClick.bind(collection),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.SchemaAnalyzer]),
+      });
+    }
+
+    if (userContext.apiType !== "Cassandra" || !isServerlessAccount()) {
+      children.push({
+        label: database.isDatabaseShared() || isServerlessAccount() ? "Settings" : "Scale & Settings",
+        onClick: collection.onSettingsClick.bind(collection),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [
+              ViewModels.CollectionTabKind.CollectionSettingsV2,
+            ]),
+      });
+    }
+
+    const schemaNode: TreeNode = buildSchemaNode(collection);
+    if (schemaNode) {
+      children.push(schemaNode);
+    }
+
+    if (showScriptNodes) {
+      children.push(buildStoredProcedureNode(collection));
+      children.push(buildUserDefinedFunctionsNode(collection));
+      children.push(buildTriggerNode(collection));
+    }
+
+    // This is a rewrite of showConflicts
+    const showConflicts =
+      userContext?.databaseAccount?.properties.enableMultipleWriteLocations &&
+      collection.rawDataModel &&
+      !!collection.rawDataModel.conflictResolutionPolicy;
+
+    if (showConflicts) {
+      children.push({
+        label: "Conflicts",
+        onClick: collection.onConflictsClick.bind(collection),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Conflicts]),
+      });
+    }
+
+    return {
+      label: collection.id(),
+      iconSrc: CollectionIcon,
+      isExpanded: false,
+      children: children,
+      className: "collectionHeader",
+      contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
+      onClick: () => {
+        // Rewritten version of expandCollapseCollection
+        useSelectedNode.getState().setSelectedNode(collection);
+        useCommandBar.getState().setContextButtons([]);
+        refreshActiveTab(
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
+        );
+      },
+      onExpanded: () => {
+        if (showScriptNodes) {
+          collection.loadStoredProcedures();
+          collection.loadUserDefinedFunctions();
+          collection.loadTriggers();
+        }
+      },
+      isSelected: () => useSelectedNode.getState().isDataNodeSelected(collection.databaseId, collection.id()),
+      onContextMenuOpen: () => useSelectedNode.getState().setSelectedNode(collection),
+    };
+  };
+
+  const buildStoredProcedureNode = (collection: ViewModels.Collection): TreeNode => {
+    return {
+      label: "Stored Procedures",
+      children: collection.storedProcedures().map((sp: StoredProcedure) => ({
+        label: sp.id(),
+        onClick: sp.open.bind(sp),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [
+              ViewModels.CollectionTabKind.StoredProcedures,
+            ]),
+        contextMenu: ResourceTreeContextMenuButtonFactory.createStoreProcedureContextMenuItems(container, sp),
+      })),
+      onClick: () => {
+        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.StoredProcedures);
+        refreshActiveTab(
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
+        );
+      },
+    };
+  };
+
+  const buildUserDefinedFunctionsNode = (collection: ViewModels.Collection): TreeNode => {
+    return {
+      label: "User Defined Functions",
+      children: collection.userDefinedFunctions().map((udf: UserDefinedFunction) => ({
+        label: udf.id(),
+        onClick: udf.open.bind(udf),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [
+              ViewModels.CollectionTabKind.UserDefinedFunctions,
+            ]),
+        contextMenu: ResourceTreeContextMenuButtonFactory.createUserDefinedFunctionContextMenuItems(container, udf),
+      })),
+      onClick: () => {
+        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.UserDefinedFunctions);
+        refreshActiveTab(
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
+        );
+      },
+    };
+  };
+
+  const buildTriggerNode = (collection: ViewModels.Collection): TreeNode => {
+    return {
+      label: "Triggers",
+      children: collection.triggers().map((trigger: Trigger) => ({
+        label: trigger.id(),
+        onClick: trigger.open.bind(trigger),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Triggers]),
+        contextMenu: ResourceTreeContextMenuButtonFactory.createTriggerContextMenuItems(container, trigger),
+      })),
+      onClick: () => {
+        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.Triggers);
+        refreshActiveTab(
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
+        );
+      },
+    };
+  };
+
+  const buildSchemaNode = (collection: ViewModels.Collection): TreeNode => {
+    if (collection.analyticalStorageTtl() === undefined) {
+      return undefined;
+    }
+
+    if (!collection.schema || !collection.schema.fields) {
+      return undefined;
+    }
+
+    return {
+      label: "Schema",
+      children: getSchemaNodes(collection.schema.fields),
+      onClick: () => {
+        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.Schema);
+        refreshActiveTab((tab: TabsBase) => tab.collection && tab.collection.rid === collection.rid);
+      },
+    };
+  };
+
+  const getSchemaNodes = (fields: DataModels.IDataField[]): TreeNode[] => {
+    const schema: any = {};
+
+    //unflatten
+    fields.forEach((field: DataModels.IDataField) => {
+      const path: string[] = field.path.split(".");
+      const fieldProperties = [field.dataType.name, `HasNulls: ${field.hasNulls}`];
+      let current: any = {};
+      path.forEach((name: string, pathIndex: number) => {
+        if (pathIndex === 0) {
+          if (schema[name] === undefined) {
+            if (pathIndex === path.length - 1) {
+              schema[name] = fieldProperties;
+            } else {
+              schema[name] = {};
+            }
+          }
+          current = schema[name];
+        } else {
+          if (current[name] === undefined) {
+            if (pathIndex === path.length - 1) {
+              current[name] = fieldProperties;
+            } else {
+              current[name] = {};
+            }
+          }
+          current = current[name];
+        }
+      });
+    });
+
+    const traverse = (obj: any): TreeNode[] => {
+      const children: TreeNode[] = [];
+
+      if (obj !== undefined && !Array.isArray(obj) && typeof obj === "object") {
+        Object.entries(obj).forEach(([key, value]) => {
+          children.push({ label: key, children: traverse(value) });
+        });
+      } else if (Array.isArray(obj)) {
+        return [{ label: obj[0] }, { label: obj[1] }];
+      }
+
+      return children;
+    };
+
+    return traverse(schema);
+  };
+
+  const loadSubitems = async (item: NotebookContentItem): Promise<void> => {
+    const updatedItem = await container.notebookManager?.notebookContentClient?.updateItemChildren(item);
+    updateNotebookItem(updatedItem);
+  };
+
+  const dataRootNode = buildDataTree();
+
+  if (isNotebookEnabled) {
+    return (
+      <>
+        <AccordionComponent>
+          <AccordionItemComponent title={"DATA"} isExpanded={!gitHubNotebooksContentRoot}>
+            <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />
+          </AccordionItemComponent>
+          <AccordionItemComponent title={"NOTEBOOKS"}>
+            <TreeComponent className="notebookResourceTree" rootNode={buildNotebooksTree()} />
+          </AccordionItemComponent>
+        </AccordionComponent>
+
+        {buildGalleryCallout()}
+      </>
+    );
+  }
+
+  return <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />;
+};
--- a/src/Explorer/Tree/ResourceTreeAdapter.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx
@@ -16,10 +16,9 @@ import { Areas } from "../../Common/Constants";
 import { isPublicInternetAccessAllowed } from "../../Common/DatabaseAccountUtility";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
-import { GitHubOAuthService } from "../../GitHub/GitHubOAuthService";
 import { useSidePanel } from "../../hooks/useSidePanel";
 import { useTabs } from "../../hooks/useTabs";
-import { IPinnedRepo, JunoClient } from "../../Juno/JunoClient";
+import { IPinnedRepo } from "../../Juno/JunoClient";
 import { LocalStorageUtility, StorageKey } from "../../Shared/StorageUtility";
 import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
@@ -56,8 +55,6 @@ export class ResourceTreeAdapter implements ReactAdapter {
  public galleryContentRoot: NotebookContentItem;
  public myNotebooksContentRoot: NotebookContentItem;
  public gitHubNotebooksContentRoot: NotebookContentItem;
-  public junoClient: JunoClient;
-  public gitHubOAuthService: GitHubOAuthService;

  public constructor(private container: Explorer) {
    this.parameters = ko.observable(Date.now());
@@ -74,8 +71,6 @@ export class ResourceTreeAdapter implements ReactAdapter {

    useDatabases.subscribe(() => this.triggerRender());
    this.triggerRender();
-    this.junoClient = new JunoClient();
-    this.gitHubOAuthService = new GitHubOAuthService(this.junoClient);
  }

  private traceMyNotebookTreeInfo() {
@@ -639,7 +634,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
              <GitHubReposPanel
                explorer={this.container}
                gitHubClientProp={this.container.notebookManager.gitHubClient}
-                junoClientProp={this.junoClient}
+                junoClientProp={this.container.notebookManager.junoClient}
              />
            ),
      },
--- a/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx
@@ -1,35 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import * as DataModels from "../../Contracts/DataModels";
-import * as ViewModels from "../../Contracts/ViewModels";
-import { TreeComponent, TreeComponentProps, TreeNode } from "../Controls/TreeComponent/TreeComponent";
-import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
-import ResourceTokenCollection from "./ResourceTokenCollection";
-import { ResourceTreeAdapterForResourceToken } from "./ResourceTreeAdapterForResourceToken";
-
-describe("Resource tree for resource token", () => {
-  const mockContainer = {} as Explorer;
-  const resourceTree = new ResourceTreeAdapterForResourceToken(mockContainer);
-  const mockCollection = {
-    _rid: "fakeRid",
-    _self: "fakeSelf",
-    id: "fakeId",
-  } as DataModels.Collection;
-  const mockResourceTokenCollection: ViewModels.CollectionBase = new ResourceTokenCollection(
-    mockContainer,
-    "fakeDatabaseId",
-    mockCollection
-  );
-  useDatabases.setState({ resourceTokenCollection: mockResourceTokenCollection });
-
-  it("should render", () => {
-    const rootNode: TreeNode = resourceTree.buildCollectionNode();
-    const props: TreeComponentProps = {
-      rootNode,
-      className: "dataResourceTree",
-    };
-    const wrapper = shallow(<TreeComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-});
--- a/src/Explorer/Tree/snapshots/ResourceTreeAdapterForResourceToken.test.tsx.snap
+++ b/src/Explorer/Tree/snapshots/ResourceTreeAdapterForResourceToken.test.tsx.snap
@@ -1,36 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Resource tree for resource token should render 1`] = `
-<div
-  className="treeComponent dataResourceTree"
-  role="tree"
->
-  <TreeNodeComponent
-    generation={0}
-    node={
-      Object {
-        "children": Array [
-          Object {
-            "children": Array [
-              Object {
-                "isSelected": [Function],
-                "label": "Items",
-                "onClick": [Function],
-              },
-            ],
-            "className": "collectionHeader",
-            "iconSrc": "",
-            "isExpanded": true,
-            "isSelected": [Function],
-            "label": "fakeId",
-            "onClick": [Function],
-          },
-        ],
-        "isExpanded": true,
-        "label": undefined,
-      }
-    }
-    paddingLeft={0}
-  />
-</div>
-`;
--- a/src/Explorer/useDatabases.ts
+++ b/src/Explorer/useDatabases.ts
@@ -2,6 +2,7 @@ import _ from "underscore";
 import create, { UseStore } from "zustand";
 import * as Constants from "../Common/Constants";
 import * as ViewModels from "../Contracts/ViewModels";
+import { userContext } from "../UserContext";
 import { useSelectedNode } from "./useSelectedNode";

 interface DatabasesState {
@@ -19,6 +20,8 @@ interface DatabasesState {
  loadDatabaseOffers: () => Promise<void>;
  isFirstResourceCreated: () => boolean;
  findSelectedDatabase: () => ViewModels.Database;
+  validateDatabaseId: (id: string) => boolean;
+  validateCollectionId: (databaseId: string, collectionId: string) => Promise<boolean>;
 }

 export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
@@ -129,4 +132,17 @@ export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({

    return selectedNode.collection?.database;
  },
+  validateDatabaseId: (id: string): boolean => {
+    return !get().databases.some((database) => database.id() === id);
+  },
+  validateCollectionId: async (databaseId: string, collectionId: string): Promise<boolean> => {
+    const database = get().databases.find((db) => db.id() === databaseId);
+    // For a new tables account, database is undefined when creating the first table
+    if (!database && userContext.apiType === "Tables") {
+      return true;
+    }
+
+    await database.loadCollections();
+    return !database.collections().some((collection) => collection.id() === collectionId);
+  },
 }));
--- a/src/Index.ts
+++ b/src/Index.ts
@@ -1,23 +0,0 @@
-import "../less/index.less";
-import "./Libs/jquery";
-
-import * as ko from "knockout";
-
-class Index {
-  public navigationSelection: ko.Observable<string>;
-
-  constructor() {
-    this.navigationSelection = ko.observable("quickstart");
-  }
-
-  public quickstart_click() {
-    this.navigationSelection("quickstart");
-  }
-
-  public explorer_click() {
-    this.navigationSelection("explorer");
-  }
-}
-
-var index = new Index();
-ko.applyBindings(index);
--- a/src/Index.tsx
+++ b/src/Index.tsx
@@ -0,0 +1,66 @@
+import React, { useState } from "react";
+import ReactDOM from "react-dom";
+import Arrow from "../images/Arrow.svg";
+import CosmosDB_20170829 from "../images/CosmosDB_20170829.svg";
+import Explorer from "../images/Explorer.svg";
+import Feedback from "../images/Feedback.svg";
+import Quickstart from "../images/Quickstart.svg";
+import "../less/index.less";
+
+const Index = (): JSX.Element => {
+  const [navigationSelection, setNavigationSelection] = useState("quickstart");
+
+  const quickstart_click = () => {
+    setNavigationSelection("quickstart");
+  };
+
+  const explorer_click = () => {
+    setNavigationSelection("explorer");
+  };
+
+  return (
+    <React.Fragment>
+      <header className="header HeaderBg">
+        <div className="items">
+          <img className="DocDBicon" src={CosmosDB_20170829} alt="Azure Cosmos DB" />
+          <a className="createdocdbacnt" href="https://aka.ms/documentdbcreate" rel="noreferrer" target="_blank">
+            Create an Azure Cosmos DB account <img className="rightarrowimg" src={Arrow} alt="" />
+          </a>
+          <span className="title">Azure Cosmos DB Emulator</span>
+        </div>
+      </header>
+      <nav className="fixedleftpane">
+        <div
+          id="Quickstart"
+          onClick={quickstart_click}
+          className={navigationSelection === "quickstart" ? "topSelected" : ""}
+        >
+          <img id="imgiconwidth1" src={Quickstart} alt="Open Quick Start" />
+          <span className="menuQuickStart">Quickstart</span>
+        </div>
+
+        <div id="Explorer" onClick={explorer_click} className={navigationSelection === "explorer" ? "topSelected" : ""}>
+          <img id="imgiconwidth1" src={Explorer} alt="Open Data Explorer" />
+          <span className="menuExplorer">Explorer</span>
+        </div>
+
+        <div>
+          <a className="feedbackstyle" href="https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20Emulator%20Feedback">
+            <img id="imgiconwidth1" src={Feedback} alt="Report Issue" />
+            <span className="menuExplorer">Report Issue</span>
+          </a>
+        </div>
+      </nav>
+
+      {navigationSelection === "quickstart" && (
+        <iframe name="quickstart" className="iframe" src="quickstart.html"></iframe>
+      )}
+
+      {navigationSelection === "explorer" && (
+        <iframe name="explorer" className="iframe" src="explorer.html?platform=Emulator"></iframe>
+      )}
+    </React.Fragment>
+  );
+};
+
+ReactDOM.render(<Index />, document.getElementById("root"));
--- a/src/Localization/en/SqlX.json
+++ b/src/Localization/en/SqlX.json
@@ -40,7 +40,7 @@
    "CosmosD4Details": "General Purpose Cosmos Compute with 4 vCPUs, 16 GB Memory",
    "CosmosD8Details": "General Purpose Cosmos Compute with 8 vCPUs, 32 GB Memory",
    "CosmosD16Details": "General Purpose Cosmos Compute with 16 vCPUs, 64 GB Memory",
-    "Cost": "Cost",
+    "ApproximateCost": "Approximate Cost Per Hour",
    "CostText": "Hourly cost of the dedicated gateway resource depends on the SKU selection, number of instances per region, and number of regions.",
    "ConnectionString": "Connection String",
    "ConnectionStringText": "To use the dedicated gateway, use the connection string shown in ",
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -26,7 +26,7 @@ import "../less/TableStyles/fulldatatables.less";
 import "../less/TableStyles/queryBuilder.less";
 import "../less/tree.less";
 import { CollapsedResourceTree } from "./Common/CollapsedResourceTree";
-import { ResourceTree } from "./Common/ResourceTree";
+import { ResourceTreeContainer } from "./Common/ResourceTreeContainer";
 import "./Explorer/Controls/Accordion/AccordionComponent.less";
 import "./Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.less";
 import { Dialog } from "./Explorer/Controls/Dialog";
@@ -84,7 +84,11 @@ const App: React.FunctionComponent = () => {
          <div id="resourcetree" data-test="resourceTreeId" className="resourceTree">
            <div className="collectionsTreeWithSplitter">
              {/* Collections Tree Expanded - Start */}
-              <ResourceTree toggleLeftPaneExpanded={toggleLeftPaneExpanded} isLeftPaneExpanded={isLeftPaneExpanded} />
+              <ResourceTreeContainer
+                container={explorer}
+                toggleLeftPaneExpanded={toggleLeftPaneExpanded}
+                isLeftPaneExpanded={isLeftPaneExpanded}
+              />
              {/* Collections Tree Expanded - End */}
              {/* Collections Tree Collapsed - Start */}
              <CollapsedResourceTree
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -15,6 +15,7 @@ export type Features = {
  readonly enableTtl: boolean;
  readonly executeSproc: boolean;
  readonly enableAadDataPlane: boolean;
+  readonly enableKOResourceTree: boolean;
  readonly hostedDataExplorer: boolean;
  readonly junoEndpoint?: string;
  readonly livyEndpoint?: string;
@@ -56,6 +57,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    enableSDKoperations: "true" === get("enablesdkoperations"),
    enableSpark: "true" === get("enablespark"),
    enableTtl: "true" === get("enablettl"),
+    enableKOResourceTree: "true" === get("enablekoresourcetree"),
    executeSproc: "true" === get("dataexplorerexecutesproc"),
    hostedDataExplorer: "true" === get("hosteddataexplorerenabled"),
    junoEndpoint: get("junoendpoint"),
--- a/src/SelfServe/SqlX/SqlX.rp.ts
+++ b/src/SelfServe/SqlX/SqlX.rp.ts
@@ -4,7 +4,12 @@ import { armRequestWithoutPolling } from "../../Utils/arm/request";
 import { selfServeTraceFailure, selfServeTraceStart, selfServeTraceSuccess } from "../SelfServeTelemetryProcessor";
 import { RefreshResult } from "../SelfServeTypes";
 import SqlX from "./SqlX";
-import { SqlxServiceResource, UpdateDedicatedGatewayRequestParameters } from "./SqlxTypes";
+import {
+  FetchPricesResponse,
+  RegionsResponse,
+  SqlxServiceResource,
+  UpdateDedicatedGatewayRequestParameters,
+} from "./SqlxTypes";

 const apiVersion = "2021-04-01-preview";

@@ -128,3 +133,67 @@ export const refreshDedicatedGatewayProvisioning = async (): Promise<RefreshResu
    return { isUpdateInProgress: false, updateInProgressMessageTKey: undefined };
  }
 };
+
+const getGeneralPath = (subscriptionId: string, resourceGroup: string, name: string): string => {
+  return `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/${name}`;
+};
+
+export const getReadRegions = async (): Promise<Array<string>> => {
+  try {
+    const readRegions = new Array<string>();
+
+    const response = await armRequestWithoutPolling<RegionsResponse>({
+      host: configContext.ARM_ENDPOINT,
+      path: getGeneralPath(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name),
+      method: "GET",
+      apiVersion: "2021-04-01-preview",
+    });
+
+    if (response.result.location !== undefined) {
+      readRegions.push(response.result.location.replace(" ", "").toLowerCase());
+    } else {
+      for (const location of response.result.locations) {
+        readRegions.push(location.locationName.replace(" ", "").toLowerCase());
+      }
+    }
+    return readRegions;
+  } catch (err) {
+    return new Array<string>();
+  }
+};
+
+const getFetchPricesPathForRegion = (subscriptionId: string): string => {
+  return `/subscriptions/${subscriptionId}/providers/Microsoft.CostManagement/fetchPrices`;
+};
+
+export const getPriceMap = async (regions: Array<string>): Promise<Map<string, Map<string, number>>> => {
+  try {
+    const priceMap = new Map<string, Map<string, number>>();
+
+    for (const region of regions) {
+      const regionPriceMap = new Map<string, number>();
+
+      const response = await armRequestWithoutPolling<FetchPricesResponse>({
+        host: configContext.ARM_ENDPOINT,
+        path: getFetchPricesPathForRegion(userContext.subscriptionId),
+        method: "POST",
+        apiVersion: "2020-01-01-preview",
+        queryParams: {
+          filter:
+            "armRegionName eq '" +
+            region +
+            "' and serviceFamily eq 'Databases' and productName eq 'Azure Cosmos DB Dedicated Gateway - General Purpose'",
+        },
+      });
+
+      for (const item of response.result.Items) {
+        regionPriceMap.set(item.skuName, item.retailPrice);
+      }
+      priceMap.set(region, regionPriceMap);
+    }
+
+    return priceMap;
+  } catch (err) {
+    return undefined;
+  }
+};
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/src/SelfServe/SqlX/SqlX.tsx
@@ -16,11 +16,13 @@ import { BladeType, generateBladeLink } from "../SelfServeUtils";
 import {
  deleteDedicatedGatewayResource,
  getCurrentProvisioningState,
+  getPriceMap,
+  getReadRegions,
  refreshDedicatedGatewayProvisioning,
  updateDedicatedGatewayResource,
 } from "./SqlX.rp";

-const costPerHourValue: Description = {
+const costPerHourDefaultValue: Description = {
  textTKey: "CostText",
  type: DescriptionType.Text,
  link: {
@@ -53,7 +55,10 @@ const CosmosD16s = "Cosmos.D16s";

 const onSKUChange = (newValue: InputType, currentValues: Map<string, SmartUiInput>): Map<string, SmartUiInput> => {
  currentValues.set("sku", { value: newValue });
-  currentValues.set("costPerHour", { value: costPerHourValue });
+  currentValues.set("costPerHour", {
+    value: calculateCost(newValue as string, currentValues.get("instances").value as number),
+  });
+
  return currentValues;
 };

@@ -79,6 +84,11 @@ const onNumberOfInstancesChange = (
  } else {
    currentValues.set("warningBanner", undefined);
  }
+
+  currentValues.set("costPerHour", {
+    value: calculateCost(currentValues.get("sku").value as string, newValue as number),
+  });
+
  return currentValues;
 };

@@ -111,6 +121,11 @@ const onEnableDedicatedGatewayChange = (
      } as Description,
      hidden: false,
    });
+
+    currentValues.set("costPerHour", {
+      value: calculateCost(baselineValues.get("sku").value as string, baselineValues.get("instances").value as number),
+      hidden: false,
+    });
  } else {
    currentValues.set("warningBanner", {
      value: {
@@ -122,6 +137,8 @@ const onEnableDedicatedGatewayChange = (
      } as Description,
      hidden: false,
    });
+
+    currentValues.set("costPerHour", { value: costPerHourDefaultValue, hidden: true });
  }
  const sku = currentValues.get("sku");
  const instances = currentValues.get("instances");
@@ -137,7 +154,6 @@ const onEnableDedicatedGatewayChange = (
    disabled: dedicatedGatewayOriginallyEnabled,
  });

-  currentValues.set("costPerHour", { value: costPerHourValue, hidden: hideAttributes });
  currentValues.set("connectionString", {
    value: connectionStringValue,
    hidden: !newValue || !dedicatedGatewayOriginallyEnabled,
@@ -177,6 +193,40 @@ const NumberOfInstancesDropdownInfo: Info = {
  },
 };

+const ApproximateCostDropDownInfo: Info = {
+  messageTKey: "CostText",
+  link: {
+    href: "https://aka.ms/cosmos-db-dedicated-gateway-pricing",
+    textTKey: "DedicatedGatewayPricing",
+  },
+};
+
+let priceMap: Map<string, Map<string, number>>;
+let regions: Array<string>;
+
+const calculateCost = (skuName: string, instanceCount: number): Description => {
+  try {
+    let costPerHour = 0;
+    for (const region of regions) {
+      const incrementalCost = priceMap.get(region).get(skuName.replace("Cosmos.", ""));
+      if (incrementalCost === undefined) {
+        throw new Error("Value not found in map.");
+      }
+      costPerHour += incrementalCost;
+    }
+
+    costPerHour *= instanceCount;
+    costPerHour = Math.round(costPerHour * 100) / 100;
+
+    return {
+      textTKey: `${costPerHour} USD`,
+      type: DescriptionType.Text,
+    };
+  } catch (err) {
+    return costPerHourDefaultValue;
+  }
+};
+
@IsDisplayable()
@RefreshOptions({ retryIntervalInMs: 20000 })
 export default class SqlX extends SelfServeBaseClass {
@@ -274,12 +324,15 @@ export default class SqlX extends SelfServeBaseClass {
      hidden: true,
    });

+    regions = await getReadRegions();
+    priceMap = await getPriceMap(regions);
+
    const response = await getCurrentProvisioningState();
    if (response.status && response.status !== "Deleting") {
      defaults.set("enableDedicatedGateway", { value: true });
      defaults.set("sku", { value: response.sku, disabled: true });
      defaults.set("instances", { value: response.instances, disabled: false });
-      defaults.set("costPerHour", { value: costPerHourValue });
+      defaults.set("costPerHour", { value: calculateCost(response.sku, response.instances) });
      defaults.set("connectionString", {
        value: connectionStringValue,
        hidden: false,
@@ -338,8 +391,9 @@ export default class SqlX extends SelfServeBaseClass {
  })
  instances: number;

+  @PropertyInfo(ApproximateCostDropDownInfo)
  @Values({
-    labelTKey: "Cost",
+    labelTKey: "ApproximateCost",
    isDynamicDescription: true,
  })
  costPerHour: string;
--- a/src/SelfServe/SqlX/SqlxTypes.ts
+++ b/src/SelfServe/SqlX/SqlxTypes.ts
@@ -29,3 +29,23 @@ export type UpdateDedicatedGatewayRequestProperties = {
  instanceCount: number;
  serviceType: string;
 };
+
+export type FetchPricesResponse = {
+  Items: Array<PriceItem>;
+  NextPageLink: string | undefined;
+  Count: number;
+};
+
+export type PriceItem = {
+  retailPrice: number;
+  skuName: string;
+};
+
+export type RegionsResponse = {
+  locations: Array<RegionItem>;
+  location: string;
+};
+
+export type RegionItem = {
+  locationName: string;
+};
--- a/src/hooks/useSidePanel.ts
+++ b/src/hooks/useSidePanel.ts
@@ -2,14 +2,17 @@ import create, { UseStore } from "zustand";

 export interface SidePanelState {
  isOpen: boolean;
+  panelWidth: string;
  panelContent?: JSX.Element;
  headerText?: string;
-  openSidePanel: (headerText: string, panelContent: JSX.Element, onClose?: () => void) => void;
+  openSidePanel: (headerText: string, panelContent: JSX.Element, panelWidth?: string, onClose?: () => void) => void;
  closeSidePanel: () => void;
 }

 export const useSidePanel: UseStore<SidePanelState> = create((set) => ({
  isOpen: false,
-  openSidePanel: (headerText, panelContent) => set((state) => ({ ...state, headerText, panelContent, isOpen: true })),
+  panelWidth: "440px",
+  openSidePanel: (headerText, panelContent, panelWidth = "440px") =>
+    set((state) => ({ ...state, headerText, panelContent, panelWidth, isOpen: true })),
  closeSidePanel: () => set((state) => ({ ...state, isOpen: false })),
 }));
--- a/src/index.html
+++ b/src/index.html
@@ -8,54 +8,7 @@

    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
  </head>
-
  <body>
-    <header class="header HeaderBg">
-      <div class="items">
-        <img class="DocDBicon" src="/CosmosDB_20170829.svg" alt="Azure Cosmos DB" />
-        <a class="createdocdbacnt" href="https://aka.ms/documentdbcreate" target="_blank">
-          Create an Azure Cosmos DB account <img class="rightarrowimg" src="/Arrow.svg" alt="" />
-        </a>
-        <span class="title">Azure Cosmos DB Emulator</span>
-      </div>
-    </header>
-
-    <nav class="fixedleftpane">
-      <div
-        id="Quickstart"
-        data-bind="click: quickstart_click, css:{ topSelected: navigationSelection() === 'quickstart' }"
-      >
-        <img id="imgiconwidth1" src="/Quickstart.svg" alt="Open Quick Start" />
-        <span class="menuQuickStart">Quickstart</span>
-      </div>
-
-      <div id="Explorer" data-bind="click: explorer_click, css:{ topSelected: navigationSelection() === 'explorer' }">
-        <img id="imgiconwidth1" src="/Explorer.svg" alt="Open Data Explorer" />
-        <span class="menuExplorer">Explorer</span>
-      </div>
-
-      <div>
-        <a class="feedbackstyle" href="https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20Emulator%20Feedback">
-          <img id="imgiconwidth1" src="/Feedback.svg" alt="Report Issue" />
-          <span class="menuExplorer">Report Issue</span>
-        </a>
-      </div>
-    </nav>
-
-    <iframe
-      name="quickstart"
-      class="iframe"
-      src="quickstart.html"
-      data-bind="visible: navigationSelection() === 'quickstart'"
-    >
-    </iframe>
-
-    <iframe
-      name="explorer"
-      class="iframe"
-      src="explorer.html?platform=Emulator"
-      data-bind="visible: navigationSelection() === 'explorer'"
-    >
-    </iframe>
+    <div id="root"></div>
  </body>
 </html>
--- a/test/cassandra/container.spec.ts
+++ b/test/cassandra/container.spec.ts
@@ -1,18 +1,17 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
-import { safeClick } from "../utils/safeClick";
 import { generateUniqueName } from "../utils/shared";
+import { waitForExplorer } from "../utils/waitForExplorer";
 jest.setTimeout(120000);

 test("Cassandra keyspace and table CRUD", async () => {
  const keyspaceId = generateUniqueName("keyspace");
  const tableId = generateUniqueName("table");
+  page.setDefaultTimeout(50000);

  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-cassandra-runner");
  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
+  const explorer = await waitForExplorer();

  await explorer.click('[data-test="New Table"]');
  await explorer.click('[aria-label="Keyspace id"]');
@@ -20,9 +19,9 @@ test("Cassandra keyspace and table CRUD", async () => {
  await explorer.click('[aria-label="addCollection-tableId"]');
  await explorer.fill('[aria-label="addCollection-tableId"]', tableId);
  await explorer.click("#sidePanelOkButton");
-  await safeClick(explorer, `.nodeItem >> text=${keyspaceId}`);
-  await safeClick(explorer, `[data-test="${tableId}"] [aria-label="More"]`);
-  await safeClick(explorer, 'button[role="menuitem"]:has-text("Delete Table")');
+  await explorer.click(`.nodeItem >> text=${keyspaceId}`);
+  await explorer.click(`[data-test="${tableId}"] [aria-label="More"]`);
+  await explorer.click('button[role="menuitem"]:has-text("Delete Table")');
  await explorer.fill('text=* Confirm by typing the table id >> input[type="text"]', tableId);
  await explorer.click('[aria-label="OK"]');
  await explorer.click(`[data-test="${keyspaceId}"] [aria-label="More"]`);
--- a/test/graph/container.spec.ts
+++ b/test/graph/container.spec.ts
@@ -1,18 +1,16 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
-import { safeClick } from "../utils/safeClick";
 import { generateDatabaseNameWithTimestamp, generateUniqueName } from "../utils/shared";
+import { waitForExplorer } from "../utils/waitForExplorer";
 jest.setTimeout(240000);

 test("Graph CRUD", async () => {
  const databaseId = generateDatabaseNameWithTimestamp();
  const containerId = generateUniqueName("container");
+  page.setDefaultTimeout(50000);

  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-gremlin-runner");
-  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
+  const explorer = await waitForExplorer();

  // Create new database and graph
  await explorer.click('[data-test="New Graph"]');
@@ -20,11 +18,11 @@ test("Graph CRUD", async () => {
  await explorer.fill('[aria-label="Graph id"]', containerId);
  await explorer.fill('[aria-label="Partition key"]', "/pk");
  await explorer.click("#sidePanelOkButton");
-  await safeClick(explorer, `.nodeItem >> text=${databaseId}`);
-  await safeClick(explorer, `.nodeItem >> text=${containerId}`);
+  await explorer.click(`.nodeItem >> text=${databaseId}`);
+  await explorer.click(`.nodeItem >> text=${containerId}`);
  // Delete database and graph
-  await safeClick(explorer, `[data-test="${containerId}"] [aria-label="More"]`);
-  await safeClick(explorer, 'button[role="menuitem"]:has-text("Delete Graph")');
+  await explorer.click(`[data-test="${containerId}"] [aria-label="More"]`);
+  await explorer.click('button[role="menuitem"]:has-text("Delete Graph")');
  await explorer.fill('text=* Confirm by typing the graph id >> input[type="text"]', containerId);
  await explorer.click('[aria-label="OK"]');
  await explorer.click(`[data-test="${databaseId}"] [aria-label="More"]`);
--- a/test/mongo/container.spec.ts
+++ b/test/mongo/container.spec.ts
@@ -1,18 +1,16 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
-import { safeClick } from "../utils/safeClick";
 import { generateDatabaseNameWithTimestamp, generateUniqueName } from "../utils/shared";
+import { waitForExplorer } from "../utils/waitForExplorer";
 jest.setTimeout(240000);

 test("Mongo CRUD", async () => {
  const databaseId = generateDatabaseNameWithTimestamp();
  const containerId = generateUniqueName("container");
+  page.setDefaultTimeout(50000);

  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-mongo-runner");
-  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
+  const explorer = await waitForExplorer();

  // Create new database and collection
  await explorer.click('[data-test="New Collection"]');
@@ -20,10 +18,10 @@ test("Mongo CRUD", async () => {
  await explorer.fill('[aria-label="Collection id"]', containerId);
  await explorer.fill('[aria-label="Shard key"]', "/pk");
  await explorer.click("#sidePanelOkButton");
-  await safeClick(explorer, `.nodeItem >> text=${databaseId}`);
-  await safeClick(explorer, `.nodeItem >> text=${containerId}`);
+  await explorer.click(`.nodeItem >> text=${databaseId}`);
+  await explorer.click(`.nodeItem >> text=${containerId}`);
  // Create indexing policy
-  await safeClick(explorer, ".nodeItem >> text=Settings");
+  await explorer.click(".nodeItem >> text=Settings");
  await explorer.click('button[role="tab"]:has-text("Indexing Policy")');
  await explorer.click('[aria-label="Index Field Name 0"]');
  await explorer.fill('[aria-label="Index Field Name 0"]', "foo");
@@ -34,8 +32,8 @@ test("Mongo CRUD", async () => {
  await explorer.click('[aria-label="Delete index Button"]');
  await explorer.click('[data-test="Save"]');
  // Delete database and collection
-  await safeClick(explorer, `[data-test="${containerId}"] [aria-label="More"]`);
-  await safeClick(explorer, 'button[role="menuitem"]:has-text("Delete Collection")');
+  await explorer.click(`[data-test="${containerId}"] [aria-label="More"]`);
+  await explorer.click('button[role="menuitem"]:has-text("Delete Collection")');
  await explorer.fill('text=* Confirm by typing the collection id >> input[type="text"]', containerId);
  await explorer.click('[aria-label="OK"]');
  await explorer.click(`[data-test="${databaseId}"] [aria-label="More"]`);
--- a/test/mongo/container32.spec.ts
+++ b/test/mongo/container32.spec.ts
@@ -1,18 +1,16 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
-import { safeClick } from "../utils/safeClick";
 import { generateDatabaseNameWithTimestamp, generateUniqueName } from "../utils/shared";
+import { waitForExplorer } from "../utils/waitForExplorer";
 jest.setTimeout(240000);

 test("Mongo CRUD", async () => {
  const databaseId = generateDatabaseNameWithTimestamp();
  const containerId = generateUniqueName("container");
+  page.setDefaultTimeout(50000);

  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-mongo32-runner");
-  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
+  const explorer = await waitForExplorer();

  // Create new database and collection
  await explorer.click('[data-test="New Collection"]');
@@ -20,11 +18,11 @@ test("Mongo CRUD", async () => {
  await explorer.fill('[aria-label="Collection id"]', containerId);
  await explorer.fill('[aria-label="Shard key"]', "pk");
  await explorer.click("#sidePanelOkButton");
-  await safeClick(explorer, `.nodeItem >> text=${databaseId}`);
-  await safeClick(explorer, `.nodeItem >> text=${containerId}`);
+  explorer.click(`.nodeItem >> text=${databaseId}`);
+  explorer.click(`.nodeItem >> text=${containerId}`);
  // Delete database and collection
-  await safeClick(explorer, `[data-test="${containerId}"] [aria-label="More"]`);
-  await safeClick(explorer, 'button[role="menuitem"]:has-text("Delete Collection")');
+  explorer.click(`[data-test="${containerId}"] [aria-label="More"]`);
+  explorer.click('button[role="menuitem"]:has-text("Delete Collection")');
  await explorer.fill('text=* Confirm by typing the collection id >> input[type="text"]', containerId);
  await explorer.click('[aria-label="OK"]');
  await explorer.click(`[data-test="${databaseId}"] [aria-label="More"]`);
--- a/test/notebooks/upload.spec.ts
+++ b/test/notebooks/upload.spec.ts
@@ -2,6 +2,7 @@ import { jest } from "@jest/globals";
 import "expect-playwright";
 import fs from "fs";
 import path from "path";
+import { waitForExplorer } from "../utils/waitForExplorer";
 jest.setTimeout(240000);

 const filename = "GettingStarted.ipynb";
@@ -11,10 +12,7 @@ fs.copyFileSync(path.join(__dirname, filename), path.join(__dirname, fileToUploa

 test("Notebooks", async () => {
  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-sql-runner");
-  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
+  const explorer = await waitForExplorer();
  // Upload and Delete Notebook
  await explorer.click('[data-test="My Notebooks"] [aria-label="More"]');
  await explorer.click('button[role="menuitem"]:has-text("Upload File")');
--- a/test/sql/container.spec.ts
+++ b/test/sql/container.spec.ts
@@ -1,27 +1,24 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
-import { safeClick } from "../utils/safeClick";
 import { generateUniqueName } from "../utils/shared";
+import { waitForExplorer } from "../utils/waitForExplorer";
 jest.setTimeout(120000);

 test("SQL CRUD", async () => {
  const databaseId = generateUniqueName("db");
  const containerId = generateUniqueName("container");
+  page.setDefaultTimeout(50000);

  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-sql-runner");
-  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
-
+  const explorer = await waitForExplorer();
  await explorer.click('[data-test="New Container"]');
  await explorer.fill('[aria-label="New database id"]', databaseId);
  await explorer.fill('[aria-label="Container id"]', containerId);
  await explorer.fill('[aria-label="Partition key"]', "/pk");
  await explorer.click("#sidePanelOkButton");
-  await safeClick(explorer, `.nodeItem >> text=${databaseId}`);
-  await safeClick(explorer, `[data-test="${containerId}"] [aria-label="More"]`);
-  await safeClick(explorer, 'button[role="menuitem"]:has-text("Delete Container")');
+  await explorer.click(`.nodeItem >> text=${databaseId}`);
+  await explorer.click(`[data-test="${containerId}"] [aria-label="More"]`);
+  await explorer.click('button[role="menuitem"]:has-text("Delete Container")');
  await explorer.fill('text=* Confirm by typing the container id >> input[type="text"]', containerId);
  await explorer.click('[aria-label="OK"]');
  await explorer.click(`[data-test="${databaseId}"] [aria-label="More"]`);
--- a/test/tables/container.spec.ts
+++ b/test/tables/container.spec.ts
@@ -1,25 +1,24 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
-import { safeClick } from "../utils/safeClick";
 import { generateUniqueName } from "../utils/shared";
+import { waitForExplorer } from "../utils/waitForExplorer";

 jest.setTimeout(120000);

 test("Tables CRUD", async () => {
  const tableId = generateUniqueName("table");
+  page.setDefaultTimeout(50000);

  await page.goto("https://localhost:1234/testExplorer.html?accountName=portal-tables-runner");
-  await page.waitForSelector("iframe");
-  const explorer = page.frame({
-    name: "explorer",
-  });
+  const explorer = await waitForExplorer();

+  await page.waitForSelector('text="Querying databases"', { state: "detached" });
  await explorer.click('[data-test="New Table"]');
  await explorer.fill('[aria-label="Table id"]', tableId);
  await explorer.click("#sidePanelOkButton");
-  await safeClick(explorer, `[data-test="TablesDB"]`);
-  await safeClick(explorer, `[data-test="${tableId}"] [aria-label="More"]`);
-  await safeClick(explorer, 'button[role="menuitem"]:has-text("Delete Table")');
+  await explorer.click(`[data-test="TablesDB"]`);
+  await explorer.click(`[data-test="${tableId}"] [aria-label="More"]`);
+  await explorer.click('button[role="menuitem"]:has-text("Delete Table")');
  await explorer.fill('text=* Confirm by typing the table id >> input[type="text"]', tableId);
  await explorer.click('[aria-label="OK"]');
  await expect(explorer).not.toHaveText(".dataResourceTree", tableId);
--- a/test/utils/safeClick.ts
+++ b/test/utils/safeClick.ts
@@ -1,11 +0,0 @@
-import { Frame } from "playwright";
-
-export async function safeClick(page: Frame, selector: string): Promise<void> {
-  // TODO: Remove. Playwright does this for you... mostly.
-  // But our knockout+react setup sometimes leaves dom nodes detached and even playwright can't recover.
-  // Resource tree is particually bad.
-  // Ideally this should only be added as a last resort
-  await page.waitForSelector(selector);
-  await page.waitForTimeout(5000);
-  await page.click(selector);
-}
--- a/test/utils/waitForExplorer.ts
+++ b/test/utils/waitForExplorer.ts
@@ -0,0 +1,9 @@
+import { Frame } from "playwright";
+
+export const waitForExplorer = async (): Promise<Frame> => {
+  await page.waitForSelector("iframe");
+  await page.waitForTimeout(5000);
+  return page.frame({
+    name: "explorer",
+  });
+};
--- a/tsconfig.strict.json
+++ b/tsconfig.strict.json
@@ -8,6 +8,7 @@
    "noUnusedParameters": true
  },
  "files": [
+    "./src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx",
    "./src/AuthType.ts",
    "./src/Bindings/ReactBindingHandler.ts",
    "./src/Common/ArrayHashMap.ts",
@@ -26,7 +27,6 @@
    "./src/Common/ObjectCache.ts",
    "./src/Common/OfferUtility.test.ts",
    "./src/Common/OfferUtility.ts",
-    "./src/Common/ResourceTree.tsx",
    "./src/Common/Splitter.ts",
    "./src/Common/ThemeUtility.ts",
    "./src/Common/UrlUtility.ts",
@@ -61,6 +61,7 @@
    "./src/Explorer/Notebook/NotebookRenderer/StatusBar.tsx",
    "./src/Explorer/Notebook/NotebookRenderer/decorators/CellCreator.tsx",
    "./src/Explorer/Notebook/NotebookRenderer/decorators/CellLabeler.tsx",
+    "./src/Explorer/Notebook/NotebookRenderer/decorators/HoverableCell.tsx",
    "./src/Explorer/Notebook/NotebookUtil.ts",
    "./src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzerSplashScreen.tsx",
    "./src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzerUtils.ts",
@@ -84,7 +85,6 @@
    "./src/Explorer/Tree/AccessibleVerticalList.ts",
    "./src/GitHub/GitHubConnector.ts",
    "./src/HostedExplorerChildFrame.ts",
-    "./src/Index.ts",
    "./src/Platform/Hosted/Authorization.ts",
    "./src/Platform/Hosted/Components/MeControl.test.tsx",
    "./src/Platform/Hosted/Components/MeControl.tsx",
@@ -142,7 +142,7 @@
    "./src/userContext.test.ts",
    "src/Common/EntityValue.tsx",
    "./src/Platform/Hosted/Components/SwitchAccount.tsx",
-    "./src/Platform/Hosted/Components/SwitchSubscription.tsx",
+    "./src/Platform/Hosted/Components/SwitchSubscription.tsx"
  ],
  "include": [
    "src/CellOutputViewer/transforms/**/*",
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -198,7 +198,7 @@ module.exports = function (_env = {}, argv = {}) {
    mode: mode,
    entry: {
      main: "./src/Main.tsx",
-      index: "./src/Index.ts",
+      index: "./src/Index.tsx",
      quickstart: "./src/quickstart.ts",
      hostedExplorer: "./src/HostedExplorer.tsx",
      testExplorer: "./test/testExplorer/TestExplorer.ts",
Author	SHA1	Message	Date
sunilyadav840	4ddf46f370	Merge branch 'master' of https://github.com/Azure/cosmos-explorer into tsStrict/fixed-hoverablecell-inputparameter-file	2021-07-26 18:08:24 +05:30
victor-meng	a8bc821dec	Add initializeGitHubRepos function in useNotebooks store (#957 )	2021-07-23 18:44:24 -07:00
victor-meng	1394aae944	Fix validateCollectionId for new tables account (#958 )	2021-07-23 18:44:16 -07:00
victor-meng	fecac5625a	Migrate resource tree for resource token to react (#956 )	2021-07-22 17:11:19 -07:00
victor-meng	dc21032d69	Clean up EditTableEntityPanel (#955 )	2021-07-22 16:18:48 -07:00
siddjoshi-ms	39a67dbc98	Sqlx estimated cost calculation (#925 ) Adds cost estimate for the SqlX services in the Dedicated Gateway blade (queries the new FetchPrices API to retrieve price data)	2021-07-22 10:48:19 -07:00
Sunil Kumar Yadav	ed9cf01b50	Fixed resourse tree collapse issue (#953 )	2021-07-22 11:12:35 -05:00
vaidankarswapnil	e443d17b2e	Migrate Index page to React (#952 )	2021-07-22 10:19:17 -05:00
victor-meng	401660ae15	Fix connect to github (#951 )	2021-07-21 17:47:55 -07:00
Steve Faulkner	c5e4ee9c2b	Upgrade Playwright (#939 )	2021-07-21 19:32:53 -05:00
victor-meng	913fec4e69	Improve e2e stability (#949 )	2021-07-21 16:22:31 -07:00
victor-meng	6d46e48490	Migrate resource tree to react (#941 )	2021-07-20 11:40:04 -07:00
victor-meng	afacde4041	Fix AddTableEntityPanel (#945 ) * Fix AddTableEntityPanel * Add CSS * Fix snapshot	2021-07-19 22:00:33 -07:00
sunilyadav840	1e32838f60	make cellId optional	2021-05-21 14:31:45 +05:30
sunilyadav840	1e0a0b73e0	fixed typescript strict hoverableCell and InputParameter file	2021-05-17 18:08:31 +05:30