initial commit for right panel

2025-12-23 19:01:28 +00:00 · 2021-07-30 12:25:40 +05:30
50 changed files with 3554 additions and 2456 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -191,4 +191,5 @@ 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,7 +2,6 @@

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

  .databaseHeader {
    font-size: 14px;
--- a/less/tree.less
+++ b/less/tree.less
@@ -1,270 +1,273 @@
@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;

-    .collectionList {
-      padding-left: (2 * @MediumSpace);
+    .databaseList {
+        list-style-type: none;
+        padding-left: 0px;
+
+        .collectionList {
+            padding-left:(2 * @MediumSpace);
+        }
+
+        .collectionChildList {
+            padding-left: @LargeSpace;
+        }
+
+        .databaseDocuments {
+            padding-left: (5 * @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
@@ -20623,9 +20623,9 @@
      }
    },
    "playwright": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.13.0.tgz",
-      "integrity": "sha512-GA5OyEeKx1v/pRcANmYncCT67Y7Y4N5zLRU5E690dn/Id10sooR5hQZmCDYsjXlutZb/1q0R3sITALnvhEjCjg==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.10.0.tgz",
+      "integrity": "sha512-b7SGBcCPq4W3pb4ImEDmNXtO0ZkJbZMuWiShsaNJd+rGfY/6fqwgllsAojmxGSgFmijYw7WxCoPiAIEDIH16Kw==",
      "dev": true,
      "requires": {
        "commander": "^6.1.0",
@@ -20640,8 +20640,7 @@
        "proxy-from-env": "^1.1.0",
        "rimraf": "^3.0.2",
        "stack-utils": "^2.0.3",
-        "ws": "^7.4.6",
-        "yazl": "^2.5.1"
+        "ws": "^7.3.1"
      },
      "dependencies": {
        "commander": {
@@ -20673,12 +20672,6 @@
          "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
        }
      }
    },
@@ -26169,15 +26162,6 @@
        "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
@@ -164,7 +164,7 @@
    "mini-css-extract-plugin": "0.4.3",
    "monaco-editor-webpack-plugin": "1.7.0",
    "node-fetch": "2.6.1",
-    "playwright": "1.13.0",
+    "playwright": "1.10.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
@@ -3,7 +3,6 @@ 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";

@@ -53,7 +52,7 @@ export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps
          </div>
        </div>
        {userContext.authType === AuthType.ResourceToken ? (
-          <ResourceTokenTree />
+          <div style={{ overflowY: "auto" }} data-bind="react:resourceTreeForResourceToken" />
        ) : userContext.features.enableKOResourceTree ? (
          <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
        ) : (
--- a/src/Common/dataAccess/createCollection.test.ts
+++ b/src/Common/dataAccess/createCollection.test.ts
@@ -1,10 +1,7 @@
 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";
@@ -26,15 +23,6 @@ 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,16 +4,20 @@ 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 { 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 {
+  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 * as ARMTypes from "../../Utils/arm/generatedClients/cosmos/types";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
@@ -55,16 +59,6 @@ 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":
@@ -83,6 +77,23 @@ 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,
@@ -120,6 +131,23 @@ 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,
@@ -161,6 +189,23 @@ 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,
@@ -188,6 +233,23 @@ 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,
@@ -222,6 +284,22 @@ 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,13 +2,20 @@ 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 { 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 {
+  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 {
  CassandraKeyspaceCreateUpdateParameters,
  CreateUpdateOptions,
@@ -41,11 +48,6 @@ 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) {
@@ -63,6 +65,22 @@ 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: {
@@ -83,6 +101,22 @@ 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: {
@@ -103,6 +137,22 @@ 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: {
@@ -123,6 +173,22 @@ 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
@@ -44,6 +44,10 @@ exports[`SettingsComponent renders 1`] = `
                  "copyNotebook": [Function],
                  "parameters": [Function],
                },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
              },
              "databaseId": "test",
              "defaultTtl": [Function],
@@ -111,6 +115,10 @@ exports[`SettingsComponent renders 1`] = `
                  "copyNotebook": [Function],
                  "parameters": [Function],
                },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
              },
              "databaseId": "test",
              "defaultTtl": [Function],
--- a/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
+++ b/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
@@ -1,6 +1,7 @@
 import {
-  Dropdown,
-  IDropdownOption,
+  DocumentCard,
+  DocumentCardDetails,
+  Dropdown, IDropdownOption,
  IStackTokens,
  Label,
  Link,
@@ -12,19 +13,19 @@ import {
  Stack,
  Text,
  TextField,
-  Toggle,
+  Toggle
 } from "@fluentui/react";
 import { TFunction } from "i18next";
 import * as React from "react";
 import {
  ChoiceItem,
  Description,
-  DescriptionType,
-  Info,
+  DescriptionType, Info,
  InputType,
  InputTypeValue,
  NumberUiType,
  SmartUiInput,
+  Style
 } from "../../../SelfServe/SelfServeTypes";
 import { ToolTipLabelComponent } from "../Settings/SettingsSubComponents/ToolTipLabelComponent";
 import * as InputUtils from "./InputUtils";
@@ -87,6 +88,7 @@ interface Node {
  info?: Info;
  input?: AnyDisplay;
  children?: Node[];
+  style?: Style
 }

 export interface SmartUiDescriptor {
@@ -194,6 +196,14 @@ export class SmartUiComponent extends React.Component<SmartUiComponentProps, Sma

    if (description.type === DescriptionType.Text) {
      return descriptionElement;
+    } else if (description.type === DescriptionType.Card) {
+      return (
+        <DocumentCard styles={{ root: { display: "inline-block", padding: 10 } }}>
+          <DocumentCardDetails>
+            {descriptionElement}
+          </DocumentCardDetails>
+        </DocumentCard>
+      )
    }
    const messageBarType =
      description.type === DescriptionType.InfoMessageBar ? MessageBarType.info : MessageBarType.warning;
@@ -396,18 +406,29 @@ export class SmartUiComponent extends React.Component<SmartUiComponentProps, Sma
    }
  }

-  private renderNode(node: Node): JSX.Element {
+  private renderNode(node: Node, isSectionFloatRight: boolean): JSX.Element {
    const containerStackTokens: IStackTokens = { childrenGap: 10 };
-
+    const isNodeFloatRight = node.style?.isFloatRight === true;
+    console.log(isSectionFloatRight, isNodeFloatRight, node.id)
    return (
      <Stack tokens={containerStackTokens} className="widgetRendererContainer">
-        <Stack.Item>{node.input && this.renderElement(node.input, node.info as Info)}</Stack.Item>
-        {node.children && node.children.map((child) => <div key={child.id}>{this.renderNode(child)}</div>)}
+        {isSectionFloatRight === isNodeFloatRight ?
+          <>
+            <Stack.Item>{node.input && this.renderElement(node.input, node.info as Info)}</Stack.Item>
+          </>
+          : <></>
+        }
+        {node.children && node.children.map((child) => <div key={child.id}>{this.renderNode(child, isSectionFloatRight)}</div>)}
      </Stack>
    );
  }

  render(): JSX.Element {
-    return this.renderNode(this.props.descriptor.root);
+    return (
+      <Stack horizontal tokens={{ childrenGap: 50 }}>
+        {this.renderNode(this.props.descriptor.root, false)}
+        {this.renderNode(this.props.descriptor.root, true)}
+      </Stack>
+    );
  }
 }
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -59,6 +59,7 @@ 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";
@@ -73,6 +74,9 @@ export default class Explorer {
  // Resource Tree
  private resourceTree: ResourceTreeAdapter;

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

@@ -182,6 +186,7 @@ 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) {
--- 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/NotebookManager.tsx
+++ b/src/Explorer/Notebook/NotebookManager.tsx
@@ -29,7 +29,6 @@ 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;

@@ -111,7 +110,6 @@ export default class NotebookManager {
    this.junoClient.subscribeToPinnedRepos((pinnedRepos) => {
      this.params.resourceTree.initializeGitHubRepos(pinnedRepos);
      this.params.resourceTree.triggerRender();
-      useNotebook.getState().initializeGitHubRepos(pinnedRepos);
    });
    this.refreshPinnedRepos();
  }
--- a/src/Explorer/Notebook/useNotebook.ts
+++ b/src/Explorer/Notebook/useNotebook.ts
@@ -6,12 +6,10 @@ 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";

@@ -41,7 +39,6 @@ interface NotebookState {
  updateNotebookItem: (item: NotebookContentItem) => void;
  deleteNotebookItem: (item: NotebookContentItem) => void;
  initializeNotebooksTree: (notebookManager: NotebookManager) => Promise<void>;
-  initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]) => void;
 }

 export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
@@ -156,31 +153,35 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
    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()
-      ? {
+    set({
+      myNotebooksContentRoot: {
+        name: "My Notebooks",
+        path: get().notebookBasePath,
+        type: NotebookContentItemType.Directory,
+      },
+      galleryContentRoot: {
+        name: "Gallery",
+        path: "Gallery",
+        type: NotebookContentItemType.File,
+      },
+    });
+
+    if (notebookManager?.gitHubOAuthService?.isLoggedIn()) {
+      set({
+        gitHubNotebooksContentRoot: {
          name: "GitHub repos",
          path: "PsuedoDir",
          type: NotebookContentItemType.Directory,
-        }
-      : undefined;
-    set({
-      myNotebooksContentRoot,
-      galleryContentRoot,
-      gitHubNotebooksContentRoot,
-    });
+        },
+      });
+    }

    if (get().notebookServerInfo?.notebookServerEndpoint) {
-      const updatedRoot = await notebookManager?.notebookContentClient?.updateItemChildren(myNotebooksContentRoot);
+      const updatedRoot = await notebookManager?.notebookContentClient?.updateItemChildren({
+        name: "My Notebooks",
+        path: get().notebookBasePath,
+        type: NotebookContentItemType.Directory,
+      });
      set({ myNotebooksContentRoot: updatedRoot });

      if (updatedRoot?.children) {
@@ -205,31 +206,4 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
      }
    }
  },
-  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
@@ -33,6 +33,10 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
              "copyNotebook": [Function],
              "parameters": [Function],
            },
+            "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+              "container": [Circular],
+              "parameters": [Function],
+            },
          },
          "getRepo": [Function],
          "pinRepo": [Function],
--- a/src/Explorer/Panes/PanelComponent.less
+++ b/src/Explorer/Panes/PanelComponent.less
@@ -150,6 +150,9 @@
 .backImageIcon {
  margin-top: 8px;
 }
+.entityValueTextField {
+  margin: 24px;
+}
 .addEntityDatePicker {
  max-width: 145px;
 }
--- a/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
+++ b/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
@@ -23,6 +23,10 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
        "copyNotebook": [Function],
        "parameters": [Function],
      },
+      "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+        "container": [Circular],
+        "parameters": [Function],
+      },
    }
  }
  inProgressMessage="Creating directory "
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
@@ -218,7 +218,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =

  if (isEntityValuePanelOpen) {
    return (
-      <Stack style={{ padding: "20px 34px" }}>
+      <Stack style={{ margin: "20px 0", padding: "0 34px" }}>
        <Stack horizontal {...columnProps}>
          <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
          <Label>{entityAttributeProperty}</Label>
--- a/src/Explorer/Panes/Tables/EditTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/EditTableEntityPanel.tsx
@@ -1,11 +1,11 @@
-import { IDropdownOption, Image, Label, Stack, Text, TextField } from "@fluentui/react";
+import { IDropdownOption, Image, IPanelProps, IRenderFunction, 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 { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
+import { PanelContainerComponent } from "../PanelContainerComponent";
 import {
  attributeNameLabel,
  attributeValueLabel,
@@ -29,6 +29,7 @@ import {
  getEntityValuePlaceholder,
  getFormattedTime,
  imageProps,
+  isValidEntities,
  options,
 } from "./Validators/EntityTableHelper";

@@ -58,13 +59,12 @@ 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,44 +190,26 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
    return displayValue;
  };

-  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;
-      }
+  const submit = async (event: React.FormEvent<HTMLInputElement>): Promise<void> => {
+    if (!isValidEntities(entities)) {
+      return undefined;
    }
-
-    setIsExecuting(true);
+    event.preventDefault();
    const entity: Entities.ITableEntity = entityFromAttributes(entities);
    const newTableDataClient = userContext.apiType === "Cassandra" ? cassandraApiClient : tableDataClient;
    const originalDocumentData = userContext.apiType === "Cassandra" ? originalDocument[0] : originalDocument;
-
-    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);
+    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);
+    closeSidePanel();
  };

  const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
@@ -317,81 +299,109 @@ 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 (
-      <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>
+      <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}
+      />
    );
  }

-  const props: RightPaneFormProps = {
-    formError,
-    isExecuting,
-    submitButtonText: "Update",
-    onSubmit,
-  };
-
  return (
-    <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>
+    <PanelContainerComponent
+      headerText="Edit Table Entity"
+      panelWidth="700px"
+      isOpen={true}
+      panelContent={renderPanelContent()}
+      isConsoleExpanded={false}
+    />
  );
 };
--- 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: { marginBottom: 8 } },
+  styles: { root: { width: 680, marginBottom: 8 } },
 };

 // helper functions
--- 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
@@ -158,8 +158,7 @@ export default class QueryTablesTab extends TabsBase {
          queryTablesTab={this}
          tableEntityListViewModel={this.tableEntityListViewModel()}
          cassandraApiClient={new CassandraAPIDataClient()}
-        />,
-        "700px"
+        />
      );
  };

--- a/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx
@@ -0,0 +1,35 @@
+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/ResourceTreeAdapterForResourceToken.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
@@ -1,18 +1,45 @@
-import React from "react";
+import * as ko from "knockout";
+import * as 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 const ResourceTokenTree: React.FC = (): JSX.Element => {
-  const collection = useDatabases((state) => state.resourceTokenCollection);
+export class ResourceTreeAdapterForResourceToken implements ReactAdapter {
+  public parameters: ko.Observable<number>;
+  public myNotebooksContentRoot: NotebookContentItem;

-  const buildCollectionNode = (): TreeNode => {
+  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;
    if (!collection) {
      return {
        label: undefined,
@@ -59,7 +86,9 @@ export const ResourceTokenTree: React.FC = (): JSX.Element => {
      isExpanded: true,
      children: [collectionNode],
    };
-  };
+  }

-  return <TreeComponent className="dataResourceTree" rootNode={buildCollectionNode()} />;
-};
+  public triggerRender() {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
+  }
+}
--- a/src/Explorer/Tree/snapshots/ResourceTreeAdapterForResourceToken.test.tsx.snap
+++ b/src/Explorer/Tree/snapshots/ResourceTreeAdapterForResourceToken.test.tsx.snap
@@ -0,0 +1,36 @@
+// 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,7 +2,6 @@ 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 {
@@ -20,8 +19,6 @@ 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) => ({
@@ -132,17 +129,4 @@ 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
@@ -0,0 +1,23 @@
+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
@@ -1,66 +0,0 @@
-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",
-    "ApproximateCost": "Approximate Cost Per Hour",
+    "Cost": "Cost",
    "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/SelfServe/Decorators.tsx
+++ b/src/SelfServe/Decorators.tsx
@@ -2,7 +2,7 @@
 * @module SelfServe/Decorators
 */

-import { ChoiceItem, Description, Info, NumberUiType, OnChangeCallback, RefreshParams } from "./SelfServeTypes";
+import { ChoiceItem, Description, Info, NumberUiType, OnChangeCallback, RefreshParams, Style } from "./SelfServeTypes";
 import { addPropertyToMap, buildSmartUiDescriptor, DecoratorProperties } from "./SelfServeUtils";

 type ValueOf<T> = T[keyof T];
@@ -162,6 +162,14 @@ export const PropertyInfo = (info: (() => Promise<Info>) | Info): PropertyDecora
  return addToMap({ name: "info", value: info });
 };

+/**
+ * Indicates that the UI element corresponding to the property should have an Info bubble. The Info
+ * bubble is the icon that looks like an "i" which users click on to get more information about the UI element.
+ */
+export const Styles = (style: (() => Promise<Style>) | Style): PropertyDecorator => {
+  return addToMap({ name: "style", value: style });
+};
+
 /**
 * Indicates that this property should correspond to a UI element with the given parameters.
 */
--- a/src/SelfServe/Example/SelfServeExample.tsx
+++ b/src/SelfServe/Example/SelfServeExample.tsx
@@ -1,4 +1,4 @@
-import { IsDisplayable, OnChange, PropertyInfo, RefreshOptions, Values } from "../Decorators";
+import { IsDisplayable, OnChange, PropertyInfo, RefreshOptions, Styles, Values } from "../Decorators";
 import { selfServeTraceStart, selfServeTraceSuccess } from "../SelfServeTelemetryProcessor";
 import {
  ChoiceItem,
@@ -10,7 +10,7 @@ import {
  OnSaveResult,
  RefreshResult,
  SelfServeBaseClass,
-  SmartUiInput,
+  SmartUiInput
 } from "../SelfServeTypes";
 import {
  getMaxCollectionThroughput,
@@ -19,7 +19,7 @@ import {
  getMinDatabaseThroughput,
  initialize,
  onRefreshSelfServeExample,
-  update,
+  update
 } from "./SelfServeExample.rp";
 import { AccountProps, Regions } from "./SelfServeExample.types";

@@ -203,6 +203,20 @@ export default class SelfServeExample extends SelfServeBaseClass {
  })
  enableLogging: boolean;

+  @Styles({ isFloatRight: true })
+  @Values({
+    labelTKey: "DescriptionLabel",
+    description: {
+      textTKey: "DescriptionText",
+      type: DescriptionType.Card,
+      link: {
+        href: "https://aka.ms/cosmos-create-account-portal",
+        textTKey: "DecriptionLinkText",
+      },
+    },
+  })
+  rightDescription: string;
+
  @Values({
    labelTKey: "Account Name",
    placeholderTKey: "AccountNamePlaceHolder",
--- a/src/SelfServe/SelfServeComponent.tsx
+++ b/src/SelfServe/SelfServeComponent.tsx
@@ -7,7 +7,7 @@ import {
  Spinner,
  SpinnerSize,
  Stack,
-  Text,
+  Text
 } from "@fluentui/react";
 import { TFunction } from "i18next";
 import promiseRetry, { AbortError } from "p-retry";
@@ -32,7 +32,7 @@ import {
  SelfServeComponentTelemetryType,
  SelfServeDescriptor,
  SmartUiInput,
-  StringInput,
+  StringInput
 } from "./SelfServeTypes";

 interface SelfServeNotification {
@@ -186,6 +186,7 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
    baselineValues: Map<string, SmartUiInput>
  ): Promise<void> => {
    currentNode.info = await this.getResolvedValue(currentNode.info);
+    currentNode.style = await this.getResolvedValue(currentNode.style);

    if (currentNode.input) {
      currentNode.input = await this.getResolvedInput(currentNode.input, currentValues, baselineValues);
--- a/src/SelfServe/SelfServeTypes.ts
+++ b/src/SelfServe/SelfServeTypes.ts
@@ -55,6 +55,7 @@ export interface Node {
  info?: (() => Promise<Info>) | Info;
  input?: AnyDisplay;
  children?: Node[];
+  style?: (() => Promise<Style>) | Style;
 }

 /**@internal */
@@ -82,6 +83,13 @@ export type AnyDisplay = NumberInput | BooleanInput | StringInput | ChoiceInput
 /**@internal */
 export type InputTypeValue = "number" | "string" | "boolean" | "object";

+/**
+ * Describes the styling of the UI element.
+ */
+export interface Style {
+  isFloatRight: boolean
+}
+
 export type initializeCallback =
  /**
   * @returns Promise of Map of propertyName => {@linkcode SmartUiInput} which will become the current state of the UI.
@@ -228,6 +236,7 @@ export enum DescriptionType {
   * Show the description as a Warning Message bar.
   */
  WarningMessageBar,
+  Card
 }

 /**
--- a/src/SelfServe/SelfServeUtils.tsx
+++ b/src/SelfServe/SelfServeUtils.tsx
@@ -20,6 +20,7 @@ import {
  SelfServeDescriptor,
  SmartUiInput,
  StringInput,
+  Style
 } from "./SelfServeTypes";

 /**
@@ -92,6 +93,7 @@ export interface DecoratorProperties {
  description?: (() => Promise<Description>) | Description;
  isDynamicDescription?: boolean;
  refreshParams?: RefreshParams;
+  style?: (() => Promise<Style>) | Style;
  onChange?: (
    newValue: InputType,
    currentState: Map<string, SmartUiInput>,
@@ -197,6 +199,7 @@ const addToDescriptor = (
    info: value.info,
    input: getInput(value),
    children: [],
+    style: value.style
  } as Node;
  context.delete(key);
  root.children.push(element);
--- a/src/SelfServe/SqlX/SqlX.rp.ts
+++ b/src/SelfServe/SqlX/SqlX.rp.ts
@@ -4,12 +4,7 @@ import { armRequestWithoutPolling } from "../../Utils/arm/request";
 import { selfServeTraceFailure, selfServeTraceStart, selfServeTraceSuccess } from "../SelfServeTelemetryProcessor";
 import { RefreshResult } from "../SelfServeTypes";
 import SqlX from "./SqlX";
-import {
-  FetchPricesResponse,
-  RegionsResponse,
-  SqlxServiceResource,
-  UpdateDedicatedGatewayRequestParameters,
-} from "./SqlxTypes";
+import { SqlxServiceResource, UpdateDedicatedGatewayRequestParameters } from "./SqlxTypes";

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

@@ -133,67 +128,3 @@ 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
@@ -1,30 +1,27 @@
-import { IsDisplayable, OnChange, PropertyInfo, RefreshOptions, Values } from "../Decorators";
+import { IsDisplayable, OnChange, PropertyInfo, RefreshOptions, Styles, Values } from "../Decorators";
 import { selfServeTrace } from "../SelfServeTelemetryProcessor";
 import {
  ChoiceItem,
  Description,
-  DescriptionType,
-  Info,
+  DescriptionType, Info,
  InputType,
  NumberUiType,
  OnSaveResult,
  RefreshResult,
  SelfServeBaseClass,
-  SmartUiInput,
+  SmartUiInput
 } from "../SelfServeTypes";
 import { BladeType, generateBladeLink } from "../SelfServeUtils";
 import {
  deleteDedicatedGatewayResource,
  getCurrentProvisioningState,
-  getPriceMap,
-  getReadRegions,
  refreshDedicatedGatewayProvisioning,
-  updateDedicatedGatewayResource,
+  updateDedicatedGatewayResource
 } from "./SqlX.rp";

-const costPerHourDefaultValue: Description = {
+const costPerHourValue: Description = {
  textTKey: "CostText",
-  type: DescriptionType.Text,
+  type: DescriptionType.Card,
  link: {
    href: "https://aka.ms/cosmos-db-dedicated-gateway-pricing",
    textTKey: "DedicatedGatewayPricing",
@@ -55,10 +52,7 @@ const CosmosD16s = "Cosmos.D16s";

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

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

@@ -121,11 +110,6 @@ 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: {
@@ -137,8 +121,6 @@ const onEnableDedicatedGatewayChange = (
      } as Description,
      hidden: false,
    });
-
-    currentValues.set("costPerHour", { value: costPerHourDefaultValue, hidden: true });
  }
  const sku = currentValues.get("sku");
  const instances = currentValues.get("instances");
@@ -154,6 +136,7 @@ const onEnableDedicatedGatewayChange = (
    disabled: dedicatedGatewayOriginallyEnabled,
  });

+  currentValues.set("costPerHour", { value: costPerHourValue, hidden: hideAttributes });
  currentValues.set("connectionString", {
    value: connectionStringValue,
    hidden: !newValue || !dedicatedGatewayOriginallyEnabled,
@@ -193,40 +176,6 @@ 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 {
@@ -324,15 +273,12 @@ 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: calculateCost(response.sku, response.instances) });
+      defaults.set("costPerHour", { value: costPerHourValue });
      defaults.set("connectionString", {
        value: connectionStringValue,
        hidden: false,
@@ -391,9 +337,9 @@ export default class SqlX extends SelfServeBaseClass {
  })
  instances: number;

-  @PropertyInfo(ApproximateCostDropDownInfo)
+  @Styles({ isFloatRight: true })
  @Values({
-    labelTKey: "ApproximateCost",
+    labelTKey: "Cost",
    isDynamicDescription: true,
  })
  costPerHour: string;
--- a/src/SelfServe/SqlX/SqlxTypes.ts
+++ b/src/SelfServe/SqlX/SqlxTypes.ts
@@ -29,23 +29,3 @@ 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/index.html
+++ b/src/index.html
@@ -8,7 +8,54 @@

    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
  </head>
+
  <body>
-    <div id="root"></div>
+    <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>
  </body>
 </html>
--- a/test/cassandra/container.spec.ts
+++ b/test/cassandra/container.spec.ts
@@ -1,17 +1,17 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
 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 = await waitForExplorer();
+  const explorer = page.frame({
+    name: "explorer",
+  });

  await explorer.click('[data-test="New Table"]');
  await explorer.click('[aria-label="Keyspace id"]');
@@ -19,7 +19,7 @@ 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 explorer.click(`.nodeItem >> text=${keyspaceId}`);
+  await explorer.click(`.nodeItem >> text=${keyspaceId}`, { timeout: 50000 });
  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);
--- a/test/graph/container.spec.ts
+++ b/test/graph/container.spec.ts
@@ -1,16 +1,17 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
 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");
-  const explorer = await waitForExplorer();
+  await page.waitForSelector("iframe");
+  const explorer = page.frame({
+    name: "explorer",
+  });

  // Create new database and graph
  await explorer.click('[data-test="New Graph"]');
@@ -18,7 +19,7 @@ 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 explorer.click(`.nodeItem >> text=${databaseId}`);
+  await explorer.click(`.nodeItem >> text=${databaseId}`, { timeout: 50000 });
  await explorer.click(`.nodeItem >> text=${containerId}`);
  // Delete database and graph
  await explorer.click(`[data-test="${containerId}"] [aria-label="More"]`);
--- a/test/mongo/container.spec.ts
+++ b/test/mongo/container.spec.ts
@@ -1,16 +1,17 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
 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");
-  const explorer = await waitForExplorer();
+  await page.waitForSelector("iframe");
+  const explorer = page.frame({
+    name: "explorer",
+  });

  // Create new database and collection
  await explorer.click('[data-test="New Collection"]');
@@ -18,7 +19,7 @@ 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 explorer.click(`.nodeItem >> text=${databaseId}`);
+  await explorer.click(`.nodeItem >> text=${databaseId}`, { timeout: 50000 });
  await explorer.click(`.nodeItem >> text=${containerId}`);
  // Create indexing policy
  await explorer.click(".nodeItem >> text=Settings");
--- a/test/mongo/container32.spec.ts
+++ b/test/mongo/container32.spec.ts
@@ -1,16 +1,17 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
 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");
-  const explorer = await waitForExplorer();
+  await page.waitForSelector("iframe");
+  const explorer = page.frame({
+    name: "explorer",
+  });

  // Create new database and collection
  await explorer.click('[data-test="New Collection"]');
@@ -18,7 +19,7 @@ test("Mongo CRUD", async () => {
  await explorer.fill('[aria-label="Collection id"]', containerId);
  await explorer.fill('[aria-label="Shard key"]', "pk");
  await explorer.click("#sidePanelOkButton");
-  explorer.click(`.nodeItem >> text=${databaseId}`);
+  explorer.click(`.nodeItem >> text=${databaseId}`, { timeout: 50000 });
  explorer.click(`.nodeItem >> text=${containerId}`);
  // Delete database and collection
  explorer.click(`[data-test="${containerId}"] [aria-label="More"]`);
--- a/test/notebooks/upload.spec.ts
+++ b/test/notebooks/upload.spec.ts
@@ -2,7 +2,6 @@ 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";
@@ -12,7 +11,10 @@ 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");
-  const explorer = await waitForExplorer();
+  await page.waitForSelector("iframe");
+  const explorer = page.frame({
+    name: "explorer",
+  });
  // 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,22 +1,24 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
 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");
-  const explorer = await waitForExplorer();
+  await page.waitForSelector("iframe");
+  const explorer = page.frame({
+    name: "explorer",
+  });
+
  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 explorer.click(`.nodeItem >> text=${databaseId}`);
+  await explorer.click(`.nodeItem >> text=${databaseId}`, { timeout: 50000 });
  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);
--- a/test/tables/container.spec.ts
+++ b/test/tables/container.spec.ts
@@ -1,22 +1,22 @@
 import { jest } from "@jest/globals";
 import "expect-playwright";
 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");
-  const explorer = await waitForExplorer();
+  await page.waitForSelector("iframe");
+  const explorer = page.frame({
+    name: "explorer",
+  });

-  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 explorer.click(`[data-test="TablesDB"]`);
+  await explorer.click(`[data-test="TablesDB"]`, { timeout: 50000 });
  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);
--- a/test/utils/waitForExplorer.ts
+++ b/test/utils/waitForExplorer.ts
@@ -1,9 +0,0 @@
-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,7 +8,6 @@
    "noUnusedParameters": true
  },
  "files": [
-    "./src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx",
    "./src/AuthType.ts",
    "./src/Bindings/ReactBindingHandler.ts",
    "./src/Common/ArrayHashMap.ts",
@@ -61,7 +60,6 @@
    "./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",
@@ -85,6 +83,7 @@
    "./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",
@@ -168,4 +167,4 @@
    "src/Terminal/**/*",
    "src/Utils/arm/**/*"
  ]
-}
+}
--- 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.tsx",
+      index: "./src/Index.ts",
      quickstart: "./src/quickstart.ts",
      hostedExplorer: "./src/HostedExplorer.tsx",
      testExplorer: "./test/testExplorer/TestExplorer.ts",