Clean computeV2 code

2025-12-23 02:41:39 +00:00 · 2022-01-19 11:50:00 -05:00
191 changed files with 2401 additions and 38210 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,11 +92,11 @@ jobs:
          name: dist
          path: dist/
      - name: Upload build to preview blob storage
-        run: az storage blob upload-batch -d '$web' -s 'dist' --account-name cosmosexplorerpreview --destination-path "${{github.event.pull_request.head.sha || github.sha}}" --account-key="${PREVIEW_STORAGE_KEY}"
+        run: az storage blob upload-batch -d '$web' -s 'dist' --account-name cosmosexplorerpreview --subscription cosmosdb-portalteam-generaldemo --destination-path "${{github.event.pull_request.head.sha || github.sha}}" --account-key="${PREVIEW_STORAGE_KEY}"
        env:
          PREVIEW_STORAGE_KEY: ${{ secrets.PREVIEW_STORAGE_KEY }}
      - name: Upload preview config to blob storage
-        run: az storage blob upload -c '$web' -f ./preview/config.json --account-name cosmosexplorerpreview --name "${{github.event.pull_request.head.sha || github.sha}}/config.json" --account-key="${PREVIEW_STORAGE_KEY}"
+        run: az storage blob upload -c '$web' -f ./preview/config.json --account-name cosmosexplorerpreview --subscription cosmosdb-portalteam-generaldemo --name "${{github.event.pull_request.head.sha || github.sha}}/config.json" --account-key="${PREVIEW_STORAGE_KEY}"
        env:
          PREVIEW_STORAGE_KEY: ${{ secrets.PREVIEW_STORAGE_KEY }}
  endtoendemulator:
@@ -182,7 +182,7 @@ jobs:
        with:
          name: dist
      - run: cp ./configs/prod.json config.json
-      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "vimeng@microsoft.com" -Password "$AZURE_DEVOPS_PAT"
+      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "GitHub" -Password "$AZURE_DEVOPS_PAT"
      - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
      - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
      - uses: actions/upload-artifact@v2
@@ -207,7 +207,7 @@ jobs:
          name: dist
      - run: cp ./configs/mpac.json config.json
      - run: sed -i 's/Azure.Cosmos.DB.Data.Explorer/Azure.Cosmos.DB.Data.Explorer.MPAC/g' DataExplorer.nuspec
-      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "vimeng@microsoft.com" -Password "$AZURE_DEVOPS_PAT"
+      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "GitHub" -Password "$AZURE_DEVOPS_PAT"
      - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
      - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
      - uses: actions/upload-artifact@v2
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,8 +12,7 @@
        "--inspect-brk",
        "${workspaceRoot}/node_modules/jest/bin/jest.js",
        "--runInBand",
-        "--coverage",
-        "false"
+        "--coverage", "false"
      ],
      "console": "integratedTerminal",
      "internalConsoleOptions": "neverOpen",
@@ -27,8 +26,7 @@
        "--inspect-brk",
        "${workspaceRoot}/node_modules/jest/bin/jest.js",
        "${fileBasenameNoExtension}",
-        "--coverage",
-        "false",
+        "--coverage", "false",
        // "--watch",
        // // --no-cache only used to make --watch work. Otherwise jest ignores the breakpoints.
        // // https://github.com/facebook/jest/issues/6683
--- a/configs/mpac.json
+++ b/configs/mpac.json
@@ -1,5 +1,4 @@
 {
  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com",
-  "isTerminalEnabled" : true,
-  "isPhoenixEnabled" : true
+  "isTerminalEnabled" : true
 }
--- a/configs/prod.json
+++ b/configs/prod.json
@@ -1,5 +1,4 @@
 {
 "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
- "isTerminalEnabled" : false,
- "isPhoenixEnabled" : false
+ "isTerminalEnabled" : false
 }
--- a/docs/enums/selfserve_selfserveutils.bladetype.html
+++ b/docs/enums/selfserve_selfserveutils.bladetype.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <html class="default no-js">
-
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -10,292 +9,256 @@
 	<link rel="stylesheet" href="../assets/css/main.css">
 	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
-
 <body>
-	<header>
-		<div class="tsd-page-toolbar">
-			<div class="container">
-				<div class="table-wrap">
-					<div class="table-cell" id="tsd-search" data-index="../assets/js/search.json" data-base="..">
-						<div class="field">
-							<label for="tsd-search-field" class="tsd-widget search no-caption">Search</label>
-							<input id="tsd-search-field" type="text" />
-						</div>
-						<ul class="results">
-							<li class="state loading">Preparing search index...</li>
-							<li class="state failure">The search index is not available</li>
-						</ul>
-						<a href="../index.html" class="title">cosmos-explorer</a>
+<header>
+	<div class="tsd-page-toolbar">
+		<div class="container">
+			<div class="table-wrap">
+				<div class="table-cell" id="tsd-search" data-index="../assets/js/search.json" data-base="..">
+					<div class="field">
+						<label for="tsd-search-field" class="tsd-widget search no-caption">Search</label>
+						<input id="tsd-search-field" type="text" />
 					</div>
-					<div class="table-cell" id="tsd-widgets">
-						<div id="tsd-filter">
-							<a href="#" class="tsd-widget options no-caption" data-toggle="options">Options</a>
-							<div class="tsd-filter-group">
-								<div class="tsd-select" id="tsd-filter-visibility">
-									<span class="tsd-select-label">All</span>
-									<ul class="tsd-select-list">
-										<li data-value="public">Public</li>
-										<li data-value="protected">Public/Protected</li>
-										<li data-value="private" class="selected">All</li>
-									</ul>
-								</div>
-								<input type="checkbox" id="tsd-filter-inherited" checked />
-								<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
-								<input type="checkbox" id="tsd-filter-externals" checked />
-								<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
+					<ul class="results">
+						<li class="state loading">Preparing search index...</li>
+						<li class="state failure">The search index is not available</li>
+					</ul>
+					<a href="../index.html" class="title">cosmos-explorer</a>
+				</div>
+				<div class="table-cell" id="tsd-widgets">
+					<div id="tsd-filter">
+						<a href="#" class="tsd-widget options no-caption" data-toggle="options">Options</a>
+						<div class="tsd-filter-group">
+							<div class="tsd-select" id="tsd-filter-visibility">
+								<span class="tsd-select-label">All</span>
+								<ul class="tsd-select-list">
+									<li data-value="public">Public</li>
+									<li data-value="protected">Public/Protected</li>
+									<li data-value="private" class="selected">All</li>
+								</ul>
 							</div>
+							<input type="checkbox" id="tsd-filter-inherited" checked />
+							<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
+							<input type="checkbox" id="tsd-filter-externals" checked />
+							<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
 						</div>
-						<a href="#" class="tsd-widget menu no-caption" data-toggle="menu">Menu</a>
 					</div>
+					<a href="#" class="tsd-widget menu no-caption" data-toggle="menu">Menu</a>
 				</div>
 			</div>
 		</div>
-		<div class="tsd-page-title">
-			<div class="container">
-				<ul class="tsd-breadcrumb">
-					<li>
-						<a href="../modules.html">cosmos-explorer</a>
-					</li>
-					<li>
-						<a href="../modules/selfserve_selfserveutils.html">SelfServe/SelfServeUtils</a>
-					</li>
-					<li>
-						<a href="selfserve_selfserveutils.bladetype.html">BladeType</a>
-					</li>
-				</ul>
-				<h1>Enumeration BladeType</h1>
-			</div>
+	</div>
+	<div class="tsd-page-title">
+		<div class="container">
+			<ul class="tsd-breadcrumb">
+				<li>
+					<a href="../modules.html">cosmos-explorer</a>
+				</li>
+				<li>
+					<a href="../modules/selfserve_selfserveutils.html">SelfServe/SelfServeUtils</a>
+				</li>
+				<li>
+					<a href="selfserve_selfserveutils.bladetype.html">BladeType</a>
+				</li>
+			</ul>
+			<h1>Enumeration BladeType</h1>
 		</div>
-	</header>
-	<div class="container container-main">
-		<div class="row">
-			<div class="col-8 col-content">
-				<section class="tsd-panel tsd-comment">
+	</div>
+</header>
+<div class="container container-main">
+	<div class="row">
+		<div class="col-8 col-content">
+			<section class="tsd-panel tsd-comment">
+				<div class="tsd-comment tsd-typography">
+					<div class="lead">
+						<p>Portal Blade types</p>
+					</div>
+				</div>
+			</section>
+			<section class="tsd-panel-group tsd-index-group">
+				<h2>Index</h2>
+				<section class="tsd-panel tsd-index-panel">
+					<div class="tsd-index-content">
+						<section class="tsd-index-section ">
+							<h3>Enumeration members</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="selfserve_selfserveutils.bladetype.html#cassandrakeys" class="tsd-kind-icon">Cassandra<wbr>Keys</a></li>
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="selfserve_selfserveutils.bladetype.html#gremlinkeys" class="tsd-kind-icon">Gremlin<wbr>Keys</a></li>
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="selfserve_selfserveutils.bladetype.html#metrics" class="tsd-kind-icon">Metrics</a></li>
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="selfserve_selfserveutils.bladetype.html#mongokeys" class="tsd-kind-icon">Mongo<wbr>Keys</a></li>
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="selfserve_selfserveutils.bladetype.html#sqlkeys" class="tsd-kind-icon">Sql<wbr>Keys</a></li>
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="selfserve_selfserveutils.bladetype.html#tablekeys" class="tsd-kind-icon">Table<wbr>Keys</a></li>
+							</ul>
+						</section>
+					</div>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Enumeration members</h2>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="cassandrakeys" class="tsd-anchor"></a>
+					<h3>Cassandra<wbr>Keys</h3>
+					<div class="tsd-signature tsd-kind-icon">Cassandra<wbr>Keys<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;cassandraDbKeys&quot;</span></div>
+					<aside class="tsd-sources">
+					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>Portal Blade types</p>
+							<p>Keys blade of a Cassandra API account.</p>
 						</div>
 					</div>
 				</section>
-				<section class="tsd-panel-group tsd-index-group">
-					<h2>Index</h2>
-					<section class="tsd-panel tsd-index-panel">
-						<div class="tsd-index-content">
-							<section class="tsd-index-section ">
-								<h3>Enumeration members</h3>
-								<ul class="tsd-index-list">
-									<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a
-											href="selfserve_selfserveutils.bladetype.html#cassandrakeys"
-											class="tsd-kind-icon">Cassandra<wbr>Keys</a></li>
-									<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a
-											href="selfserve_selfserveutils.bladetype.html#gremlinkeys"
-											class="tsd-kind-icon">Gremlin<wbr>Keys</a></li>
-									<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a
-											href="selfserve_selfserveutils.bladetype.html#metrics"
-											class="tsd-kind-icon">Metrics</a></li>
-									<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a
-											href="selfserve_selfserveutils.bladetype.html#mongokeys"
-											class="tsd-kind-icon">Mongo<wbr>Keys</a></li>
-									<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a
-											href="selfserve_selfserveutils.bladetype.html#sqlkeys"
-											class="tsd-kind-icon">Sql<wbr>Keys</a></li>
-									<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a
-											href="selfserve_selfserveutils.bladetype.html#tablekeys"
-											class="tsd-kind-icon">Table<wbr>Keys</a></li>
-								</ul>
-							</section>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="gremlinkeys" class="tsd-anchor"></a>
+					<h3>Gremlin<wbr>Keys</h3>
+					<div class="tsd-signature tsd-kind-icon">Gremlin<wbr>Keys<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;keys&quot;</span></div>
+					<aside class="tsd-sources">
+					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Keys blade of a Gremlin API account.</p>
 						</div>
-					</section>
+					</div>
 				</section>
-				<section class="tsd-panel-group tsd-member-group ">
-					<h2>Enumeration members</h2>
-					<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-						<a name="cassandrakeys" class="tsd-anchor"></a>
-						<h3>Cassandra<wbr>Keys</h3>
-						<div class="tsd-signature tsd-kind-icon">Cassandra<wbr>Keys<span
-								class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =
-								&quot;cassandraDbKeys&quot;</span></div>
-						<aside class="tsd-sources">
-						</aside>
-						<div class="tsd-comment tsd-typography">
-							<div class="lead">
-								<p>Keys blade of a Azure Cosmos DB for Apache Cassandra account.</p>
-							</div>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="metrics" class="tsd-anchor"></a>
+					<h3>Metrics</h3>
+					<div class="tsd-signature tsd-kind-icon">Metrics<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;metrics&quot;</span></div>
+					<aside class="tsd-sources">
+					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Metrics blade of an Azure Cosmos DB account.</p>
 						</div>
-					</section>
-					<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-						<a name="gremlinkeys" class="tsd-anchor"></a>
-						<h3>Gremlin<wbr>Keys</h3>
-						<div class="tsd-signature tsd-kind-icon">Gremlin<wbr>Keys<span
-								class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =
-								&quot;keys&quot;</span></div>
-						<aside class="tsd-sources">
-						</aside>
-						<div class="tsd-comment tsd-typography">
-							<div class="lead">
-								<p>Keys blade of a Azure Cosmos DB for Apache Gremlin account.</p>
-							</div>
-						</div>
-					</section>
-					<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-						<a name="metrics" class="tsd-anchor"></a>
-						<h3>Metrics</h3>
-						<div class="tsd-signature tsd-kind-icon">Metrics<span class="tsd-signature-symbol">:</span>
-							<span class="tsd-signature-symbol"> = &quot;metrics&quot;</span></div>
-						<aside class="tsd-sources">
-						</aside>
-						<div class="tsd-comment tsd-typography">
-							<div class="lead">
-								<p>Metrics blade of an Azure Cosmos DB account.</p>
-							</div>
-						</div>
-					</section>
-					<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-						<a name="mongokeys" class="tsd-anchor"></a>
-						<h3>Mongo<wbr>Keys</h3>
-						<div class="tsd-signature tsd-kind-icon">Mongo<wbr>Keys<span
-								class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =
-								&quot;mongoDbKeys&quot;</span></div>
-						<aside class="tsd-sources">
-						</aside>
-						<div class="tsd-comment tsd-typography">
-							<div class="lead">
-								<p>Keys blade of a Azure Cosmos DB for MongoDB account.</p>
-							</div>
-						</div>
-					</section>
-					<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-						<a name="sqlkeys" class="tsd-anchor"></a>
-						<h3>Sql<wbr>Keys</h3>
-						<div class="tsd-signature tsd-kind-icon">Sql<wbr>Keys<span class="tsd-signature-symbol">:</span>
-							<span class="tsd-signature-symbol"> = &quot;keys&quot;</span></div>
-						<aside class="tsd-sources">
-						</aside>
-						<div class="tsd-comment tsd-typography">
-							<div class="lead">
-								<p>Keys blade of a Azure Cosmos DB for NoSQL account.</p>
-							</div>
-						</div>
-					</section>
-					<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-						<a name="tablekeys" class="tsd-anchor"></a>
-						<h3>Table<wbr>Keys</h3>
-						<div class="tsd-signature tsd-kind-icon">Table<wbr>Keys<span
-								class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =
-								&quot;tableKeys&quot;</span></div>
-						<aside class="tsd-sources">
-						</aside>
-						<div class="tsd-comment tsd-typography">
-							<div class="lead">
-								<p>Keys blade of a Azure Cosmos DB for Table account.</p>
-							</div>
-						</div>
-					</section>
+					</div>
 				</section>
-			</div>
-			<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
-				<nav class="tsd-navigation primary">
-					<ul>
-						<li class=" ">
-							<a href="../modules.html">Modules</a>
-						</li>
-						<li class=" tsd-kind-module">
-							<a href="../modules/selfserve.html">Self<wbr>Serve</a>
-						</li>
-						<li class=" tsd-kind-module">
-							<a href="../modules/selfserve___what_is_currently_supported_.html">Self<wbr>Serve -<wbr>
-								<wbr>What is currently supported?</a>
-						</li>
-						<li class=" tsd-kind-module">
-							<a href="../modules/selfserve_decorators.html">Self<wbr>Serve/<wbr>Decorators</a>
-						</li>
-						<li class=" tsd-kind-module">
-							<a
-								href="../modules/selfserve_selfservetelemetryprocessor.html">Self<wbr>Serve/<wbr>Self<wbr>Serve<wbr>Telemetry<wbr>Processor</a>
-						</li>
-						<li class=" tsd-kind-module">
-							<a
-								href="../modules/selfserve_selfservetypes.html">Self<wbr>Serve/<wbr>Self<wbr>Serve<wbr>Types</a>
-						</li>
-						<li class="current tsd-kind-module">
-							<a
-								href="../modules/selfserve_selfserveutils.html">Self<wbr>Serve/<wbr>Self<wbr>Serve<wbr>Utils</a>
-						</li>
-					</ul>
-				</nav>
-				<nav class="tsd-navigation secondary menu-sticky">
-					<ul class="before-current">
-					</ul>
-					<ul class="current">
-						<li class="current tsd-kind-enum tsd-parent-kind-module">
-							<a href="selfserve_selfserveutils.bladetype.html" class="tsd-kind-icon">Blade<wbr>Type</a>
-							<ul>
-								<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-									<a href="selfserve_selfserveutils.bladetype.html#cassandrakeys"
-										class="tsd-kind-icon">Cassandra<wbr>Keys</a>
-								</li>
-								<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-									<a href="selfserve_selfserveutils.bladetype.html#gremlinkeys"
-										class="tsd-kind-icon">Gremlin<wbr>Keys</a>
-								</li>
-								<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-									<a href="selfserve_selfserveutils.bladetype.html#metrics"
-										class="tsd-kind-icon">Metrics</a>
-								</li>
-								<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-									<a href="selfserve_selfserveutils.bladetype.html#mongokeys"
-										class="tsd-kind-icon">Mongo<wbr>Keys</a>
-								</li>
-								<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-									<a href="selfserve_selfserveutils.bladetype.html#sqlkeys"
-										class="tsd-kind-icon">Sql<wbr>Keys</a>
-								</li>
-								<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-									<a href="selfserve_selfserveutils.bladetype.html#tablekeys"
-										class="tsd-kind-icon">Table<wbr>Keys</a>
-								</li>
-							</ul>
-						</li>
-					</ul>
-					<ul class="after-current">
-						<li class=" tsd-kind-enum tsd-parent-kind-module">
-							<a href="selfserve_selfserveutils.selfservetype.html"
-								class="tsd-kind-icon">Self<wbr>Serve<wbr>Type</a>
-						</li>
-						<li class=" tsd-kind-function tsd-parent-kind-module">
-							<a href="../modules/selfserve_selfserveutils.html#generatebladelink"
-								class="tsd-kind-icon">generate<wbr>Blade<wbr>Link</a>
-						</li>
-					</ul>
-				</nav>
-			</div>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="mongokeys" class="tsd-anchor"></a>
+					<h3>Mongo<wbr>Keys</h3>
+					<div class="tsd-signature tsd-kind-icon">Mongo<wbr>Keys<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;mongoDbKeys&quot;</span></div>
+					<aside class="tsd-sources">
+					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Keys blade of a Mongo API account.</p>
+						</div>
+					</div>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="sqlkeys" class="tsd-anchor"></a>
+					<h3>Sql<wbr>Keys</h3>
+					<div class="tsd-signature tsd-kind-icon">Sql<wbr>Keys<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;keys&quot;</span></div>
+					<aside class="tsd-sources">
+					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Keys blade of a SQL API account.</p>
+						</div>
+					</div>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="tablekeys" class="tsd-anchor"></a>
+					<h3>Table<wbr>Keys</h3>
+					<div class="tsd-signature tsd-kind-icon">Table<wbr>Keys<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;tableKeys&quot;</span></div>
+					<aside class="tsd-sources">
+					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Keys blade of a Table API account.</p>
+						</div>
+					</div>
+				</section>
+			</section>
+		</div>
+		<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
+			<nav class="tsd-navigation primary">
+				<ul>
+					<li class=" ">
+						<a href="../modules.html">Modules</a>
+					</li>
+					<li class=" tsd-kind-module">
+						<a href="../modules/selfserve.html">Self<wbr>Serve</a>
+					</li>
+					<li class=" tsd-kind-module">
+						<a href="../modules/selfserve___what_is_currently_supported_.html">Self<wbr>Serve -<wbr> <wbr>What is currently supported?</a>
+					</li>
+					<li class=" tsd-kind-module">
+						<a href="../modules/selfserve_decorators.html">Self<wbr>Serve/<wbr>Decorators</a>
+					</li>
+					<li class=" tsd-kind-module">
+						<a href="../modules/selfserve_selfservetelemetryprocessor.html">Self<wbr>Serve/<wbr>Self<wbr>Serve<wbr>Telemetry<wbr>Processor</a>
+					</li>
+					<li class=" tsd-kind-module">
+						<a href="../modules/selfserve_selfservetypes.html">Self<wbr>Serve/<wbr>Self<wbr>Serve<wbr>Types</a>
+					</li>
+					<li class="current tsd-kind-module">
+						<a href="../modules/selfserve_selfserveutils.html">Self<wbr>Serve/<wbr>Self<wbr>Serve<wbr>Utils</a>
+					</li>
+				</ul>
+			</nav>
+			<nav class="tsd-navigation secondary menu-sticky">
+				<ul class="before-current">
+				</ul>
+				<ul class="current">
+					<li class="current tsd-kind-enum tsd-parent-kind-module">
+						<a href="selfserve_selfserveutils.bladetype.html" class="tsd-kind-icon">Blade<wbr>Type</a>
+						<ul>
+							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+								<a href="selfserve_selfserveutils.bladetype.html#cassandrakeys" class="tsd-kind-icon">Cassandra<wbr>Keys</a>
+							</li>
+							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+								<a href="selfserve_selfserveutils.bladetype.html#gremlinkeys" class="tsd-kind-icon">Gremlin<wbr>Keys</a>
+							</li>
+							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+								<a href="selfserve_selfserveutils.bladetype.html#metrics" class="tsd-kind-icon">Metrics</a>
+							</li>
+							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+								<a href="selfserve_selfserveutils.bladetype.html#mongokeys" class="tsd-kind-icon">Mongo<wbr>Keys</a>
+							</li>
+							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+								<a href="selfserve_selfserveutils.bladetype.html#sqlkeys" class="tsd-kind-icon">Sql<wbr>Keys</a>
+							</li>
+							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+								<a href="selfserve_selfserveutils.bladetype.html#tablekeys" class="tsd-kind-icon">Table<wbr>Keys</a>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<ul class="after-current">
+					<li class=" tsd-kind-enum tsd-parent-kind-module">
+						<a href="selfserve_selfserveutils.selfservetype.html" class="tsd-kind-icon">Self<wbr>Serve<wbr>Type</a>
+					</li>
+					<li class=" tsd-kind-function tsd-parent-kind-module">
+						<a href="../modules/selfserve_selfserveutils.html#generatebladelink" class="tsd-kind-icon">generate<wbr>Blade<wbr>Link</a>
+					</li>
+				</ul>
+			</nav>
 		</div>
 	</div>
-	<footer class="with-border-bottom">
-		<div class="container">
-			<h2>Legend</h2>
-			<div class="tsd-legend-group">
-				<ul class="tsd-legend">
-					<li class="tsd-kind-function"><span class="tsd-kind-icon">Function</span></li>
-					<li class="tsd-kind-type-alias"><span class="tsd-kind-icon">Type alias</span></li>
-				</ul>
-				<ul class="tsd-legend">
-					<li class="tsd-kind-enum"><span class="tsd-kind-icon">Enumeration</span></li>
-				</ul>
-				<ul class="tsd-legend">
-					<li class="tsd-kind-interface"><span class="tsd-kind-icon">Interface</span></li>
-				</ul>
-				<ul class="tsd-legend">
-					<li class="tsd-kind-class"><span class="tsd-kind-icon">Class</span></li>
-				</ul>
-			</div>
+</div>
+<footer class="with-border-bottom">
+	<div class="container">
+		<h2>Legend</h2>
+		<div class="tsd-legend-group">
+			<ul class="tsd-legend">
+				<li class="tsd-kind-function"><span class="tsd-kind-icon">Function</span></li>
+				<li class="tsd-kind-type-alias"><span class="tsd-kind-icon">Type alias</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-enum"><span class="tsd-kind-icon">Enumeration</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-interface"><span class="tsd-kind-icon">Interface</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-class"><span class="tsd-kind-icon">Class</span></li>
+			</ul>
 		</div>
-	</footer>
-	<div class="container tsd-generator">
-		<p>Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p>
 	</div>
-	<div class="overlay"></div>
-	<script src="../assets/js/main.js"></script>
+</footer>
+<div class="container tsd-generator">
+	<p>Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p>
+</div>
+<div class="overlay"></div>
+<script src="../assets/js/main.js"></script>
 </body>
-
 </html>
--- a/images/CarouselImage1.svg
+++ b/images/CarouselImage1.svg
--- a/images/CarouselImage2.svg
+++ b/images/CarouselImage2.svg
--- a/images/Connect_color.svg
+++ b/images/Connect_color.svg
@@ -1,23 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_480_185430)">
-<path d="M35.4911 6.39638L33.4106 4.31591L37.559 0.167553C37.6611 0.0654497 37.7996 0.00808785 37.944 0.00808785C38.0884 0.00808801 38.2269 0.0654482 38.329 0.167551L39.641 1.47963C39.7431 1.58173 39.8005 1.72021 39.8005 1.86461C39.8005 2.009 39.7431 2.14749 39.641 2.24959L35.4927 6.39795L35.4911 6.39638Z" fill="#32BEDD"/>
-<path d="M4.45313 33.6455L6.53988 35.7323L2.44494 39.8272C2.34367 39.9285 2.20632 39.9853 2.06311 39.9853C1.91989 39.9853 1.78254 39.9285 1.68127 39.8272L0.364478 38.5104C0.312974 38.4606 0.271905 38.401 0.243665 38.3351C0.215426 38.2692 0.20058 38.1984 0.199995 38.1267C0.19941 38.0551 0.213098 37.984 0.240258 37.9177C0.267419 37.8514 0.307509 37.7911 0.358193 37.7404L4.45313 33.6455Z" fill="#0078D4"/>
-<path d="M5.09381 25.0287C3.78099 26.3415 3.04346 28.1221 3.04346 29.9787C3.04346 31.8353 3.78099 33.6159 5.09381 34.9287C6.40664 36.2415 8.1872 36.9791 10.0438 36.9791C11.9004 36.9791 13.681 36.2415 14.9938 34.9287L18.2027 31.7176L8.30492 21.8198L5.09381 25.0287Z" fill="url(#paint0_linear_480_185430)"/>
-<path d="M17.4209 18.1581L17.6157 18.353C17.8133 18.5505 17.9242 18.8185 17.9242 19.0978C17.9242 19.3772 17.8133 19.6451 17.6157 19.8426L13.6009 23.8574L11.918 22.1745L15.9344 18.1581C16.1319 17.9606 16.3998 17.8496 16.6792 17.8496C16.9586 17.8496 17.2265 17.9606 17.424 18.1581L17.4209 18.1581Z" fill="#C3F1FF"/>
-<path d="M21.5835 22.32L21.7783 22.5149C21.9759 22.7124 22.0868 22.9803 22.0868 23.2597C22.0868 23.539 21.9759 23.807 21.7783 24.0045L17.7588 28.024L16.0759 26.3411L20.097 22.32C20.2945 22.1225 20.5624 22.0115 20.8418 22.0115C21.1212 22.0115 21.3891 22.1225 21.5866 22.32L21.5835 22.32Z" fill="#C3F1FF"/>
-<path d="M20.9363 30.0618L9.87241 18.9979C9.66673 18.7922 9.33327 18.7922 9.12759 18.9979L7.67566 20.4498C7.46999 20.6555 7.46999 20.989 7.67566 21.1946L18.7395 32.2585C18.9452 32.4642 19.2787 32.4642 19.4843 32.2585L20.9363 30.8066C21.1419 30.6009 21.1419 30.2674 20.9363 30.0618Z" fill="#5EA0EF"/>
-<path d="M34.9067 14.9711C36.2196 13.6583 36.9571 11.8777 36.9571 10.0211C36.9571 8.1645 36.2196 6.38393 34.9067 5.07111C33.5939 3.75829 31.8134 3.02075 29.9567 3.02075C28.1001 3.02075 26.3196 3.75829 25.0067 5.07111L21.7979 8.28222L31.6956 18.18L34.9067 14.9711Z" fill="#ECF4FD"/>
-<path d="M22.5828 21.8375L22.388 21.6426C22.1904 21.4451 22.0795 21.1772 22.0795 20.8978C22.0795 20.6184 22.1904 20.3505 22.388 20.153L26.4075 16.1335L28.092 17.8179L24.0677 21.8422C23.8698 22.0376 23.6025 22.1469 23.3243 22.146C23.0461 22.1451 22.7795 22.0342 22.5828 21.8375Z" fill="#ECF4FD"/>
-<path d="M18.4178 17.6802L18.2229 17.4854C18.0254 17.2878 17.9144 17.0199 17.9144 16.7406C17.9144 16.4612 18.0254 16.1933 18.2229 15.9957L22.2409 11.9778L23.9254 13.6623L19.909 17.6787C19.7115 17.8762 19.4435 17.9872 19.1642 17.9872C18.8848 17.9872 18.6169 17.8762 18.4194 17.6787L18.4178 17.6802Z" fill="#ECF4FD"/>
-<path d="M19.0642 9.93799L30.1281 21.0019C30.3338 21.2075 30.6672 21.2075 30.8729 21.0019L32.3248 19.5499C32.5305 19.3443 32.5305 19.0108 32.3248 18.8051L21.261 7.74125C21.0553 7.53557 20.7218 7.53557 20.5161 7.74125L19.0642 9.19317C18.8585 9.39885 18.8585 9.73232 19.0642 9.93799Z" fill="#ECF4FD"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_480_185430" x1="10.6227" y1="21.8179" x2="10.6227" y2="36.9783" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5EA0EF"/>
-<stop offset="0.997" stop-color="#0078D4"/>
-</linearGradient>
-<clipPath id="clip0_480_185430">
-<rect width="40" height="40" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/images/Containers.svg
+++ b/images/Containers.svg
@@ -1,8 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 34.635C24 34.8143 23.9647 34.9918 23.8961 35.1574C23.8275 35.323 23.727 35.4734 23.6002 35.6002C23.4734 35.727 23.323 35.8275 23.1574 35.8961C22.9918 35.9647 22.8143 36 22.635 36H1.365C1.18575 36 1.00825 35.9647 0.842637 35.8961C0.677028 35.8275 0.526551 35.727 0.399799 35.6002C0.273047 35.4734 0.172502 35.323 0.103904 35.1574C0.0353068 34.9918 0 34.8143 0 34.635L0 13.365C0 13.003 0.143812 12.6558 0.399799 12.3998C0.655786 12.1438 1.00298 12 1.365 12H22.635C22.997 12 23.3442 12.1438 23.6002 12.3998C23.8562 12.6558 24 13.003 24 13.365V34.635Z" fill="#005BA1"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M30 28.635C30 28.997 29.8562 29.3442 29.6002 29.6002C29.3442 29.8562 28.997 30 28.635 30H7.365C7.00298 30 6.65579 29.8562 6.3998 29.6002C6.14381 29.3442 6 28.997 6 28.635V7.365C6 7.00298 6.14381 6.65579 6.3998 6.3998C6.65579 6.14381 7.00298 6 7.365 6H28.635C28.997 6 29.3442 6.14381 29.6002 6.3998C29.8562 6.65579 30 7.00298 30 7.365V28.635Z" fill="#5EA0EF"/>
-<path d="M22.635 12H6V28.635C6 28.997 6.14381 29.3442 6.3998 29.6002C6.65579 29.8562 7.00298 30 7.365 30H24V13.365C24 13.003 23.8562 12.6558 23.6002 12.3998C23.3442 12.1438 22.997 12 22.635 12Z" fill="#0078D4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36 22.635C36 22.8143 35.9647 22.9918 35.8961 23.1574C35.8275 23.323 35.727 23.4734 35.6002 23.6002C35.4734 23.727 35.323 23.8275 35.1574 23.8961C34.9918 23.9647 34.8143 24 34.635 24H13.365C13.003 24 12.6558 23.8562 12.3998 23.6002C12.1438 23.3442 12 22.997 12 22.635V1.365C12 1.00298 12.1438 0.655786 12.3998 0.399799C12.6558 0.143812 13.003 0 13.365 0L34.635 0C34.8143 0 34.9918 0.0353068 35.1574 0.103904C35.323 0.172502 35.4734 0.273047 35.6002 0.399799C35.727 0.526551 35.8275 0.677028 35.8961 0.842637C35.9647 1.00825 36 1.18575 36 1.365V22.635Z" fill="#E6E7E8"/>
-<path d="M22.635 12H12V22.635C12 22.997 12.1438 23.3442 12.3998 23.6002C12.6558 23.8562 13.003 24 13.365 24H24V13.365C24 13.003 23.8562 12.6558 23.6002 12.3998C23.3442 12.1438 22.997 12 22.635 12Z" fill="#BCBEC0"/>
-<path d="M28.635 6H12V12H22.635C22.997 12 23.3442 12.1438 23.6002 12.3998C23.8562 12.6558 24 13.003 24 13.365V24H30V7.365C30 7.00298 29.8562 6.65579 29.6002 6.3998C29.3442 6.14381 28.997 6 28.635 6Z" fill="#D1D3D4"/>
-</svg>
--- a/images/Link_blue.svg
+++ b/images/Link_blue.svg
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 6H11V11H0V0H5V1H1V10H10V6ZM11 0V5H10V1.71094L5.35156 6.35156L4.64844 5.64844L9.28906 1H6V0H11Z" fill="#0078D4"/>
-</svg>
--- a/images/Notebooks.svg
+++ b/images/Notebooks.svg
@@ -1,23 +0,0 @@
-<svg width="32" height="36" viewBox="0 0 32 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M30.1809 0H5.6045C5.45725 -2.06304e-07 5.31144 0.0290347 5.17541 0.0854435C5.03939 0.141852 4.91583 0.224528 4.81179 0.32874C4.70775 0.432952 4.62528 0.556655 4.5691 0.692771C4.51292 0.828887 4.48413 0.974745 4.48438 1.122V31.7149C4.48438 32.0121 4.60234 32.2972 4.81236 32.5075C5.02238 32.7178 5.30729 32.8361 5.6045 32.8365H30.1809C30.4781 32.8362 30.7631 32.7179 30.9731 32.5076C31.1832 32.2972 31.3011 32.0121 31.301 31.7149V1.122C31.301 0.824752 31.1831 0.53965 30.973 0.329288C30.763 0.118926 30.4781 0.000496739 30.1809 0V0Z" fill="url(#paint0_linear_1311_8669)"/>
-<path d="M16.1495 3.22485H2.17401C1.8837 3.22485 1.60528 3.34018 1.39999 3.54546C1.19471 3.75074 1.07939 4.02917 1.07939 4.31948V34.465C1.07815 34.6087 1.10524 34.7513 1.15912 34.8845C1.21299 35.0178 1.2926 35.1391 1.39338 35.2416C1.49416 35.3441 1.61414 35.4257 1.74648 35.4818C1.87881 35.5379 2.0209 35.5674 2.16464 35.5686H26.3926C26.6829 35.5686 26.9614 35.4533 27.1667 35.248C27.3719 35.0427 27.4873 34.7643 27.4873 34.474V14.5202C27.4874 14.3764 27.4591 14.234 27.4042 14.1011C27.3492 13.9682 27.2686 13.8475 27.1669 13.7457C27.0653 13.644 26.9446 13.5633 26.8117 13.5082C26.6788 13.4532 26.5364 13.4249 26.3926 13.4249H18.3549C18.0642 13.422 17.7865 13.3045 17.5819 13.098C17.3774 12.8915 17.2626 12.6126 17.2625 12.322V4.33185C17.2628 4.03998 17.1477 3.75982 16.9423 3.55245C16.7369 3.34508 16.4579 3.22733 16.166 3.22485H16.1495Z" fill="white"/>
-<path d="M16.175 3.16357H1.99513C1.69791 3.16397 1.41301 3.28232 1.20299 3.49262C0.992965 3.70292 0.875 3.98799 0.875 4.2852V34.8781C0.875 35.1753 0.992953 35.4604 1.20296 35.6708C1.41297 35.8812 1.69788 35.9996 1.99513 36.0001H26.5715C26.8687 35.9996 27.1537 35.8812 27.3637 35.6708C27.5737 35.4604 27.6916 35.1753 27.6916 34.8781V14.6307C27.6916 14.3336 27.5736 14.0487 27.3635 13.8387C27.1535 13.6286 26.8686 13.5106 26.5715 13.5106H18.4134C18.1163 13.5106 17.8314 13.3926 17.6213 13.1825C17.4113 12.9724 17.2933 12.6875 17.2933 12.3905V4.2852C17.2924 3.98858 17.1744 3.70432 16.9649 3.49426C16.7555 3.2842 16.4716 3.16535 16.175 3.16357Z" fill="url(#paint1_linear_1311_8669)"/>
-<path d="M27.2629 13.7335L16.9065 3.4082V11.8213C16.9035 12.3253 17.1007 12.8097 17.4548 13.1684C17.8088 13.527 18.2907 13.7304 18.7947 13.7338L27.2629 13.7335Z" fill="#83B9F9"/>
-<path d="M17.744 16.4092H4.76108C4.47196 16.4092 4.23608 16.5543 4.23608 16.7332V17.5323C4.23608 17.7112 4.47046 17.8559 4.76108 17.8559H17.744C18.0331 17.8559 18.269 17.7112 18.269 17.5323V16.7332C18.2675 16.5543 18.0331 16.4092 17.744 16.4092Z" fill="#83B9F9"/>
-<path d="M17.744 20.7498H4.76108C4.47196 20.7498 4.23608 20.8945 4.23608 21.0734V21.8725C4.23608 22.0514 4.47046 22.1965 4.76108 22.1965H17.744C18.0331 22.1965 18.269 22.0514 18.269 21.8725V21.0749C18.2675 20.8945 18.0331 20.7498 17.744 20.7498Z" fill="#83B9F9"/>
-<path d="M17.744 25.0906H4.76108C4.47196 25.0906 4.23608 25.2353 4.23608 25.4142V26.2126C4.23608 26.3915 4.47046 26.5366 4.76108 26.5366H17.744C18.0331 26.5366 18.269 26.3915 18.269 26.2126V25.4142C18.2675 25.2353 18.0331 25.0906 17.744 25.0906Z" fill="#83B9F9"/>
-<path d="M12.4729 29.4312H4.90167C4.53492 29.4312 4.23755 29.5759 4.23755 29.7548V30.5539C4.23755 30.7328 4.53492 30.8779 4.90167 30.8779H12.4729C12.8397 30.8779 13.137 30.7328 13.137 30.5539V29.7548C13.1374 29.5759 12.8397 29.4312 12.4729 29.4312Z" fill="#83B9F9"/>
-<defs>
-<linearGradient id="paint0_linear_1311_8669" x1="17.8925" y1="2.19225" x2="17.8925" y2="35.1225" gradientUnits="userSpaceOnUse">
-<stop stop-color="#DCDCDC"/>
-<stop offset="1" stop-color="#AAAAAA"/>
-</linearGradient>
-<linearGradient id="paint1_linear_1311_8669" x1="14.2831" y1="5.35582" x2="14.2831" y2="38.2857" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0078D7"/>
-<stop offset="0.327" stop-color="#0076D4"/>
-<stop offset="0.576" stop-color="#0071CA"/>
-<stop offset="0.799" stop-color="#0068BA"/>
-<stop offset="1" stop-color="#005BA4"/>
-</linearGradient>
-</defs>
-</svg>
--- a/images/Pivot1_selected.svg
+++ b/images/Pivot1_selected.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="8" fill="#0078D4"/>
-<path d="M9.18652 4.8418V12H7.64844V6.58008C7.5638 6.65495 7.46289 6.72656 7.3457 6.79492C7.23177 6.86003 7.1097 6.92025 6.97949 6.97559C6.84928 7.02767 6.71419 7.07324 6.57422 7.1123C6.43424 7.14811 6.2959 7.17415 6.15918 7.19043V5.8916C6.55957 5.77441 6.93717 5.62467 7.29199 5.44238C7.64681 5.26009 7.96745 5.0599 8.25391 4.8418H9.18652Z" fill="white"/>
-</svg>
--- a/images/Pivot2.svg
+++ b/images/Pivot2.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" stroke="#949494"/>
-<path d="M7.21875 10.7207H10.1875V12H5.5293V11.4727C5.5293 11.1146 5.58952 10.7939 5.70996 10.5107C5.8304 10.2243 5.98177 9.96875 6.16406 9.74414C6.34635 9.51628 6.54492 9.31608 6.75977 9.14355C6.97786 8.96777 7.18457 8.8099 7.37988 8.66992C7.58496 8.52344 7.764 8.38346 7.91699 8.25C8.07324 8.11654 8.20345 7.9847 8.30762 7.85449C8.41504 7.72103 8.49479 7.58757 8.54688 7.4541C8.59896 7.31738 8.625 7.17253 8.625 7.01953C8.625 6.72005 8.54036 6.49382 8.37109 6.34082C8.20182 6.18783 7.94303 6.11133 7.59473 6.11133C6.99251 6.11133 6.41634 6.35059 5.86621 6.8291V5.47168C6.47493 5.0778 7.16178 4.88086 7.92676 4.88086C8.28158 4.88086 8.59896 4.92806 8.87891 5.02246C9.16211 5.11361 9.40137 5.24544 9.59668 5.41797C9.79199 5.59049 9.9401 5.80046 10.041 6.04785C10.1452 6.29199 10.1973 6.56543 10.1973 6.86816C10.1973 7.19043 10.1468 7.47689 10.0459 7.72754C9.94824 7.97819 9.81641 8.20605 9.65039 8.41113C9.48763 8.61621 9.29883 8.80501 9.08398 8.97754C8.86914 9.14681 8.64616 9.3112 8.41504 9.4707C8.25879 9.58138 8.10742 9.69206 7.96094 9.80273C7.81771 9.91016 7.69076 10.0176 7.58008 10.125C7.4694 10.2292 7.38151 10.3317 7.31641 10.4326C7.2513 10.5335 7.21875 10.6296 7.21875 10.7207Z" fill="#949494"/>
-</svg>
--- a/images/Pivot2_selected.svg
+++ b/images/Pivot2_selected.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="8" fill="#0078D4"/>
-<path d="M7.21875 10.7207H10.1875V12H5.5293V11.4727C5.5293 11.1146 5.58952 10.7939 5.70996 10.5107C5.8304 10.2243 5.98177 9.96875 6.16406 9.74414C6.34635 9.51628 6.54492 9.31608 6.75977 9.14355C6.97786 8.96777 7.18457 8.8099 7.37988 8.66992C7.58496 8.52344 7.764 8.38346 7.91699 8.25C8.07324 8.11654 8.20345 7.9847 8.30762 7.85449C8.41504 7.72103 8.49479 7.58757 8.54688 7.4541C8.59896 7.31738 8.625 7.17253 8.625 7.01953C8.625 6.72005 8.54036 6.49382 8.37109 6.34082C8.20182 6.18783 7.94303 6.11133 7.59473 6.11133C6.99251 6.11133 6.41634 6.35059 5.86621 6.8291V5.47168C6.47493 5.0778 7.16178 4.88086 7.92676 4.88086C8.28158 4.88086 8.59896 4.92806 8.87891 5.02246C9.16211 5.11361 9.40137 5.24544 9.59668 5.41797C9.79199 5.59049 9.9401 5.80046 10.041 6.04785C10.1452 6.29199 10.1973 6.56543 10.1973 6.86816C10.1973 7.19043 10.1468 7.47689 10.0459 7.72754C9.94824 7.97819 9.81641 8.20605 9.65039 8.41113C9.48763 8.61621 9.29883 8.80501 9.08398 8.97754C8.86914 9.14681 8.64616 9.3112 8.41504 9.4707C8.25879 9.58138 8.10742 9.69206 7.96094 9.80273C7.81771 9.91016 7.69076 10.0176 7.58008 10.125C7.4694 10.2292 7.38151 10.3317 7.31641 10.4326C7.2513 10.5335 7.21875 10.6296 7.21875 10.7207Z" fill="white"/>
-</svg>
--- a/images/Pivot3.svg
+++ b/images/Pivot3.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" stroke="#949494"/>
-<path d="M5.69531 11.7705V10.4277C6.16406 10.7695 6.71094 10.9404 7.33594 10.9404C7.72982 10.9404 8.03581 10.8558 8.25391 10.6865C8.47526 10.5173 8.58594 10.2812 8.58594 9.97852C8.58594 9.66602 8.44922 9.42513 8.17578 9.25586C7.9056 9.08659 7.53288 9.00195 7.05762 9.00195H6.4082V7.82031H7.00879C7.92025 7.82031 8.37598 7.51758 8.37598 6.91211C8.37598 6.34245 8.02604 6.05762 7.32617 6.05762C6.85742 6.05762 6.40169 6.20898 5.95898 6.51172V5.25195C6.45052 5.00456 7.02344 4.88086 7.67773 4.88086C8.39388 4.88086 8.95052 5.04199 9.34766 5.36426C9.74805 5.68652 9.94824 6.10482 9.94824 6.61914C9.94824 7.53385 9.48438 8.10677 8.55664 8.33789V8.3623C9.05143 8.42415 9.44206 8.60482 9.72852 8.9043C10.015 9.20052 10.1582 9.5651 10.1582 9.99805C10.1582 10.6523 9.91895 11.1699 9.44043 11.5508C8.96191 11.9316 8.30111 12.1221 7.45801 12.1221C6.73535 12.1221 6.14779 12.0049 5.69531 11.7705Z" fill="#949494"/>
-</svg>
--- a/images/Pivot3_selected.svg
+++ b/images/Pivot3_selected.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="8" fill="#0078D4"/>
-<path d="M5.69531 11.7705V10.4277C6.16406 10.7695 6.71094 10.9404 7.33594 10.9404C7.72982 10.9404 8.03581 10.8558 8.25391 10.6865C8.47526 10.5173 8.58594 10.2812 8.58594 9.97852C8.58594 9.66602 8.44922 9.42513 8.17578 9.25586C7.9056 9.08659 7.53288 9.00195 7.05762 9.00195H6.4082V7.82031H7.00879C7.92025 7.82031 8.37598 7.51758 8.37598 6.91211C8.37598 6.34245 8.02604 6.05762 7.32617 6.05762C6.85742 6.05762 6.40169 6.20898 5.95898 6.51172V5.25195C6.45052 5.00456 7.02344 4.88086 7.67773 4.88086C8.39388 4.88086 8.95052 5.04199 9.34766 5.36426C9.74805 5.68652 9.94824 6.10482 9.94824 6.61914C9.94824 7.53385 9.48438 8.10677 8.55664 8.33789V8.3623C9.05143 8.42415 9.44206 8.60482 9.72852 8.9043C10.015 9.20052 10.1582 9.5651 10.1582 9.99805C10.1582 10.6523 9.91895 11.1699 9.44043 11.5508C8.96191 11.9316 8.30111 12.1221 7.45801 12.1221C6.73535 12.1221 6.14779 12.0049 5.69531 11.7705Z" fill="white"/>
-</svg>
--- a/images/Pivot4.svg
+++ b/images/Pivot4.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" stroke="#949494"/>
-<path d="M9.77246 4.99805V9.41211H10.6123V10.5645H9.77246V12H8.36621V10.5645H5.31445V9.3584C5.58464 9.05566 5.86458 8.72526 6.1543 8.36719C6.44401 8.00586 6.72396 7.63477 6.99414 7.25391C7.26432 6.87305 7.51497 6.49056 7.74609 6.10645C7.98047 5.71908 8.17904 5.34961 8.3418 4.99805H9.77246ZM6.69629 9.41211H8.36621V6.96582C8.25228 7.17741 8.12858 7.39225 7.99512 7.61035C7.86165 7.8252 7.72168 8.03841 7.5752 8.25C7.42871 8.45833 7.2806 8.66178 7.13086 8.86035C6.98112 9.05566 6.83626 9.23958 6.69629 9.41211Z" fill="#949494"/>
-</svg>
--- a/images/Pivot4_selected.svg
+++ b/images/Pivot4_selected.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="8" fill="#0078D4"/>
-<path d="M9.77246 4.99805V9.41211H10.6123V10.5645H9.77246V12H8.36621V10.5645H5.31445V9.3584C5.58464 9.05566 5.86458 8.72526 6.1543 8.36719C6.44401 8.00586 6.72396 7.63477 6.99414 7.25391C7.26432 6.87305 7.51497 6.49056 7.74609 6.10645C7.98047 5.71908 8.17904 5.34961 8.3418 4.99805H9.77246ZM6.69629 9.41211H8.36621V6.96582C8.25228 7.17741 8.12858 7.39225 7.99512 7.61035C7.86165 7.8252 7.72168 8.03841 7.5752 8.25C7.42871 8.45833 7.2806 8.66178 7.13086 8.86035C6.98112 9.05566 6.83626 9.23958 6.69629 9.41211Z" fill="white"/>
-</svg>
--- a/images/Pivot5.svg
+++ b/images/Pivot5.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" stroke="#949494"/>
-<path d="M5.81738 11.8193V10.501C6.2959 10.7939 6.80534 10.9404 7.3457 10.9404C7.7526 10.9404 8.06999 10.8444 8.29785 10.6523C8.52897 10.457 8.64453 10.1934 8.64453 9.86133C8.64453 9.16797 8.15462 8.82129 7.1748 8.82129C6.81348 8.82129 6.39681 8.84896 5.9248 8.9043L6.18848 4.99805H9.89453V6.25781H7.36523L7.26758 7.65918C7.51823 7.63965 7.7347 7.62988 7.91699 7.62988C8.63639 7.62988 9.19954 7.81868 9.60645 8.19629C10.0133 8.57389 10.2168 9.08171 10.2168 9.71973C10.2168 10.4261 9.97428 11.0039 9.48926 11.4531C9.00423 11.8991 8.34668 12.1221 7.5166 12.1221C6.84277 12.1221 6.27637 12.0212 5.81738 11.8193Z" fill="#949494"/>
-</svg>
--- a/images/Pivot5_selected.svg
+++ b/images/Pivot5_selected.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="8" fill="#0078D4"/>
-<path d="M5.81738 11.8193V10.501C6.2959 10.7939 6.80534 10.9404 7.3457 10.9404C7.7526 10.9404 8.06999 10.8444 8.29785 10.6523C8.52897 10.457 8.64453 10.1934 8.64453 9.86133C8.64453 9.16797 8.15462 8.82129 7.1748 8.82129C6.81348 8.82129 6.39681 8.84896 5.9248 8.9043L6.18848 4.99805H9.89453V6.25781H7.36523L7.26758 7.65918C7.51823 7.63965 7.7347 7.62988 7.91699 7.62988C8.63639 7.62988 9.19954 7.81868 9.60645 8.19629C10.0133 8.57389 10.2168 9.08171 10.2168 9.71973C10.2168 10.4261 9.97428 11.0039 9.48926 11.4531C9.00423 11.8991 8.34668 12.1221 7.5166 12.1221C6.84277 12.1221 6.27637 12.0212 5.81738 11.8193Z" fill="white"/>
-</svg>
--- a/images/PostgreConnect.svg
+++ b/images/PostgreConnect.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.9 10.4C2.86142 9.92426 2.92976 9.44591 3.1 9C3.2722 8.57315 3.54698 8.19534 3.9 7.9L5.6 6.1L10.6 11.1L8.8 12.8C8.50466 13.153 8.12685 13.4278 7.7 13.6C7.29358 13.7932 6.84997 13.8955 6.4 13.9L5.2 13.7L4.3 13.2L1.7 15.7L1 15L3.5 12.4C3.29618 12.1222 3.12819 11.8198 3 11.5C2.92162 11.1388 2.88804 10.7694 2.9 10.4ZM6.4 12.9L7.3 12.7C7.60584 12.5584 7.87842 12.354 8.1 12.1L9.2 11.1L5.6 7.5L4.6 8.6L4 9.4C3.9125 9.72567 3.87872 10.0634 3.9 10.4C3.88428 10.7034 3.91806 11.0074 4 11.3L4.6 12.1L5.4 12.7L6.4 12.9ZM13.2 4.3C13.4038 4.5778 13.5718 4.88018 13.7 5.2C13.8153 5.59037 13.8824 5.99335 13.9 6.4C13.8955 6.84997 13.7932 7.29358 13.6 7.7C13.4278 8.12685 13.153 8.50466 12.8 8.8L11.1 10.6L6.1 5.6L7.9 3.9C8.19534 3.54698 8.57315 3.2722 9 3.1C9.44591 2.92976 9.92426 2.86142 10.4 2.9H11.5L12.4 3.4L15 1L15.7 1.7L13.2 4.3ZM12.1 8.1C12.354 7.87842 12.5584 7.60584 12.7 7.3C12.8142 7.01258 12.8818 6.70875 12.9 6.4C12.8909 6.0577 12.8232 5.71948 12.7 5.4L12.1 4.6L11.3 4.1C11.0284 3.9405 10.7136 3.87053 10.4 3.9H9.4L8.6 4.5L7.5 5.5L11.1 9.1L12.1 8.1Z" fill="#0078D4"/>
-</svg>
--- a/images/PowerShell.svg
+++ b/images/PowerShell.svg
@@ -1,15 +0,0 @@
-<svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.944458 10.9331H33.0556V28.836C33.0556 29.1205 32.9425 29.3934 32.7413 29.5946C32.5401 29.7958 32.2672 29.9089 31.9827 29.9089H2.01735C1.7328 29.9089 1.45991 29.7958 1.2587 29.5946C1.05749 29.3934 0.944458 29.1205 0.944458 28.836V10.9331Z" fill="url(#paint0_linear_1497_136679)"/>
-<path d="M2.02301 4.09132H31.977C32.1179 4.09132 32.2574 4.11907 32.3876 4.17299C32.5178 4.22691 32.636 4.30594 32.7357 4.40557C32.8353 4.50519 32.9143 4.62347 32.9682 4.75364C33.0222 4.8838 33.0499 5.02332 33.0499 5.16421V10.9329H0.944458V5.16421C0.944456 5.02284 0.972394 4.88286 1.02667 4.75232C1.08094 4.62178 1.16047 4.50326 1.2607 4.40356C1.36093 4.30385 1.47987 4.22494 1.6107 4.17136C1.74152 4.11778 1.88164 4.09058 2.02301 4.09132Z" fill="#0078D4"/>
-<path d="M5.33553 15.0706L6.03309 14.371C6.09216 14.3118 6.17235 14.2785 6.25601 14.2783C6.33967 14.2782 6.41995 14.3113 6.47919 14.3704L11.6394 19.5161C11.6982 19.5747 11.7449 19.6444 11.7769 19.7211C11.8088 19.7979 11.8252 19.8801 11.8254 19.9632C11.8255 20.0463 11.8092 20.1286 11.7775 20.2055C11.7458 20.2823 11.6993 20.3521 11.6407 20.4109L10.9444 21.1091L5.3375 15.518C5.27826 15.4589 5.24491 15.3788 5.24479 15.2951C5.24467 15.2114 5.27779 15.1312 5.33687 15.0719L5.33553 15.0706Z" fill="#F2F2F2"/>
-<path d="M6.1367 25.5068L5.43717 24.8092C5.37793 24.7501 5.34459 24.67 5.34447 24.5863C5.34435 24.5026 5.37747 24.4224 5.43654 24.3631L10.9463 18.8378L11.6445 19.534C11.7633 19.6525 11.8302 19.8133 11.8305 19.9812C11.8307 20.149 11.7643 20.31 11.6457 20.4289L6.57747 25.5115C6.5184 25.5707 6.43821 25.6041 6.35455 25.6042C6.27089 25.6043 6.19061 25.5712 6.13137 25.5121L6.1367 25.5068Z" fill="#E6E6E6"/>
-<path d="M22.1019 23.8755H14.1893C13.8857 23.8755 13.6396 24.1216 13.6396 24.4252V25.2355C13.6396 25.5391 13.8857 25.7852 14.1893 25.7852H22.1019C22.4054 25.7852 22.6515 25.5391 22.6515 25.2355V24.4252C22.6515 24.1216 22.4054 23.8755 22.1019 23.8755Z" fill="#F2F2F2"/>
-<defs>
-<linearGradient id="paint0_linear_1497_136679" x1="17" y1="29.9089" x2="17" y2="10.9331" gradientUnits="userSpaceOnUse">
-<stop stop-color="#32BEDD"/>
-<stop offset="0.175" stop-color="#32CAEA"/>
-<stop offset="0.41" stop-color="#32D2F2"/>
-<stop offset="0.775" stop-color="#32D4F5"/>
-</linearGradient>
-</defs>
-</svg>
--- a/images/QuickstartComplete.svg
+++ b/images/QuickstartComplete.svg
@@ -1,127 +0,0 @@
-<svg width="68" height="72" viewBox="0 0 68 72" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<circle cx="34" cy="35" r="32" fill="#BFBFBF"/>
-<g style="mix-blend-mode:multiply" filter="url(#filter0_ddd_1497_137613)">
-<path d="M18 21.3999C18 19.1908 19.7909 17.3999 22 17.3999H43.6L50 23.7999V48.5999C50 50.809 48.2091 52.5999 46 52.5999H22C19.7909 52.5999 18 50.809 18 48.5999V21.3999Z" fill="white"/>
-</g>
-<g filter="url(#filter1_b_1497_137613)">
-<path d="M18 21.3999C18 19.1908 19.7909 17.3999 22 17.3999H43.6L50 23.7999V48.5999C50 50.809 48.2091 52.5999 46 52.5999H22C19.7909 52.5999 18 50.809 18 48.5999V21.3999Z" fill="url(#paint0_linear_1497_137613)"/>
-</g>
-<g style="mix-blend-mode:hard-light" filter="url(#filter2_ii_1497_137613)">
-<path d="M18 21.3999C18 19.1908 19.7909 17.3999 22 17.3999H43.6L50 23.7999V48.5999C50 50.809 48.2091 52.5999 46 52.5999H22C19.7909 52.5999 18 50.809 18 48.5999V21.3999Z" fill="#808080"/>
-<path d="M18 21.3999C18 19.1908 19.7909 17.3999 22 17.3999H43.6L50 23.7999V48.5999C50 50.809 48.2091 52.5999 46 52.5999H22C19.7909 52.5999 18 50.809 18 48.5999V21.3999Z" fill="url(#pattern0)" fill-opacity="0.02"/>
-</g>
-<g style="mix-blend-mode:multiply" filter="url(#filter3_ddd_1497_137613)">
-<path d="M43.6006 17.3999L50.0006 23.7999H47.6006C45.3914 23.7999 43.6006 22.009 43.6006 19.7999V17.3999Z" fill="white"/>
-</g>
-<g filter="url(#filter4_b_1497_137613)">
-<path d="M43.6006 17.3999L50.0006 23.7999H47.6006C45.3914 23.7999 43.6006 22.009 43.6006 19.7999V17.3999Z" fill="url(#paint1_linear_1497_137613)"/>
-</g>
-<g style="mix-blend-mode:hard-light" filter="url(#filter5_ii_1497_137613)">
-<path d="M43.6006 17.3999L50.0006 23.7999H47.6006C45.3914 23.7999 43.6006 22.009 43.6006 19.7999V17.3999Z" fill="#808080"/>
-<path d="M43.6006 17.3999L50.0006 23.7999H47.6006C45.3914 23.7999 43.6006 22.009 43.6006 19.7999V17.3999Z" fill="url(#pattern1)" fill-opacity="0.02"/>
-</g>
-<circle cx="33.9994" cy="34.9999" r="9.6" fill="#BFBFBF"/>
-<path d="M30.7998 34.9998L33.3598 37.5598L37.8398 32.7598" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M41.6793 34.9998C41.6793 39.2414 38.2409 42.6798 33.9993 42.6798C29.7578 42.6798 26.3193 39.2414 26.3193 34.9998C26.3193 30.7583 29.7578 27.3198 33.9993 27.3198C38.2409 27.3198 41.6793 30.7583 41.6793 34.9998ZM33.9993 42.0398C37.8874 42.0398 41.0393 38.8879 41.0393 34.9998C41.0393 31.1117 37.8874 27.9598 33.9993 27.9598C30.1113 27.9598 26.9593 31.1117 26.9593 34.9998C26.9593 38.8879 30.1113 42.0398 33.9993 42.0398Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M30.3899 22.3199C30.0451 22.3769 29.7748 22.6471 29.7179 22.9919C29.661 22.6471 29.3907 22.3769 29.0459 22.3199C29.3907 22.263 29.661 21.9928 29.7179 21.6479C29.7748 21.9928 30.0451 22.263 30.3899 22.3199Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.5508 19.4641C30.2404 19.5779 30.781 20.1185 30.8948 20.8081C31.0086 20.1185 31.5491 19.5779 32.2388 19.4641C31.5491 19.3503 31.0086 18.8098 30.8948 18.1201C30.781 18.8098 30.2404 19.3503 29.5508 19.4641Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.20776 22.3199C7.55259 22.3769 7.82285 22.6471 7.87976 22.9919C7.93667 22.6471 8.20693 22.3769 8.55176 22.3199C8.20693 22.263 7.93667 21.9928 7.87976 21.6479C7.82285 21.9928 7.55259 22.263 7.20776 22.3199Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.04688 19.4641C7.35721 19.5779 6.81669 20.1185 6.70287 20.8081C6.58906 20.1185 6.04854 19.5779 5.35887 19.4641C6.04854 19.3503 6.58906 18.8098 6.70287 18.1201C6.81669 18.8098 7.35721 19.3503 8.04688 19.4641Z" fill="white"/>
-<defs>
-<filter id="filter0_ddd_1497_137613" x="0" y="0.399902" width="68" height="71.2002" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="3"/>
-<feGaussianBlur stdDeviation="2.5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1497_137613"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="1"/>
-<feGaussianBlur stdDeviation="9"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0.12 0"/>
-<feBlend mode="normal" in2="effect1_dropShadow_1497_137613" result="effect2_dropShadow_1497_137613"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="6"/>
-<feGaussianBlur stdDeviation="5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0.14 0"/>
-<feBlend mode="normal" in2="effect2_dropShadow_1497_137613" result="effect3_dropShadow_1497_137613"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect3_dropShadow_1497_137613" result="shape"/>
-</filter>
-<filter id="filter1_b_1497_137613" x="16" y="15.3999" width="36" height="39.2002" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feGaussianBlur in="BackgroundImage" stdDeviation="1"/>
-<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_1497_137613"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_1497_137613" result="shape"/>
-</filter>
-<filter id="filter2_ii_1497_137613" x="18" y="17.3999" width="32" height="35.2002" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="1"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1497_137613"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="3"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 1 0"/>
-<feBlend mode="normal" in2="effect1_innerShadow_1497_137613" result="effect2_innerShadow_1497_137613"/>
-</filter>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1.875" height="1.70455">
-<use xlink:href="#image0_1497_137613" transform="scale(0.03125 0.0284091)"/>
-</pattern>
-<filter id="filter3_ddd_1497_137613" x="25.6006" y="0.399902" width="42.4004" height="42.3999" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="3"/>
-<feGaussianBlur stdDeviation="2.5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1497_137613"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="1"/>
-<feGaussianBlur stdDeviation="9"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0.12 0"/>
-<feBlend mode="normal" in2="effect1_dropShadow_1497_137613" result="effect2_dropShadow_1497_137613"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="6"/>
-<feGaussianBlur stdDeviation="5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0.14 0"/>
-<feBlend mode="normal" in2="effect2_dropShadow_1497_137613" result="effect3_dropShadow_1497_137613"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect3_dropShadow_1497_137613" result="shape"/>
-</filter>
-<filter id="filter4_b_1497_137613" x="41.6006" y="15.3999" width="10.4004" height="10.3999" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feGaussianBlur in="BackgroundImage" stdDeviation="1"/>
-<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_1497_137613"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_1497_137613" result="shape"/>
-</filter>
-<filter id="filter5_ii_1497_137613" x="43.6006" y="17.3999" width="6.40039" height="6.3999" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="1"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1497_137613"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="3"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 0 0.94902 0 0 0 1 0"/>
-<feBlend mode="normal" in2="effect1_innerShadow_1497_137613" result="effect2_innerShadow_1497_137613"/>
-</filter>
-<pattern id="pattern1" patternContentUnits="objectBoundingBox" width="9.375" height="9.375">
-<use xlink:href="#image0_1497_137613" transform="scale(0.15625)"/>
-</pattern>
-<linearGradient id="paint0_linear_1497_137613" x1="34" y1="52.5999" x2="34" y2="17.3999" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F2F2F2" stop-opacity="0.5"/>
-<stop offset="1" stop-color="#F2F2F2"/>
-</linearGradient>
-<linearGradient id="paint1_linear_1497_137613" x1="46.8006" y1="23.7999" x2="46.8006" y2="17.3999" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F2F2F2" stop-opacity="0.5"/>
-<stop offset="1" stop-color="#F2F2F2"/>
-</linearGradient>
-<image id="image0_1497_137613" width="60" height="60" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAM9ElEQVRoQ+WbS6iO3RvG1zv/HCcbiRhR2mJESlJbjBwmGwOH0laUHAaEJLXFwCG1FROHgcPEYbRFSaJtRKQYyCltTBxi/v77rc/v+e53efic+fo/k733+z7Peta67+u+7uu+19qNlFKz2Wwmr/fv36e//vorNRqN1NbWll68eJFWrlyZDh06lG/h856enrRq1ap0//79NH78eAbIn3d1deX7+HzcuHH5uSFDhqRdu3alhQsXpkGDBqXDhw/ncXzG927cuDHfV16My707d+5MW7Zsyb9znTx5Mi1atCiPe/r06Wo8xzl48GBavXp1y3Dt7e2pwWp56NSpU3nSXEz8xo0bqbOzM23evDlNnDgxL2Tq1Km1k+3u7k7Lly9PT548SW/evEkPHz7MBtFAdQu8d+9eNsqwYcOyUb2YC9/duXOneteFCxfS3r1708WLFz8a0+eYI89gEO5//fp1unLlSlq3bl3lFNbECrPJuPH58+dpxIgRlRVnzZqVX6K19LjeZIA4MV56/fr1NGDAgDyPjo6O/LyoiBbnfZs2baq8yj19fX1pypQpGRkgQRREBOqciB4dVaKD50Rhb29vdkS1YLyJl7HO4MGD0+XLl7N3gc6RI0eqiTsJ4CECNIgTixPw/hMnTqTFixe3IMTvWKjo0fjRc7t3706zZ8/OhovjAF++8xkd5LOEAWuIKMqQjhN89+5dOn78eMZ/tKyxVOcVJwu0jTPuZyy97SQcUzRhOIwsspxLNKjvNl4/CvQPCPVzx+jv70/Dhw9vCYNGT09Pk/iM+MeaWkUIAV/gFi8GBrY8Sxz698uXL/NnkNvYsWPTnDlzsvEw1s2bN9OBAwfSjBkzEvdJSBDP7du3M19w8TtXJCU9Vs5BD4O0JUuWZNLlAs4gFT7h3aAhQxpPMAm8Ey9wD2yYjGzM9yys9KYLEmJ4yEn7TLzH+OY7Gdh3C1vev2zZsvwxxnFhn+Iax/kc1+QF/2or8z5IZ/To0Wny5MkVAliQ6UYYx3DDyDDvvHnzsievXbuWn/UyhFywiAJtR48e/ZsHOjo6mmPGjKlYkcBnEuREXs53+/fvzy/CyqQMyArvleQUYyjGP+GBxy9dupQhbAqJKOFdkhqxt3Tp0gx7UEdoyCm+M44vWfEew6TUCDq1ysPANl7fwtpYG0P9yazdaGtra0I4JaUbd8ZNhBjW4n48Rkp59OhRTl2ID7xk/kNY4LlJkyZlDnCsFst++IPxZVXfheqD5UuOQRjhfREBhPWsOX/Hjh3p1q1bmf3hAuAMshpdXV1NYgnoMLCyMnpYliXutm/f3pJCmKQpRQka0wKLZTJOKhIPKcN7CZWRI0fmBZaCg3skQaD6+PHjKi8TFuRaWRjCO3/+fItyjA7KkMZbeoeBo3pSUzPpmFejAPF+BUQUIMZsjPlSoGDcuXPn5nDwvihY8CYeYg56TSaPjMwzIMpxTGOm1oxaIU3cQVaICAYDopIMi1aUlyJe65vHhSaeNTfrXYsOoMXCIJlt27alq1evZo/UhZEe5DsLG3OzaUsGVpJqDBELKrhAUKO3t7eJGIg52LSBIGEBwK2MQVHBQMat8GSBa9asqcaMOdkcavEQ41mmLlFmLEeol4a36MCQzI3Uxe979uypNEaultrb23PxwJfKRqSecatVzZHCxXtdJN6bOXNmjnEGJq6ix/gdj1DFYCCIJ5aKpqpoABdYR3LRKHXP+CyG3bdvX34XKM0xzAIV58aXrI3VYWEKCiSaLEjiVyczKESiCHAMIAaBRJXE5Bj72LFj+Z1CG/hj3GfPnuWxuCwzZW0NGHMwnxmjhMi5c+dyWMYFi04MnmNYSieOgTE5mZTiBQxhVLwKgWApjIQ3WZD1rF7XWLEQIMYhp1isx5RXpiyeFQVMHi2P0QkVuCVmB9DBfCLrR/hjCMIshygeVpXwUpnWuDWnxs4GL4OUtCZw9mJQvGbXIzYXuA+CAmJldeQETYexaGBBFC5kEn7yN8al42HBEtWi8tQCyLAk7lsaAN9DDixUIiG+5AVhKHNKiBb4kSPwEuixzuZZ5aIGjfk8xi7jYwAFEQw9bdq0KsXqzJbi4Uf0jEACsBUhpiI8YUcjavA6whGuos1c+yNSZwXpsm78nRUNRmBx9sVMV8Z0LCa4j0ahuiFygWQnpxBm2cNfIypUW8bcv4kK4jl2PCNRxU7ljxAVymLegVGePn2aVVds8LW0eBQIsVBwgU6uLM+IMYp0Cn+L+s/lVJQT+dq2kMwd+1r+zngwMhe/K3+j+lL6RqET05akRjMRovuItMpAjypJQrADSI0aCw7jMXqfOpq45hl+37p1a0ufq+w78Tf3WQkxpjFMakJBlXmdhSAvyRpohvisi1fONvr6+ppQvbm27DQYy7wYZo1dQxaB2ICg4IC6Ij0igglHUVAaKMZfbBZGweF4zENBRNjQf47awWf46TzhgLxgJ+EEzJ0xl5aCwclBGvPnz88vfPXqVe6QELOOESsWPGdBUZaAsSNZVx6a+33euRKrvA+nvX37NlddpCdJr1SROYZLC1owx8/5HQOws/A1iJBRo6W/BxGxHPwWRDQ6OzubeMaghtUspmU7oYq36G4SQxqlbpcA6FL2xfISOFG52EK1X4bxREFdj8wQI+Toczkmc1MolbkctHBNnz49x3VUYRVLl5UJZGWngoeBBpDEILZto4Uj9TMRmvkWG/G+qKycaCwO+MzOSUvh/mFTLcZmWcbyN+Nv2LAh801s8ltdNbq7u5t4jdiQVFRHDG4slOmonAxQw6vuH1nvWgTQRsJQFBEyP0bCqLGJT3HCFcvLWChopG/e5Sy3S7+m5YkUZaEQhdqYCdmWHTp0aO5kfGp30i7nr9ydrCAdC3IW8eDBg5wv3fON8EMEGBdCRZEgOohRvEXJJnKMe4wqm4ucKGwUO3W7FzFemSc9LutquIcGg8qOe4n9s2fP/pMygTS9rP9yjUu4xFqYharWYmcEhZZZOm6GS14xNUWp6HYHrB7jKJZ9piB+ooCsnhAGqrUyLgkD5WHMwyV3MKbziUWEmoH7ESWIEeSuY4FUmhUteVg2jenhd+3UI4YsTGKDXr2u4YR42fZhDeh0LhxaScv+/v4m3YefUXtq3T+pwqo8LDt/yZYjC1iwYEE6c+bMFx9viHu7tn49+CLD1533wDvferzB8tBeeY5ztlp+V7sFlWWeBnolu4K8UkUZbsDVwy8gydZyeX/LcYdG45827Zee6/gv7BCW5zpYNBekWLG0RxrqzlEQ3x5y4UFyLIwH+7rHq6jXwpAEn61fvz5L0oEDB2b1pGwsO6XUudbOP7NTmhsAdvyiTnXikfoVEDAlKooFlydwGAtRYUfDFMGChHCZDWTYsnjwb8VPhG3U/vwuCzM2AmTUqFGV2LAnlp+J57Qc0O5ibNvieSQkXqDqiduacQEMyguoj2NnIhYIHj7hyAIqiIY+hGLlxXimn5hf7a7EZoVHl2JruGxiMJ7FUNXEQ5LZ6I6BXx4g0YJUTbH7EDfUypzIMxhvxYoVLbuEThYDwyE06Lk88KZKgpwwCoxtk93QiOInGj4WL7G533LkAauycz5hwoTKg1iYM5Juf7pgVExdM436k8nTxyIc3IJVKztBJgxSPJjiuwkFDMD35Sm/eEAtanwQw44GIeYxKreP4rZPhjQdj7iJ/L27guXpuF+1K+hxKZzgxh/OscVDSK5du/bvBf/JBbvQjMeZWEhsJrYk63BulMOuHqYDBaCvti8tW8cDYm6nxj5yPJknUaCosLCNANnUOEVdyfagQfaWiHy3pWHcW2IsOcV4jWmQgsH2EqGk17mn2vLhBMDXHu5igK/ZCuF+YyxOtG4rpDzxV9bjEiC9sXgmWiRgEC7LRQmUWCau88E0zyHHDWmMYDzQqfQsZIQPEy4bAHomniLQa/HoBN7lqEXZCCh3DWKOLnNv2QtzbrFvFhsMZKKqeNBysCaTQSXFk3PAxdMAtHacvAornmP2KIMT+JMOuVULLvdpPeMRC3D3kfAMxohNAr3IzygzSWvm0CgIyi5p3PyK7zS2eTfNBOYljyhr4wGZKHvrjlll4VHqYHIg2xj0pNC/ETplH9rOhd60Vfon7lFlp9DT+n84NmwN39LTiv0qvBoLAzwXd+Bl2zqCiN6O8pM9H686eMc+VzyHZQUHlBEP36MEqyMPTORndz3Kfx8w9n7mP3WUXY+PtlpIK7+jyHdLE8N/yz9vxCLffz3yDBhc5GG5iqXVvPG0zZe2Pr/3+DGsj+z7FcePq+KBOtcNKCxTV2zD5ljLPraiwONGQNYyEU/ZuOMnwgUpat/KDkss+n/Ff9RUaclyirxHcX/37t3ctRBeLJZ6lQXZIKh6vR/+oy32gSWzWC19TkXVFQCQFedHovS1Vx1P6cUT+BrwU+dV/gf5nFrpDQ6oIQAAAABJRU5ErkJggg=="/>
-</defs>
-</svg>
--- a/images/Quickstart_Lightning.svg
+++ b/images/Quickstart_Lightning.svg
@@ -1,11 +0,0 @@
-<svg width="30" height="34" viewBox="0 0 30 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6457 18.9089H0.67782C0.520018 18.9215 0.361625 18.8893 0.235445 18.819C0.109264 18.7487 0.0249634 18.6456 0 18.5312C0.000766863 18.4748 0.0212497 18.4196 0.0595033 18.3706L14.4179 0.229509C14.4859 0.156313 14.5784 0.0970502 14.6866 0.0573734C14.7949 0.0176966 14.9152 -0.00107025 15.0362 0.00286318H29.1877C29.3456 -0.0102086 29.5043 0.0218054 29.6306 0.0922084C29.757 0.162611 29.8411 0.26595 29.8655 0.380607C29.8655 0.463721 29.823 0.54385 29.7465 0.605364L12.8941 14.7991H29.3222C29.48 14.7865 29.6384 14.8187 29.7646 14.889C29.8907 14.9593 29.975 15.0624 30 15.1768C29.998 15.2265 29.9814 15.2752 29.9516 15.3198C29.9217 15.3645 29.8791 15.4039 29.8267 15.4356L2.51725 33.5994C2.25854 33.6957 0.447568 34.6608 1.33236 33.1952L12.6457 18.9089Z" fill="url(#paint0_radial_480_182017)"/>
-<defs>
-<radialGradient id="paint0_radial_480_182017" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(15.0039 17.0718) scale(23.6442 13.4446)">
-<stop offset="0.196" stop-color="#FFD70F"/>
-<stop offset="0.438" stop-color="#FFCB12"/>
-<stop offset="0.873" stop-color="#FEAC19"/>
-<stop offset="1" stop-color="#FEA11B"/>
-</radialGradient>
-</defs>
-</svg>
--- a/images/firewallRule.png
+++ b/images/firewallRule.png
--- a/jest.config.js
+++ b/jest.config.js
@@ -37,8 +37,8 @@ module.exports = {
    global: {
      branches: 25,
      functions: 25,
-      lines: 28,
-      statements: 28,
+      lines: 29,
+      statements: 29,
    },
  },

--- a/less/TableStyles/queryBuilder.less
+++ b/less/TableStyles/queryBuilder.less
@@ -3,337 +3,337 @@
@import "../Common/Constants";

 .query-panel {
-  display: table;
-  display: none;
-  width: 100%;
-  border-top: 1px solid #dddddd;
-  /*[{environment-commandbar-toolbar-separator}]*/
-  background-color: #ffffff;
-  /*[{plugin-background-color}]*/
-  padding: 2px 0px 0px 2px;
-  resize: vertical;
+    display: table;
+    display: none;
+    width: 100%;
+    border-top: 1px solid #DDDDDD;
+    /*[{environment-commandbar-toolbar-separator}]*/
+    background-color: #ffffff;
+    /*[{plugin-background-color}]*/
+    padding: 2px 0px 0px 2px;
+    resize: vertical;
 }

 .query-panel .row {
-  display: table-row;
+    display: table-row;
 }

 .query-panel .row .cell {
-  display: table-cell;
+    display: table-cell;
 }

 .query-panel.transition-in {
-  display: table;
-  top: 0px;
-  -webkit-transition: top 2s linear;
-  -ms-transition: top 2s linear;
-  -moz-transition: top 2s linear;
-  -khtml-transition: top 2s linear;
-  -o-transition: top 2s linear;
-  transition: top 2s linear;
+    display: table;
+    top: 0px;
+    -webkit-transition: top 2s linear;
+    -ms-transition: top 2s linear;
+    -moz-transition: top 2s linear;
+    -khtml-transition: top 2s linear;
+    -o-transition: top 2s linear;
+    transition: top 2s linear;
 }

 .query-builder {
-  width: 100%;
-  padding-right: @DefaultSpace;
-  border-bottom: 1px solid @BaseMedium;
-  margin-bottom: @DefaultSpace;
+    width:100%;
+    padding-right: @DefaultSpace;
+    border-bottom: 1px solid @BaseMedium;
+    margin-bottom: @DefaultSpace;
 }

 .query-builder-toolbar {
-  background-color: #ffffff;
-  /*[{plugin-background-color}]*/
-  min-width: 600px;
-  height: 30px;
-  border-bottom: 1px solid #dddddd;
-  /*[1px solid {environment-commandbar-toolbar-separator}]*/
+    background-color: #ffffff;
+    /*[{plugin-background-color}]*/
+    min-width: 600px;
+    height: 30px;
+    border-bottom: 1px solid #DDDDDD;
+    /*[1px solid {environment-commandbar-toolbar-separator}]*/
 }

 .query-builder-toolbar .query-toolbar-group {
-  display: inline-block;
-  height: 24px;
-  margin: 2px 0px;
-  vertical-align: middle;
+    display: inline-block;
+    height: 24px;
+    margin: 2px 0px;
+    vertical-align: middle;
 }

 .query-builder-toolbar .query-toolbar-group .query-toolbar-button {
-  min-width: 0px;
-  padding: 0px;
-  margin-left: 2px;
-  background-color: transparent;
-  border: solid transparent;
+    min-width: 0px;
+    padding: 0px;
+    margin-left: 2px;
+    background-color: transparent;
+    border: solid transparent;
 }

 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:active {
-  outline: 2px solid dodgerblue;
-  /*[2px solid {common-common-controls-button-border-hover}]*/
+    outline: 2px solid dodgerblue;
+    /*[2px solid {common-common-controls-button-border-hover}]*/
 }

 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:hover {
-  background-color: #cccedb;
-  /*[{common-controls-button-hover-background}]*/
+    background-color: #CCCEDB;
+    /*[{common-controls-button-hover-background}]*/
 }

 .query-builder-toolbar .query-toolbar-group .query-toolbar-button.active {
-  background-color: #e6e7ed;
-  /*[{common-controls-inner-tab-active-background}]*/
-  outline: none;
+    background-color: #E6E7ED;
+    /*[{common-controls-inner-tab-active-background}]*/
+    outline: none
 }

 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:disabled,
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button.disabled {
-  background-color: #ffffff;
-  /*[{common-controls-button-disabled-background}]*/
-  background: transparent;
-  border: 1px solid transparent;
-  outline: none;
-  opacity: 0.4;
+    background-color: #ffffff;
+    /*[{common-controls-button-disabled-background}]*/
+    background: transparent;
+    border: 1px solid transparent;
+    outline: none;
+    opacity: 0.4;
 }

 .tableContainer {
-  overflow: hidden;
-  .flex-display();
-  .flex-direction();
+    overflow: hidden;
+    .flex-display();
+    .flex-direction();
 }

-.tablesQueryTab {
-  padding-left: @MediumSpace;
-  width: 100%;
-  margin-bottom: @LargeSpace;
+.tablesQueryTab{
+    padding-left: @MediumSpace;
+    width: 100%;
+    margin-bottom:@LargeSpace;
 }

 .entity-error-Img {
-  width: @WarningErrorIconSize;
-  height: @WarningErrorIconSize;
-  margin: @DefaultSpace 0px 0px @SmallSpace;
+    width: @WarningErrorIconSize;
+    height: @WarningErrorIconSize;
+    margin: @DefaultSpace 0px 0px @SmallSpace;
 }

 .query-editor-panel {
-  margin-right: 16px;
-  margin-left: 16px;
-  margin-top: 25px;
-  position: relative;
-  vertical-align: middle;
-  cursor: default;
+    margin-right: 16px;
+    margin-left: 16px;
+    margin-top: 25px;
+    position: relative;
+    vertical-align: middle;
+    cursor: default;
 }

 .query-editor-text {
-  width: 100%;
-  margin: 2px;
-  border: solid 1px #a9acb3;
-  /*[{plugin-textbox-disabled-color}]*/
-  resize: none;
-  margin-top: -39px;
-  background-color: #ddd;
-  padding: 5px;
+    width: 100%;
+    margin: 2px;
+    border: solid 1px #A9ACB3;
+    /*[{plugin-textbox-disabled-color}]*/
+    resize: none;
+    margin-top: -39px;
+    background-color: #ddd;
+    padding: 5px;
 }

 .error-bar {
-  padding: @LargeSpace 34px @MediumSpace 24px;
+    padding: @LargeSpace 34px @MediumSpace 24px;
 }

 .error-message {
-  background-color: @BaseLow;
-  padding: @DefaultSpace;
-  display: inline-flex;
+    background-color: @BaseLow;
+    padding: @DefaultSpace;
+    display: inline-flex;
 }

 .error-text {
-  padding-left: @MediumSpace;
+    padding-left: @MediumSpace;
 }

 .query-editor-text-invalid {
-  width: 100%;
-  margin: 2px;
-  border: 1px solid #e51400;
-  resize: none;
-  margin-top: -30px;
+    width: 100%;
+    margin: 2px;
+    border: 1px solid #e51400;
+    resize: none;
+    margin-top: -30px;
 }

 .query-editor-panel .warning-bar {
-  width: 100%;
-  height: 20px;
-  background-color: #ffffff;
-  /*[{plugin-background-color}]*/
-  position: absolute;
-  top: -24px;
+    width: 100%;
+    height: 20px;
+    background-color: #ffffff;
+    /*[{plugin-background-color}]*/
+    position: absolute;
+    top: -24px;
 }

 .query-editor-panel .warning-bar .warning-message {
-  display: inline-flex;
-  padding-top: 2px;
-  vertical-align: middle;
+    display: inline-flex;
+    padding-top: 2px;
+    vertical-align: middle;
 }

 .query-editor-panel .warning-bar .warning-message .warning-text {
-  margin-left: 2px;
+    margin-left: 2px;
 }

-.advanced-options-panel {
-  margin-bottom: @DefaultSpace;
+.advanced-options-panel{
+    margin-bottom: @DefaultSpace;
 }

 .advanced-options-panel .advanced-heading .advanced-title {
-  display: inline-flex;
-  margin-left: 27px;
-  margin-top: 10px;
-  cursor: default;
+    display: inline-flex;
+    margin-left: 27px;
+    margin-top: 10px;
+    cursor: default;
 }

 .advanced-options-panel .advanced-options {
-  margin-left: 32px;
-  margin-top: 5px;
-  border: 1px solid transparent;
+    margin-left: 32px;
+    margin-top: 5px;
+    border: 1px solid transparent;
 }

 hr {
-  margin-top: 10px;
-  margin-bottom: 12px;
-  border: 0;
-  border-top: 1px solid #ccc;
+    margin-top: 10px;
+    margin-bottom: 12px;
+    border: 0;
+    border-top: 1px solid #ccc;
 }

 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
+    -webkit-appearance: none;
 }

 .advanced-options-panel .advanced-options .top .top-input {
-  width: 100px;
-  word-spacing: normal;
-  color: #1e1e1e;
-  /*[{common-controls-button-foreground}]*/
-  border: 1px solid #cccedb;
-  /*[1px solid {plugin-textbox-border-color}]*/
-  height: 20px;
-  margin-left: 8px;
+    width: 100px;
+    word-spacing: normal;
+    color: #1E1E1E;
+    /*[{common-controls-button-foreground}]*/
+    border: 1px solid #CCCEDB;
+    /*[1px solid {plugin-textbox-border-color}]*/
+    height: 20px;
+    margin-left: 8px;
 }

 .advanced-options-panel .advanced-options .top .invalid-top {
-  color: red;
+    color: red;
 }

 .advanced-options-panel .advanced-options .select {
-  margin-top: 18px;
-  display: inline-flex;
+    margin-top: 18px;
+    display: inline-flex;
 }

 .advanced-options-icon {
-  margin-left: 2px;
-  vertical-align: sub;
+    margin-left: 2px;
+    vertical-align: sub;
 }

 .advanced-options-panel .advanced-options .select .select-options-text {
-  margin-left: 4px;
+    margin-left: 4px;
 }

 .advanced-options-panel .advanced-options .select .select-options-link {
-  margin-left: 4px;
-  cursor: pointer;
-  outline: none;
+    margin-left: 4px;
+    cursor: pointer;
+    outline: none;
 }

 .query-panel .row .column-headers .Field {
-  padding-left: 95px;
-  padding-right: 0px;
-  padding-bottom: 6px;
+    padding-left: 95px;
+    padding-right: 0px;
+    padding-bottom: 6px;
 }

 .clause-table {
-  border-spacing: 0px;
-  display: table;
-  width: 100%;
-  margin-top: -3px;
+    border-spacing: 0px;
+    display: table;
+    width: 100%;
+    margin-top: -3px;
 }

 .clause-table-row {
-  display: row;
-  margin-bottom: 10px;
+    display: row;
+    margin-bottom: 10px;
 }

 .clause-table-cell {
-  display: table-cell;
-  text-align: left;
-  vertical-align: middle;
+    display: table-cell;
+    text-align: left;
+    vertical-align: middle;
 }

-.action-column > button,
-.group-control-header > button,
-.group-indicator-column > button {
-  min-width: 20px;
-  width: 20px;
-  padding: 0px;
-  background-color: transparent;
-  border-color: transparent;
-  cursor: pointer;
+.action-column>button,
+.group-control-header>button,
+.group-indicator-column>button {
+    min-width: 20px;
+    width: 20px;
+    padding: 0px;
+    background-color: transparent;
+    border-color: transparent;
+    cursor: pointer;
 }

-.group-control-header > button:disabled {
-  min-width: 20px;
-  width: 20px;
-  padding: 0px;
-  background-color: transparent;
-  border-color: transparent;
-  outline: none;
-  opacity: 0.4;
-  cursor: default;
+.group-control-header>button:disabled {
+    min-width: 20px;
+    width: 20px;
+    padding: 0px;
+    background-color: transparent;
+    border-color: transparent;
+    outline: none;
+    opacity: 0.4;
+    cursor: default;
 }

 .clause-table-field {
-  width: 100%;
-  border: 1px solid #bbbbbb;
+    width: 100%;
+    border: 1px solid #bbbbbb;
 }

 .clause-table-cell button {
-  height: 20px;
+    height: 20px;
 }

 .clause-table-cell input[type="checkbox"] {
-  padding: 0px;
-  margin-bottom: 12px;
+    padding: 0px;
+    margin-bottom: 12px;
 }

 .and-or-svg {
-  margin-top: -8px;
-  margin-right: -5px;
+    margin-top: -8px;
+    margin-right: -5px;
 }

 .scroll-box {
-  border-bottom: 1px transparent #ddd;
-  /*[1px solid {plugin-table-border-color}]*/
-  border-top: 1px transparent #ddd;
-  /*[1px solid {plugin-table-border-color}]*/
-  max-height: 20vh;
-  width: 100%;
+    border-bottom: 1px transparent #DDD;
+    /*[1px solid {plugin-table-border-color}]*/
+    border-top: 1px transparent #DDD;
+    /*[1px solid {plugin-table-border-color}]*/
+    max-height: 20vh;
+    width: 100%;
 }

 .scrollable {
-  overflow: auto;
-  overflow-x: hidden;
+    overflow: auto;
+    overflow-x: hidden;
 }

 .and-or-column,
 .and-or-header {
-  min-width: 65px;
-  padding-right: 10px;
-  padding-left: 5px;
+    min-width: 65px;
+    padding-right: 10px;
+    padding-left: 5px;
 }

 .operator-column,
 .operator-header {
-  min-width: 65px;
-  padding-right: 10px;
+    min-width: 65px;
+    padding-right: 10px;
 }

 .field-header,
 .field-column {
-  min-width: 125px;
-  padding-right: 10px;
+    min-width: 125px;
+    padding-right: 10px;
 }

 .type-header,
 .type-column {
-  min-width: 85px;
+    min-width: 85px;
 }

 .and-or-column,
@@ -345,41 +345,41 @@ input::-webkit-inner-spin-button {
 .type-header,
 .type-column,
 .action-header {
-  padding-right: 10px;
-  margin-bottom: 8px;
+    padding-right: 10px;
+    margin-bottom: 8px;
 }

 .value-header,
 .value-column,
 .time-column {
-  min-width: 230px;
-  padding: 0px 4px 0px 0px;
-  width: 100%;
-  margin-bottom: 8px;
+    min-width: 230px;
+    padding: 0px 4px 0px 0px;
+    width: 100%;
+    margin-bottom: 8px;
 }

 .group-control-header,
 .group-control-column {
-  min-width: 25px;
-  text-align: right;
+    min-width: 25px;
+    text-align: right;
 }

 .group-indicator-table {
-  border-spacing: 0px;
-  min-height: 24px;
+    border-spacing: 0px;
+    min-height: 24px
 }

 .group-indicator-column {
-  min-width: 21px;
-  padding: 0px;
-  border-style: none;
-  height: 29px;
+    min-width: 21px;
+    padding: 0px;
+    border-style: none;
+    height: 29px;
 }

-.clause-table-cell.action-column,
+.clause-table-cell.action-column, 
 .clause-table-cell.action-header {
-  min-width: 60px;
-  padding-left: @SmallSpace;
+    min-width: 60px;
+    padding-left: @SmallSpace;
 }

 .action-header,
@@ -388,14 +388,15 @@ input::-webkit-inner-spin-button {
 .operator-header,
 .value-header,
 .and-or-header {
-  padding-right: 4px;
-  padding-bottom: 5px;
+    padding-right: 4px;
+    padding-bottom: 5px;
 }

 .header-background {
-  background-color: #ffffff;
+    background-color: #ffffff;
 }

+
 /*.type-header {
    padding-right: 4px;
 }
@@ -409,111 +410,112 @@ input::-webkit-inner-spin-button {
 }*/

 .clause-table-field[readonly] {
-  background-color: #eeeef2;
-  /*[{plugin-table-header-background-color}]*/
-  border: 1px solid #cccedb;
-  /*[{plugin-table-border-color}]*/
+    background-color: #EEEEF2;
+    /*[{plugin-table-header-background-color}]*/
+    border: 1px solid #CCCEDB;
+    /*[{plugin-table-border-color}]*/
 }

 .addClause-title {
-  /*[{common-common-controls-button-border-hover}]*/
-  cursor: pointer;
-  margin-left: -5px;
+    /*[{common-common-controls-button-border-hover}]*/
+    cursor: pointer;
+    margin-left: -5px;
 }

 .addClause {
-  width: 125px;
-  padding: 8px 0px 5px 5px;
-  border: 1px solid #fff;
-  margin-left: 5px;
+    width: 125px;
+    padding: 8px 0px 5px 5px;
+    border: 1px solid #fff;
+    margin-left: 5px;
 }

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

 .addClause:active {
-  .active();
-  border: 1px dashed @AccentMedium;
+    .active();
+    border: 1px dashed @AccentMedium;
 }

 .clause-table-row {
-  min-width: 550px;
-  width: 100%;
+    min-width: 550px;
+    width: 100%;
 }

 .clause-table-field field-column {
-  min-width: 75px;
-  height: 30px;
-  width: 100%;
+    min-width: 75px;
+    height: 30px;
+    width: 100%;
 }

 .clause-table-field field-input {
-  min-width: 54px;
-  margin-left: -78px;
-  height: 25px;
-  border: none;
+    min-width: 54px;
+    margin-left: -78px;
+    height: 25px;
+    border: none;
 }

 .query-panel .row .spacing {
-  padding-bottom: 6px;
+    padding-bottom: 6px;
 }

 .query-panel .divider.horizontal {
-  height: 10px;
-  width: 100%;
+    height: 10px;
+    width: 100%
 }

 .inline-div {
-  display: inline;
+    display: inline
 }

 .querybuilder-addpropertyImg,
 .querybuilder-cancelImg {
-  width: 14px;
-  height: 14px;
-  margin-left: 3px;
-  margin-bottom: 8px;
+    width: 14px;
+    height: 14px;
+    margin-left: 3px;
+    margin-bottom: 8px;
 }

 .addclauseProperty-Img {
-  width: 14px;
-  height: 14px;
-  margin-bottom: 5px;
-  margin-left: 12px;
+    width: 14px;
+    height: 14px;
+    margin-bottom: 5px;
+    margin-left: 12px;
 }

 .entity-Add-Cancel {
-  // padding: @DefaultSpace @SmallSpace @SmallSpace;
-  cursor: pointer;
+    padding: @DefaultSpace @SmallSpace @SmallSpace;
+    cursor: pointer;
 }

 .entity-Add-Cancel:hover {
-  .hover();
+    .hover();
 }

 .entity-Add-Cancel:active {
-  .active();
+    .active();
 }

 .query-builder-isDisabled {
-  border: 1px solid #cccedb;
-  color: #ccc;
+    border: 1px solid #CCCEDB;
+    color: #ccc;
 }

 .edit-value-text {
-  padding-left: @DefaultSpace;
+    padding-left: @DefaultSpace;
 }

 .expand-triangle {
-  width: 10px;
-  height: 10px;
+    width: 10px;
+    height: 10px;
 }

 .expand-triangle-right {
-  margin-bottom: 5px;
+    margin-bottom: 5px;
 }

+
 /*
@media only screen and (max-width: 1200px) {
    .clause-table {
@@ -522,4 +524,4 @@ input::-webkit-inner-spin-button {
        width: 100%;
        padding-top: 10px;
    }
-}*/
+}*/
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "main": "index.js",
  "dependencies": {
    "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "3.16.2",
+    "@azure/cosmos": "3.10.5",
    "@azure/cosmos-language-service": "0.0.5",
    "@azure/identity": "1.2.1",
    "@azure/ms-rest-nodeauth": "3.0.7",
@@ -91,7 +91,6 @@
    "react-notification-system": "0.2.17",
    "react-redux": "7.1.3",
    "react-splitter-layout": "4.0.0",
-    "react-youtube": "9.0.1",
    "redux": "4.0.4",
    "reflect-metadata": "0.1.13",
    "rx-jupyter": "5.5.12",
@@ -131,7 +130,6 @@
    "@types/sinon": "2.3.3",
    "@types/styled-components": "5.1.1",
    "@types/underscore": "1.7.36",
-    "@types/youtube-player": "5.5.6",
    "@typescript-eslint/eslint-plugin": "4.22.0",
    "@typescript-eslint/parser": "4.22.0",
    "@webpack-cli/serve": "1.5.2",
@@ -232,4 +230,4 @@
  "prettier": {
    "printWidth": 120
  }
-}
+}
--- a/preview/package.json
+++ b/preview/package.json
@@ -4,7 +4,7 @@
  "description": "",
  "main": "index.js",
  "scripts": {
-    "deploy": "az webapp up --name \"cosmos-explorer-preview\" --subscription \"cosmosdb-portalteam-generaltest-msft\" --resource-group \"stfaul\"",
+    "deploy": "az webapp up -n cosmos-explorer-preview --subscription cosmosdb-portalteam-generaldemo -g stfaul",
    "start": "node index.js",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
@@ -15,4 +15,4 @@
    "http-proxy-middleware": "^1.1.0",
    "node-fetch": "^2.6.1"
  }
-}
+}
--- a/sampleData/sqlSampleData.json
+++ b/sampleData/sqlSampleData.json
@@ -1,25 +1,26 @@
 {
+  "databaseId": "SampleDB",
+  "offerThroughput": 400,
+  "databaseLevelThroughput": false,
+  "collectionId": "Persons",
+  "createNewDatabase": true,
+  "partitionKey": { "kind": "Hash", "paths": ["/firstname"], "version": 1 },
  "data": [
-    { "address": "2007, NE 37TH PL" },
-    { "address": "11635, SE MAY CREEK PARK DR" },
-    { "address": "8923, 133RD AVE SE" },
-    { "address": "1124, N 33RD ST" },
-    { "address": "4288, 131ST PL SE" },
-    { "address": "10900, SE 66TH ST" },
-    { "address": "6260, 139TH AVE NE" },
-    { "address": "13427, NE SPRING BLVD" },
-    { "address": "13812, NE SPRING BLVD" },
-    { "address": "5029, 159TH PL SE" },
-    { "address": "8604, 117TH AVE SE" },
-    { "address": "1561, 139TH LN NE" },
-    { "address": "1575, 139TH CT NE" },
-    { "address": "13901, NE 15TH CT" },
-    { "address": "16365, NE 12TH PL" },
-    { "address": "12226, NE 37TH ST" },
-    { "address": "4021, 129TH CT SE" },
-    { "address": "1455, 159TH PL NE" },
-    { "address": "15825, NE 14TH RD" },
-    { "address": "1418, 157TH CT NE" },
-    { "address": "889, 131ST PL NE" }
+    {
+      "firstname": "Eva",
+      "age": 44
+    },
+    {
+      "firstname": "Véronique",
+      "age": 50
+    },
+    {
+      "firstname": "亜妃子",
+      "age": 5
+    },
+    {
+      "firstname": "John",
+      "age": 23
+    }
  ]
 }
--- a/src/Common/CollapsedResourceTree.tsx
+++ b/src/Common/CollapsedResourceTree.tsx
@@ -1,6 +1,6 @@
 import React, { FunctionComponent, MutableRefObject, useEffect, useRef } from "react";
 import arrowLeftImg from "../../images/imgarrowlefticon.svg";
-import { getApiShortDisplayName } from "../Utils/APITypeUtils";
+import { userContext } from "../UserContext";
 import { NormalizedEventKey } from "./Constants";

 export interface CollapsedResourceTreeProps {
@@ -45,7 +45,7 @@ export const CollapsedResourceTree: FunctionComponent<CollapsedResourceTreeProps
              <img className="arrowCollapsed" src={arrowLeftImg} alt="Expand" />
            </span>
            <span className="collectionCollapsed">
-              <span>{getApiShortDisplayName()}</span>
+              <span>{userContext.apiType} API</span>
            </span>
          </li>
        </ul>
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -45,8 +45,6 @@ export class ArmResourceTypes {

 export class BackendDefaults {
  public static partitionKeyKind = "Hash";
-  public static partitionKeyMultiHash = "MultiHash";
-  public static maxNumMultiHashPartition = 2;
  public static singlePartitionStorageInGb: string = "10";
  public static multiPartitionStorageInGb: string = "100";
  public static maxChangeFeedRetentionDuration: number = 10;
@@ -101,7 +99,6 @@ export class Flights {
  public static readonly PhoenixNotebooks = "phoenixnotebooks";
  public static readonly PhoenixFeatures = "phoenixfeatures";
  public static readonly NotebooksDownBanner = "notebooksdownbanner";
-  public static readonly PublicGallery = "publicgallery";
 }

 export class AfecFeatures {
@@ -356,10 +353,6 @@ export enum ContainerStatusType {
  Disconnected = "Disconnected",
 }

-export enum PoolIdType {
-  DefaultPoolId = "default",
-}
-
 export const EmulatorMasterKey =
  //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
  "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
--- a/src/Common/CosmosClient.test.ts
+++ b/src/Common/CosmosClient.test.ts
@@ -1,4 +1,4 @@
-import { ResourceType } from "@azure/cosmos";
+import { ResourceType } from "@azure/cosmos/dist-esm/common/constants";
 import { Platform, resetConfigContext, updateConfigContext } from "../ConfigContext";
 import { updateUserContext } from "../UserContext";
 import { endpoint, getTokenFromAuthService, requestPlugin, tokenProvider } from "./CosmosClient";
--- a/src/Common/CosmosClient.ts
+++ b/src/Common/CosmosClient.ts
@@ -1,4 +1,6 @@
 import * as Cosmos from "@azure/cosmos";
+import { RequestInfo, setAuthorizationTokenHeaderUsingMasterKey } from "@azure/cosmos";
+import { CosmosHeaders } from "@azure/cosmos/dist-esm";
 import { configContext, Platform } from "../ConfigContext";
 import { userContext } from "../UserContext";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
@@ -7,7 +9,7 @@ import { getErrorMessage } from "./ErrorHandlingUtils";

 const _global = typeof self === "undefined" ? window : self;

-export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
+export const tokenProvider = async (requestInfo: RequestInfo) => {
  const { verb, resourceId, resourceType, headers } = requestInfo;

  if (userContext.features.enableAadDataPlane && userContext.aadToken) {
@@ -18,13 +20,13 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {

  if (configContext.platform === Platform.Emulator) {
    // TODO This SDK method mutates the headers object. Find a better one or fix the SDK.
-    await Cosmos.setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
+    await setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
    return decodeURIComponent(headers.authorization);
  }

  if (userContext.masterKey) {
    // TODO This SDK method mutates the headers object. Find a better one or fix the SDK.
-    await Cosmos.setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
+    await setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
    return decodeURIComponent(headers.authorization);
  }

@@ -87,8 +89,8 @@ let _client: Cosmos.CosmosClient;
 export function client(): Cosmos.CosmosClient {
  if (_client) return _client;

-  let _defaultHeaders: Cosmos.CosmosHeaders = {};
-  _defaultHeaders["x-ms-cosmos-sdk-supportedcapabilities"] =
+  let _defaultHeaders: CosmosHeaders = {};
+  _defaultHeaders["x-ms-cosmos-sdk-supported-capabilities"] =
    SDKSupportedCapabilities.None | SDKSupportedCapabilities.PartitionMerge;

  const options: Cosmos.CosmosClientOptions = {
--- a/src/Common/MongoProxyClient.test.ts
+++ b/src/Common/MongoProxyClient.test.ts
@@ -25,12 +25,12 @@ const fetchMock = () => {
  });
 };

-const partitionKeyProperties = ["pk"];
+const partitionKeyProperty = "pk";

 const collection = {
  id: () => "testCollection",
  rid: "testCollectionrid",
-  partitionKeyProperties,
+  partitionKeyProperty,
  partitionKey: {
    paths: ["/pk"],
    kind: "Hash",
@@ -41,7 +41,7 @@ const collection = {
 const documentId = ({
  partitionKeyHeader: () => "[]",
  self: "db/testDB/db/testCollection/docs/testId",
-  partitionKeyProperties,
+  partitionKeyProperty,
  partitionKey: {
    paths: ["/pk"],
    kind: "Hash",
@@ -236,12 +236,13 @@ describe("MongoProxyClient", () => {
    });

    it("returns a production endpoint", () => {
-      const endpoint = getEndpoint("https://main.documentdb.ext.azure.com");
+      const endpoint = getEndpoint();
      expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/mongo/explorer");
    });

    it("returns a development endpoint", () => {
-      const endpoint = getEndpoint("https://localhost:1234");
+      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      const endpoint = getEndpoint();
      expect(endpoint).toEqual("https://localhost:1234/api/mongo/explorer");
    });

@@ -249,7 +250,7 @@ describe("MongoProxyClient", () => {
      updateUserContext({
        authType: AuthType.EncryptedToken,
      });
-      const endpoint = getEndpoint("https://main.documentdb.ext.azure.com");
+      const endpoint = getEndpoint();
      expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/guest/mongo/explorer");
    });
  });
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -1,6 +1,5 @@
 import { Constants as CosmosSDKConstants } from "@azure/cosmos";
 import queryString from "querystring";
-import { allowedMongoProxyEndpoints, validateEndpoint } from "Utils/EndpointValidation";
 import { AuthType } from "../AuthType";
 import { configContext } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
@@ -76,7 +75,7 @@ export function queryDocuments(
    dba: databaseAccount.name,
    pk:
      collection && collection.partitionKey && !collection.partitionKey.systemKey
-        ? collection.partitionKeyProperties?.[0]
+        ? collection.partitionKeyProperty
        : "",
  };

@@ -139,7 +138,7 @@ export function readDocument(
    dba: databaseAccount.name,
    pk:
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
-        ? documentId.partitionKeyProperties?.[0]
+        ? documentId.partitionKeyProperty
        : "",
  };

@@ -225,7 +224,7 @@ export function updateDocument(
    dba: databaseAccount.name,
    pk:
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
-        ? documentId.partitionKeyProperties?.[0]
+        ? documentId.partitionKeyProperty
        : "",
  };
  const endpoint = getFeatureEndpointOrDefault("updateDocument");
@@ -266,7 +265,7 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
    dba: databaseAccount.name,
    pk:
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
-        ? documentId.partitionKeyProperties?.[0]
+        ? documentId.partitionKeyProperty
        : "",
  };
  const endpoint = getFeatureEndpointOrDefault("deleteDocument");
@@ -299,7 +298,7 @@ export function createMongoCollectionWithProxy(
    db: params.databaseId,
    coll: params.collectionId,
    pk: shardKey,
-    offerThroughput: params.autoPilotMaxThroughput || params.offerThroughput,
+    offerThroughput: params.offerThroughput,
    cd: params.createNewDatabase,
    st: params.databaseLevelThroughput,
    is: !!shardKey,
@@ -309,6 +308,7 @@ export function createMongoCollectionWithProxy(
    rg: userContext.resourceGroup,
    dba: databaseAccount.name,
    isAutoPilot: !!params.autoPilotMaxThroughput,
+    autoPilotThroughput: params.autoPilotMaxThroughput?.toString(),
  };

  const endpoint = getFeatureEndpointOrDefault("createCollectionWithProxy");
@@ -336,17 +336,14 @@ export function createMongoCollectionWithProxy(
 }

 export function getFeatureEndpointOrDefault(feature: string): string {
-  const endpoint =
-    hasFlag(userContext.features.mongoProxyAPIs, feature) &&
-    validateEndpoint(userContext.features.mongoProxyEndpoint, allowedMongoProxyEndpoints)
-      ? userContext.features.mongoProxyEndpoint
-      : configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT;
-
-  return getEndpoint(endpoint);
+  return hasFlag(userContext.features.mongoProxyAPIs, feature)
+    ? getEndpoint(userContext.features.mongoProxyEndpoint)
+    : getEndpoint();
 }

-export function getEndpoint(endpoint: string): string {
-  let url = endpoint + "/api/mongo/explorer";
+export function getEndpoint(customEndpoint?: string): string {
+  let url = customEndpoint ? customEndpoint : configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT;
+  url += "/api/mongo/explorer";

  if (userContext.authType === AuthType.EncryptedToken) {
    url = url.replace("api/mongo", "api/guest/mongo");
--- a/src/Common/QueriesClient.ts
+++ b/src/Common/QueriesClient.ts
@@ -149,10 +149,10 @@ export class QueriesClient {
    const documentId = new DocumentId(
      {
        partitionKey: QueriesClient.PartitionKey,
-        partitionKeyProperties: ["id"],
+        partitionKeyProperty: "id",
      } as DocumentsTab,
      query,
-      [query.queryName]
+      query.queryName
    ); // TODO: Remove DocumentId's dependency on DocumentsTab
    const options: any = { partitionKey: query.resourceId };
    return deleteDocument(queriesCollection, documentId)
--- a/src/Common/ResourceTreeContainer.tsx
+++ b/src/Common/ResourceTreeContainer.tsx
@@ -6,7 +6,6 @@ import Explorer from "../Explorer/Explorer";
 import { ResourceTokenTree } from "../Explorer/Tree/ResourceTokenTree";
 import { ResourceTree } from "../Explorer/Tree/ResourceTree";
 import { userContext } from "../UserContext";
-import { getApiShortDisplayName } from "../Utils/APITypeUtils";
 import { NormalizedEventKey } from "./Constants";

 export interface ResourceTreeContainerProps {
@@ -43,7 +42,7 @@ export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps
        {/* Collections Window Title/Command Bar - Start */}
        <div className="collectiontitle">
          <div className="coltitle">
-            <span className="titlepadcol">{getApiShortDisplayName()}</span>
+            <span className="titlepadcol">{userContext.apiType} API</span>
            <div className="float-right">
              <span
                className="padimgcolrefresh"
--- a/src/Common/TableEntity.tsx
+++ b/src/Common/TableEntity.tsx
@@ -73,17 +73,6 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({

  const sectionStackTokens: IStackTokens = { childrenGap: 12 };

-  const handleKeyPress = (event: React.KeyboardEvent<HTMLElement>) => {
-    if (event.key === "Enter" || event.key === "Space") {
-      onEditEntity();
-    }
-  };
-  const handleKeyPressdelete = (event: React.KeyboardEvent<HTMLElement>) => {
-    if (event.key === "Enter" || event.key === "Space") {
-      onDeleteEntity();
-    }
-  };
-
  const getEntityValueType = (): string => {
    const { Int, Smallint, Tinyint } = CassandraType;
    const { Double, Int32, Int64 } = TableType;
@@ -137,28 +126,12 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
        />
        {!isEntityValueDisable && (
          <TooltipHost content="Edit property" id="editTooltip">
-            <Image
-              {...imageProps}
-              src={EditIcon}
-              alt="editEntity"
-              id="editEntity"
-              onClick={onEditEntity}
-              tabIndex={0}
-              onKeyPress={handleKeyPress}
-            />
+            <Image {...imageProps} src={EditIcon} alt="editEntity" id="editEntity" onClick={onEditEntity} />
          </TooltipHost>
        )}
        {isDeleteOptionVisible && userContext.apiType !== "Cassandra" && (
          <TooltipHost content="Delete property" id="deleteTooltip">
-            <Image
-              {...imageProps}
-              src={DeleteIcon}
-              alt="delete entity"
-              id="deleteEntity"
-              onClick={onDeleteEntity}
-              tabIndex={0}
-              onKeyPress={handleKeyPressdelete}
-            />
+            <Image {...imageProps} src={DeleteIcon} alt="delete entity" id="deleteEntity" onClick={onDeleteEntity} />
          </TooltipHost>
        )}
      </Stack>
--- a/src/Common/Tooltip/InfoTooltip.tsx
+++ b/src/Common/Tooltip/InfoTooltip.tsx
@@ -9,7 +9,7 @@ export const InfoTooltip: React.FunctionComponent<TooltipProps> = ({ children }:
  return (
    <span>
      <TooltipHost content={children}>
-        <Icon iconName="Info" ariaLabel={children} className="panelInfoIcon" tabIndex={0} />
+        <Icon iconName="Info" ariaLabel="Info" className="panelInfoIcon" tabIndex={0} />
      </TooltipHost>
    </span>
  );
--- a/src/Common/dataAccess/createCollection.ts
+++ b/src/Common/dataAccess/createCollection.ts
@@ -1,4 +1,7 @@
-import { ContainerRequest, ContainerResponse, DatabaseRequest, DatabaseResponse, RequestOptions } from "@azure/cosmos";
+import { ContainerResponse, DatabaseResponse } from "@azure/cosmos";
+import { RequestOptions } from "@azure/cosmos/dist-esm";
+import { ContainerRequest } from "@azure/cosmos/dist-esm/client/Container/ContainerRequest";
+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";
@@ -24,7 +27,7 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
  );
  try {
    let collection: DataModels.Collection;
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
      if (params.createNewDatabase) {
        const createDatabaseParams: DataModels.CreateDatabaseParams = {
          autoPilotMaxThroughput: params.autoPilotMaxThroughput,
--- a/src/Common/dataAccess/createDatabase.ts
+++ b/src/Common/dataAccess/createDatabase.ts
@@ -1,4 +1,5 @@
-import { DatabaseRequest, DatabaseResponse } from "@azure/cosmos";
+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";
@@ -25,8 +26,7 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
    if (userContext.apiType === "Tables") {
      throw new Error("Creating database resources is not allowed for tables accounts");
    }
-    const database: DataModels.Database = await (userContext.authType === AuthType.AAD &&
-    !userContext.features.enableSDKoperations
+    const database: DataModels.Database = await (userContext.authType === AuthType.AAD && !userContext.useSDKOperations
      ? createDatabaseWithARM(params)
      : createDatabaseWithSDK(params));

--- a/src/Common/dataAccess/createStoredProcedure.ts
+++ b/src/Common/dataAccess/createStoredProcedure.ts
@@ -20,11 +20,7 @@ export async function createStoredProcedure(
 ): Promise<StoredProcedureDefinition & Resource> {
  const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      try {
        const getResponse = await getSqlStoredProcedure(
          userContext.subscriptionId,
--- a/src/Common/dataAccess/createTrigger.ts
+++ b/src/Common/dataAccess/createTrigger.ts
@@ -14,11 +14,7 @@ export async function createTrigger(
 ): Promise<TriggerDefinition | SqlTriggerResource> {
  const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      try {
        const getResponse = await getSqlTrigger(
          userContext.subscriptionId,
--- a/src/Common/dataAccess/createUserDefinedFunction.ts
+++ b/src/Common/dataAccess/createUserDefinedFunction.ts
@@ -20,11 +20,7 @@ export async function createUserDefinedFunction(
 ): Promise<UserDefinedFunctionDefinition & Resource> {
  const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      try {
        const getResponse = await getSqlUserDefinedFunction(
          userContext.subscriptionId,
--- a/src/Common/dataAccess/deleteCollection.ts
+++ b/src/Common/dataAccess/deleteCollection.ts
@@ -12,7 +12,7 @@ import { handleError } from "../ErrorHandlingUtils";
 export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
  const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
  try {
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
      await deleteCollectionWithARM(databaseId, collectionId);
    } else {
      await client().database(databaseId).container(collectionId).delete();
--- a/src/Common/dataAccess/deleteDatabase.ts
+++ b/src/Common/dataAccess/deleteDatabase.ts
@@ -12,7 +12,10 @@ export async function deleteDatabase(databaseId: string): Promise<void> {
  const clearMessage = logConsoleProgress(`Deleting database ${databaseId}`);

  try {
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (userContext.apiType === "Tables") {
+      throw new Error("Deleting database resources is not allowed for tables accounts");
+    }
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
      await deleteDatabaseWithARM(databaseId);
    } else {
      await client().database(databaseId).delete();
--- a/src/Common/dataAccess/deleteDocument.ts
+++ b/src/Common/dataAccess/deleteDocument.ts
@@ -1,10 +1,9 @@
 import { CollectionBase } from "../../Contracts/ViewModels";
-import DocumentId from "../../Explorer/Tree/DocumentId";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
-import { getPartitionKeyValue } from "./getPartitionKeyValue";
+import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import DocumentId from "../../Explorer/Tree/DocumentId";

 export const deleteDocument = async (collection: CollectionBase, documentId: DocumentId): Promise<void> => {
  const entityName: string = getEntityName();
@@ -14,7 +13,7 @@ export const deleteDocument = async (collection: CollectionBase, documentId: Doc
    await client()
      .database(collection.databaseId)
      .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
+      .item(documentId.id(), documentId.partitionKeyValue)
      .delete();
    logConsoleInfo(`Successfully deleted ${entityName} ${documentId.id()}`);
  } catch (error) {
--- a/src/Common/dataAccess/deleteStoredProcedure.ts
+++ b/src/Common/dataAccess/deleteStoredProcedure.ts
@@ -12,11 +12,7 @@ export async function deleteStoredProcedure(
 ): Promise<void> {
  const clearMessage = logConsoleProgress(`Deleting stored procedure ${storedProcedureId}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      await deleteSqlStoredProcedure(
        userContext.subscriptionId,
        userContext.resourceGroup,
--- a/src/Common/dataAccess/deleteTrigger.ts
+++ b/src/Common/dataAccess/deleteTrigger.ts
@@ -8,11 +8,7 @@ import { handleError } from "../ErrorHandlingUtils";
 export async function deleteTrigger(databaseId: string, collectionId: string, triggerId: string): Promise<void> {
  const clearMessage = logConsoleProgress(`Deleting trigger ${triggerId}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      await deleteSqlTrigger(
        userContext.subscriptionId,
        userContext.resourceGroup,
--- a/src/Common/dataAccess/deleteUserDefinedFunction.ts
+++ b/src/Common/dataAccess/deleteUserDefinedFunction.ts
@@ -8,11 +8,7 @@ import { handleError } from "../ErrorHandlingUtils";
 export async function deleteUserDefinedFunction(databaseId: string, collectionId: string, id: string): Promise<void> {
  const clearMessage = logConsoleProgress(`Deleting user defined function ${id}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      await deleteSqlUserDefinedFunction(
        userContext.subscriptionId,
        userContext.resourceGroup,
--- a/src/Common/dataAccess/getPartitionKeyValue.ts
+++ b/src/Common/dataAccess/getPartitionKeyValue.ts
@@ -1,12 +0,0 @@
-import { userContext } from "UserContext";
-import DocumentId from "../../Explorer/Tree/DocumentId";
-
-export const getPartitionKeyValue = (documentId: DocumentId) => {
-  if (userContext.apiType === "Tables" && documentId.partitionKeyValue?.length === 0) {
-    return "";
-  }
-  if (documentId.partitionKeyValue?.length === 0) {
-    return undefined;
-  }
-  return documentId.partitionKeyValue;
-};
--- a/src/Common/dataAccess/readCollectionOffer.ts
+++ b/src/Common/dataAccess/readCollectionOffer.ts
@@ -14,11 +14,7 @@ export const readCollectionOffer = async (params: ReadCollectionOfferParams): Pr
  const clearMessage = logConsoleProgress(`Querying offer for collection ${params.collectionId}`);

  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType !== "Tables") {
      return await readCollectionOfferWithARM(params.databaseId, params.collectionId);
    }

--- a/src/Common/dataAccess/readCollections.ts
+++ b/src/Common/dataAccess/readCollections.ts
@@ -13,11 +13,7 @@ import { handleError } from "../ErrorHandlingUtils";
 export async function readCollections(databaseId: string): Promise<DataModels.Collection[]> {
  const clearMessage = logConsoleProgress(`Querying containers for database ${databaseId}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType !== "Tables") {
      return await readCollectionsWithARM(databaseId);
    }

--- a/src/Common/dataAccess/readDatabaseOffer.ts
+++ b/src/Common/dataAccess/readDatabaseOffer.ts
@@ -13,11 +13,7 @@ export const readDatabaseOffer = async (params: ReadDatabaseOfferParams): Promis
  const clearMessage = logConsoleProgress(`Querying offer for database ${params.databaseId}`);

  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType !== "Tables") {
      return await readDatabaseOfferWithARM(params.databaseId);
    }

--- a/src/Common/dataAccess/readDatabases.ts
+++ b/src/Common/dataAccess/readDatabases.ts
@@ -13,11 +13,7 @@ export async function readDatabases(): Promise<DataModels.Database[]> {
  let databases: DataModels.Database[];
  const clearMessage = logConsoleProgress(`Querying databases`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType !== "Tables") {
      databases = await readDatabasesWithARM();
    } else {
      const sdkResponse = await client().databases.readAll().fetchAll();
--- a/src/Common/dataAccess/readDocument.ts
+++ b/src/Common/dataAccess/readDocument.ts
@@ -1,29 +1,21 @@
-import { Item, RequestOptions } from "@azure/cosmos";
+import { Item } from "@azure/cosmos";
 import { CollectionBase } from "../../Contracts/ViewModels";
-import DocumentId from "../../Explorer/Tree/DocumentId";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { HttpHeaders } from "../Constants";
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
-import { getPartitionKeyValue } from "./getPartitionKeyValue";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import DocumentId from "../../Explorer/Tree/DocumentId";

 export const readDocument = async (collection: CollectionBase, documentId: DocumentId): Promise<Item> => {
  const entityName = getEntityName();
  const clearMessage = logConsoleProgress(`Reading ${entityName} ${documentId.id()}`);

  try {
-    const options: RequestOptions =
-      documentId.partitionKey.kind === "MultiHash"
-        ? {
-            [HttpHeaders.partitionKey]: documentId.partitionKeyValue,
-          }
-        : {};
    const response = await client()
      .database(collection.databaseId)
      .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
-      .read(options);
+      .item(documentId.id(), documentId.partitionKeyValue)
+      .read();

    return response?.resource;
  } catch (error) {
--- a/src/Common/dataAccess/readOfferWithSDK.ts
+++ b/src/Common/dataAccess/readOfferWithSDK.ts
@@ -1,6 +1,6 @@
-import { RequestOptions } from "@azure/cosmos";
-import { Offer } from "../../Contracts/DataModels";
 import { HttpHeaders } from "../Constants";
+import { Offer } from "../../Contracts/DataModels";
+import { RequestOptions } from "@azure/cosmos/dist-esm";
 import { client } from "../CosmosClient";
 import { parseSDKOfferResponse } from "../OfferUtility";
 import { readOffers } from "./readOffers";
--- a/src/Common/dataAccess/readStoredProcedures.ts
+++ b/src/Common/dataAccess/readStoredProcedures.ts
@@ -12,11 +12,7 @@ export async function readStoredProcedures(
 ): Promise<(StoredProcedureDefinition & Resource)[]> {
  const clearMessage = logConsoleProgress(`Querying stored procedures for container ${collectionId}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      const rpResponse = await listSqlStoredProcedures(
        userContext.subscriptionId,
        userContext.resourceGroup,
--- a/src/Common/dataAccess/readTriggers.ts
+++ b/src/Common/dataAccess/readTriggers.ts
@@ -13,11 +13,7 @@ export async function readTriggers(
 ): Promise<SqlTriggerResource[] | TriggerDefinition[]> {
  const clearMessage = logConsoleProgress(`Querying triggers for container ${collectionId}`);
  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType === "SQL") {
      const rpResponse = await listSqlTriggers(
        userContext.subscriptionId,
        userContext.resourceGroup,
--- a/src/Common/dataAccess/readUserDefinedFunctions.ts
+++ b/src/Common/dataAccess/readUserDefinedFunctions.ts
@@ -11,9 +11,9 @@ export async function readUserDefinedFunctions(
  collectionId: string
 ): Promise<(UserDefinedFunctionDefinition & Resource)[]> {
  const clearMessage = logConsoleProgress(`Querying user defined functions for container ${collectionId}`);
-  const { authType, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
+  const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
  try {
-    if (authType === AuthType.AAD && !userContext.features.enableSDKoperations && apiType === "SQL") {
+    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
      const rpResponse = await listSqlUserDefinedFunctions(
        subscriptionId,
        resourceGroup,
--- a/src/Common/dataAccess/updateCollection.ts
+++ b/src/Common/dataAccess/updateCollection.ts
@@ -1,4 +1,5 @@
-import { ContainerDefinition, RequestOptions } from "@azure/cosmos";
+import { ContainerDefinition } from "@azure/cosmos";
+import { RequestOptions } from "@azure/cosmos/dist-esm";
 import { AuthType } from "../../AuthType";
 import { Collection } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -33,11 +34,7 @@ export async function updateCollection(
  const clearMessage = logConsoleProgress(`Updating container ${collectionId}`);

  try {
-    if (
-      userContext.authType === AuthType.AAD &&
-      !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
-    ) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations && userContext.apiType !== "Tables") {
      collection = await updateCollectionWithARM(databaseId, collectionId, newCollection);
    } else {
      const sdkResponse = await client()
--- a/src/Common/dataAccess/updateDocument.ts
+++ b/src/Common/dataAccess/updateDocument.ts
@@ -1,12 +1,10 @@
-import { Item, RequestOptions } from "@azure/cosmos";
-import { HttpHeaders } from "Common/Constants";
 import { CollectionBase } from "../../Contracts/ViewModels";
-import DocumentId from "../../Explorer/Tree/DocumentId";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { Item } from "@azure/cosmos";
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
-import { getPartitionKeyValue } from "./getPartitionKeyValue";
+import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import DocumentId from "../../Explorer/Tree/DocumentId";

 export const updateDocument = async (
  collection: CollectionBase,
@@ -17,17 +15,11 @@ export const updateDocument = async (
  const clearMessage = logConsoleProgress(`Updating ${entityName} ${documentId.id()}`);

  try {
-    const options: RequestOptions =
-      documentId.partitionKey.kind === "MultiHash"
-        ? {
-            [HttpHeaders.partitionKey]: documentId.partitionKeyValue,
-          }
-        : {};
    const response = await client()
      .database(collection.databaseId)
      .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
-      .replace(newDocument, options);
+      .item(documentId.id(), documentId.partitionKeyValue)
+      .replace(newDocument);

    logConsoleInfo(`Successfully updated ${entityName} ${documentId.id()}`);
    return response?.resource;
--- a/src/Common/dataAccess/updateOffer.ts
+++ b/src/Common/dataAccess/updateOffer.ts
@@ -1,4 +1,5 @@
-import { OfferDefinition, RequestOptions } from "@azure/cosmos";
+import { OfferDefinition } from "@azure/cosmos";
+import { RequestOptions } from "@azure/cosmos/dist-esm";
 import { AuthType } from "../../AuthType";
 import { Offer, SDKOfferDefinition, UpdateOfferParams } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -56,7 +57,7 @@ export const updateOffer = async (params: UpdateOfferParams): Promise<Offer> =>
  const clearMessage = logConsoleProgress(`Updating offer for ${offerResourceText}`);

  try {
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
      if (params.collectionId) {
        updatedOffer = await updateCollectionOfferWithARM(params);
      } else if (userContext.apiType === "Tables") {
--- a/src/Common/dataAccess/updateStoredProcedure.ts
+++ b/src/Common/dataAccess/updateStoredProcedure.ts
@@ -20,9 +20,9 @@ export async function updateStoredProcedure(
 ): Promise<StoredProcedureDefinition & Resource> {
  const clearMessage = logConsoleProgress(`Updating stored procedure ${storedProcedure.id}`);
  try {
-    const { authType, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
+    const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;

-    if (authType === AuthType.AAD && !userContext.features.enableSDKoperations && apiType === "SQL") {
+    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
      const getResponse = await getSqlStoredProcedure(
        subscriptionId,
        resourceGroup,
--- a/src/Common/dataAccess/updateTrigger.ts
+++ b/src/Common/dataAccess/updateTrigger.ts
@@ -13,9 +13,9 @@ export async function updateTrigger(
  trigger: SqlTriggerResource
 ): Promise<SqlTriggerResource | TriggerDefinition> {
  const clearMessage = logConsoleProgress(`Updating trigger ${trigger.id}`);
-  const { authType, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
+  const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
  try {
-    if (authType === AuthType.AAD && !userContext.features.enableSDKoperations && apiType === "SQL") {
+    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
      const getResponse = await getSqlTrigger(
        subscriptionId,
        resourceGroup,
--- a/src/Common/dataAccess/updateUserDefinedFunction.ts
+++ b/src/Common/dataAccess/updateUserDefinedFunction.ts
@@ -19,9 +19,9 @@ export async function updateUserDefinedFunction(
  userDefinedFunction: UserDefinedFunctionDefinition
 ): Promise<UserDefinedFunctionDefinition & Resource> {
  const clearMessage = logConsoleProgress(`Updating user defined function ${userDefinedFunction.id}`);
-  const { authType, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
+  const { authType, useSDKOperations, apiType, subscriptionId, resourceGroup, databaseAccount } = userContext;
  try {
-    if (authType === AuthType.AAD && !userContext.features.enableSDKoperations && apiType === "SQL") {
+    if (authType === AuthType.AAD && !useSDKOperations && apiType === "SQL") {
      const getResponse = await getSqlUserDefinedFunction(
        subscriptionId,
        resourceGroup,
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -1,16 +1,4 @@
-import {
-  allowedAadEndpoints,
-  allowedArcadiaEndpoints,
-  allowedArmEndpoints,
-  allowedBackendEndpoints,
-  allowedEmulatorEndpoints,
-  allowedGraphEndpoints,
-  allowedHostedExplorerEndpoints,
-  allowedJunoOrigins,
-  allowedMongoBackendEndpoints,
-  allowedMsalRedirectEndpoints,
-  validateEndpoint,
-} from "Utils/EndpointValidation";
+import { JunoEndpoints } from "Common/Constants";

 export enum Platform {
  Portal = "Portal",
@@ -20,7 +8,7 @@ export enum Platform {

 export interface ConfigContext {
  platform: Platform;
-  allowedParentFrameOrigins: ReadonlyArray<string>;
+  allowedParentFrameOrigins: string[];
  gitSha?: string;
  proxyPath?: string;
  AAD_ENDPOINT: string;
@@ -40,9 +28,9 @@ export interface ConfigContext {
  GITHUB_TEST_ENV_CLIENT_ID: string;
  GITHUB_CLIENT_SECRET?: string; // No need to inject secret for prod. Juno already knows it.
  isTerminalEnabled: boolean;
-  isPhoenixEnabled: boolean;
  hostedExplorerURL: string;
  armAPIVersion?: string;
+  allowedJunoOrigins: string[];
  msalRedirectURI?: string;
 }

@@ -52,11 +40,12 @@ let configContext: Readonly<ConfigContext> = {
  allowedParentFrameOrigins: [
    `^https:\\/\\/cosmos\\.azure\\.(com|cn|us)$`,
    `^https:\\/\\/[\\.\\w]*portal\\.azure\\.(com|cn|us)$`,
-    `^https:\\/\\/[\\.\\w]*portal\\.microsoftazure\\.de$`,
+    `^https:\\/\\/[\\.\\w]*portal\\.microsoftazure.de$`,
    `^https:\\/\\/[\\.\\w]*ext\\.azure\\.(com|cn|us)$`,
    `^https:\\/\\/[\\.\\w]*\\.ext\\.microsoftazure\\.de$`,
-    `^https:\\/\\/cosmos-db-dataexplorer-germanycentral\\.azurewebsites\\.de$`,
-  ], // Webpack injects this at build time
+    `^https://cosmos-db-dataexplorer-germanycentral.azurewebsites.de$`,
+  ],
+  // Webpack injects this at build time
  gitSha: process.env.GIT_SHA,
  hostedExplorerURL: "https://cosmos.azure.com/",
  AAD_ENDPOINT: "https://login.microsoftonline.com/",
@@ -72,7 +61,14 @@ let configContext: Readonly<ConfigContext> = {
  JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
  BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
  isTerminalEnabled: false,
-  isPhoenixEnabled: false,
+  allowedJunoOrigins: [
+    JunoEndpoints.Test,
+    JunoEndpoints.Test2,
+    JunoEndpoints.Test3,
+    JunoEndpoints.Prod,
+    JunoEndpoints.Stage,
+    "https://localhost",
+  ],
 };

 export function resetConfigContext(): void {
@@ -83,50 +79,6 @@ export function resetConfigContext(): void {
 }

 export function updateConfigContext(newContext: Partial<ConfigContext>): void {
-  if (!newContext) {
-    return;
-  }
-
-  if (!validateEndpoint(newContext.ARM_ENDPOINT, allowedArmEndpoints)) {
-    delete newContext.ARM_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.AAD_ENDPOINT, allowedAadEndpoints)) {
-    delete newContext.AAD_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.EMULATOR_ENDPOINT, allowedEmulatorEndpoints)) {
-    delete newContext.EMULATOR_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.GRAPH_ENDPOINT, allowedGraphEndpoints)) {
-    delete newContext.GRAPH_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.ARCADIA_ENDPOINT, allowedArcadiaEndpoints)) {
-    delete newContext.ARCADIA_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.BACKEND_ENDPOINT, allowedBackendEndpoints)) {
-    delete newContext.BACKEND_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.MONGO_BACKEND_ENDPOINT, allowedMongoBackendEndpoints)) {
-    delete newContext.MONGO_BACKEND_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.JUNO_ENDPOINT, allowedJunoOrigins)) {
-    delete newContext.JUNO_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.hostedExplorerURL, allowedHostedExplorerEndpoints)) {
-    delete newContext.hostedExplorerURL;
-  }
-
-  if (!validateEndpoint(newContext.msalRedirectURI, allowedMsalRedirectEndpoints)) {
-    delete newContext.msalRedirectURI;
-  }
-
  Object.assign(configContext, newContext);
 }

@@ -150,8 +102,18 @@ export async function initializeConfiguration(): Promise<ConfigContext> {
    });
    if (response.status === 200) {
      try {
-        const { ...externalConfig } = await response.json();
-        updateConfigContext(externalConfig);
+        const { allowedParentFrameOrigins, allowedJunoOrigins, ...externalConfig } = await response.json();
+        Object.assign(configContext, externalConfig);
+        if (allowedParentFrameOrigins && allowedParentFrameOrigins.length > 0) {
+          updateConfigContext({
+            allowedParentFrameOrigins: [...configContext.allowedParentFrameOrigins, ...allowedParentFrameOrigins],
+          });
+        }
+        if (allowedJunoOrigins && allowedJunoOrigins.length > 0) {
+          updateConfigContext({
+            allowedJunoOrigins: [...configContext.allowedJunoOrigins, ...allowedJunoOrigins],
+          });
+        }
      } catch (error) {
        console.error("Unable to parse json in config file");
        console.error(error);
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -7,11 +7,6 @@ export interface DatabaseAccount {
  type: string;
  kind: string;
  properties: DatabaseAccountExtendedProperties;
-  systemData?: DatabaseAccountSystemData;
-}
-
-export interface DatabaseAccountSystemData {
-  createdAt: string;
 }

 export interface DatabaseAccountExtendedProperties {
@@ -33,8 +28,6 @@ export interface DatabaseAccountExtendedProperties {
  privateEndpointConnections?: unknown[];
  capacity?: { totalThroughputLimit: number };
  locations?: DatabaseAccountResponseLocation[];
-  postgresqlEndpoint?: string;
-  publicNetworkAccess?: string;
 }

 export interface DatabaseAccountResponseLocation {
@@ -440,55 +433,26 @@ export interface NotebookWorkspaceConnectionInfo {

 export interface ContainerInfo {
  durationLeftInMinutes: number;
-  phoenixServerInfo: NotebookWorkspaceConnectionInfo;
+  notebookServerInfo: NotebookWorkspaceConnectionInfo;
  status: ContainerStatusType;
 }

 export interface IProvisionData {
  cosmosEndpoint: string;
-  poolId: string;
 }

 export interface IContainerData {
  forwardingId: string;
 }

-export interface IDbAccountAllow {
-  status: number;
-  message?: string;
-  type?: string;
-}
-
 export interface IResponse<T> {
  status: number;
  data: T;
 }

-export interface IPhoenixError {
-  message: string;
-  type: string;
-}
-
-export interface IMaxAllocationTimeExceeded extends IPhoenixError {
-  earliestAllocationTimestamp: string;
-  maxAllocationTimePerDayPerUserInMinutes: string;
-}
-
-export interface IMaxDbAccountsPerUserExceeded extends IPhoenixError {
-  maxSimultaneousConnectionsPerUser: string;
-}
-
-export interface IMaxUsersPerDbAccountExceeded extends IPhoenixError {
-  maxSimultaneousUsersPerDbAccount: string;
-}
-
 export interface IPhoenixConnectionInfoResult {
-  readonly phoenixServiceInfo?: IPhoenixServiceInfo;
-}
-
-export interface IPhoenixServiceInfo {
-  readonly authToken?: string;
-  readonly phoenixServiceUrl?: string;
+  readonly notebookAuthToken?: string;
+  readonly notebookServerUrl?: string;
  readonly forwardingId?: string;
 }

@@ -567,25 +531,3 @@ export interface ContainerConnectionInfo {
  status: ConnectionStatusType;
  //need to add ram and rom info
 }
-
-export interface PostgresFirewallRule {
-  id: string;
-  name: string;
-  type: string;
-  properties: {
-    startIpAddress: string;
-    endIpAddress: string;
-  };
-}
-
-export enum PhoenixErrorType {
-  MaxAllocationTimeExceeded = "MaxAllocationTimeExceeded",
-  MaxDbAccountsPerUserExceeded = "MaxDbAccountsPerUserExceeded",
-  MaxUsersPerDbAccountExceeded = "MaxUsersPerDbAccountExceeded",
-  AllocationValidationResult = "AllocationValidationResult",
-  RegionNotServicable = "RegionNotServicable",
-  SubscriptionNotAllowed = "SubscriptionNotAllowed",
-  UnknownError = "UnknownError",
-  PhoenixFlightFallback = "PhoenixFlightFallback",
-  UserMissingPermissionsError = "UserMissingPermissionsError",
-}
--- a/src/Contracts/ExplorerContracts.ts
+++ b/src/Contracts/ExplorerContracts.ts
@@ -34,10 +34,6 @@ export enum MessageTypes {
  CreateSparkPool,
  RefreshDatabaseAccount,
  CloseTab,
-  OpenQuickstartBlade,
-  OpenPostgreSQLPasswordReset,
-  OpenPostgresNetworkingBlade,
-  OpenCosmosDBNetworkingBlade,
 }

 export { Versions, ActionContracts, Diagnostics };
--- a/src/Contracts/ViewModels.ts
+++ b/src/Contracts/ViewModels.ts
@@ -86,7 +86,6 @@ export interface Database extends TreeNode {
  offer: ko.Observable<DataModels.Offer>;
  isDatabaseExpanded: ko.Observable<boolean>;
  isDatabaseShared: ko.Computed<boolean>;
-  isSampleDB?: boolean;

  selectedSubnodeKind: ko.Observable<CollectionTabKind>;

@@ -107,13 +106,12 @@ export interface CollectionBase extends TreeNode {
  self: string;
  rawDataModel: DataModels.Collection;
  partitionKey: DataModels.PartitionKey;
-  partitionKeyProperties: string[];
-  partitionKeyPropertyHeaders: string[];
+  partitionKeyProperty: string;
+  partitionKeyPropertyHeader: string;
  id: ko.Observable<string>;
  selectedSubnodeKind: ko.Observable<CollectionTabKind>;
  children: ko.ObservableArray<TreeNode>;
  isCollectionExpanded: ko.Observable<boolean>;
-  isSampleCollection?: boolean;

  onDocumentDBDocumentsClick(): void;
  onNewQueryClick(source: any, event?: MouseEvent, queryText?: string): void;
@@ -186,6 +184,7 @@ export interface Collection extends CollectionBase {
  onDrop(source: Collection, event: { originalEvent: DragEvent }): void;
  uploadFiles(fileList: FileList): Promise<{ data: UploadDetailsRecord[] }>;

+  getLabel(): string;
  getPendingThroughputSplitNotification(): Promise<DataModels.Notification>;
 }

@@ -371,7 +370,6 @@ export enum TerminalKind {
  Default = 0,
  Mongo = 1,
  Cassandra = 2,
-  Postgres = 3,
 }

 export interface DataExplorerInputsFrame {
@@ -395,11 +393,6 @@ export interface DataExplorerInputsFrame {
  sharedThroughputDefault?: number;
  dataExplorerVersion?: string;
  defaultCollectionThroughput?: CollectionCreationDefaults;
-  isPostgresAccount?: boolean;
-  isReplica?: boolean;
-  clientIpAddress?: string;
-  // TODO: Update this param in the OSS extension to remove isFreeTier, isMarlinServerGroup, and make nodes a flat array instead of an nested array
-  connectionStringParams?: any;
  flights?: readonly string[];
  features?: {
    [key: string]: string;
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -39,12 +39,12 @@ export const createDatabaseContextMenu = (container: Explorer, databaseId: strin
  const items: TreeNodeMenuItem[] = [
    {
      iconSrc: AddCollectionIcon,
-      onClick: () => container.onNewCollectionClicked({ databaseId }),
+      onClick: () => container.onNewCollectionClicked(databaseId),
      label: `New ${getCollectionName()}`,
    },
  ];

-  if (userContext.apiType !== "Tables" || userContext.features.enableSDKoperations) {
+  if (userContext.apiType !== "Tables") {
    items.push({
      iconSrc: DeleteDatabaseIcon,
      onClick: () =>
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
@@ -2,7 +2,6 @@
 * Wrapper around Notebook server terminal
 */

-import { useTerminal } from "hooks/useTerminal";
 import postRobot from "post-robot";
 import * as React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
@@ -41,7 +40,6 @@ export class NotebookTerminalComponent extends React.Component<NotebookTerminalC

  handleFrameLoad(event: React.SyntheticEvent<HTMLIFrameElement, Event>): void {
    this.terminalWindow = (event.target as HTMLIFrameElement).contentWindow;
-    useTerminal.getState().setTerminal(this.terminalWindow);
    this.sendPropsToTerminalFrame();
  }

@@ -76,8 +74,6 @@ export class NotebookTerminalComponent extends React.Component<NotebookTerminalC
        this.props.databaseAccount?.properties.mongoEndpoint || this.props.databaseAccount?.properties.documentEndpoint;
    } else if (StringUtils.endsWith(notebookServerEndpoint, "cassandra")) {
      terminalEndpoint = this.props.databaseAccount?.properties.cassandraEndpoint;
-    } else if (StringUtils.endsWith(notebookServerEndpoint, "postgresql")) {
-      return this.props.databaseAccount?.properties.postgresqlEndpoint;
    }

    if (terminalEndpoint) {
--- a/src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.tsx
+++ b/src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.tsx
@@ -21,7 +21,6 @@ import {
  Text,
 } from "@fluentui/react";
 import * as React from "react";
-import { userContext } from "UserContext";
 import { HttpStatusCodes } from "../../../Common/Constants";
 import { handleError } from "../../../Common/ErrorHandlingUtils";
 import { IGalleryItem, IJunoResponse, IPublicGalleryData, JunoClient } from "../../../Juno/JunoClient";
@@ -149,23 +148,18 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
  public render(): JSX.Element {
    this.traceViewGallery();

-    const tabs: GalleryTabInfo[] = [];
-    if (userContext.features.publicGallery) {
-      tabs.push(
-        this.createPublicGalleryTab(
-          GalleryTab.PublicGallery,
-          this.state.publicNotebooks,
-          this.state.isCodeOfConductAccepted
-        )
-      );
-    }
-    tabs.push(this.createSamplesTab(GalleryTab.OfficialSamples, this.state.sampleNotebooks));
+    const tabs: GalleryTabInfo[] = [
+      this.createPublicGalleryTab(
+        GalleryTab.PublicGallery,
+        this.state.publicNotebooks,
+        this.state.isCodeOfConductAccepted
+      ),
+      this.createSamplesTab(GalleryTab.OfficialSamples, this.state.sampleNotebooks),
+    ];

    if (this.props.container) {
      tabs.push(this.createFavoritesTab(GalleryTab.Favorites, this.state.favoriteNotebooks));
-      if (userContext.features.publicGallery) {
-        tabs.push(this.createPublishedNotebooksTab(GalleryTab.Published, this.state.publishedNotebooks));
-      }
+      tabs.push(this.createPublishedNotebooksTab(GalleryTab.Published, this.state.publishedNotebooks));
    }

    const pivotProps: IPivotProps = {
--- a/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.tsx
+++ b/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.tsx
@@ -1,5 +1,5 @@
-import { HoverCard, HoverCardType, Icon, Label, Link, Stack } from "@fluentui/react";
 import * as React from "react";
+import { Icon, Label, Stack, HoverCard, HoverCardType, Link } from "@fluentui/react";
 import { CodeOfConductEndpoints } from "../../../../Common/Constants";
 import "./InfoComponent.less";

@@ -41,7 +41,7 @@ export class InfoComponent extends React.Component<InfoComponentProps> {
  public render(): JSX.Element {
    return (
      <HoverCard plainCardProps={{ onRenderPlainCard: this.onHover }} instantOpenOnClick type={HoverCardType.plain}>
-        <div className="infoPanelMain" tabIndex={0}>
+        <div className="infoPanelMain">
          <Icon className="infoIconMain" iconName="Help" styles={{ root: { verticalAlign: "middle" } }} />
          <Label className="infoLabelMain">Help</Label>
        </div>
--- a/src/Explorer/Controls/NotebookGallery/InfoComponent/snapshots/InfoComponent.test.tsx.snap
+++ b/src/Explorer/Controls/NotebookGallery/InfoComponent/snapshots/InfoComponent.test.tsx.snap
@@ -12,7 +12,6 @@ exports[`InfoComponent renders 1`] = `
 >
  <div
    className="infoPanelMain"
-    tabIndex={0}
  >
    <Icon
      className="infoIconMain"
--- a/src/Explorer/Controls/NotebookGallery/snapshots/GalleryViewerComponent.test.tsx.snap
+++ b/src/Explorer/Controls/NotebookGallery/snapshots/GalleryViewerComponent.test.tsx.snap
@@ -8,6 +8,95 @@ exports[`GalleryViewerComponent renders 1`] = `
    onLinkClick={[Function]}
    selectedKey="OfficialSamples"
  >
+    <PivotItem
+      headerText="Public gallery"
+      itemKey="PublicGallery"
+      key="PublicGallery"
+      style={
+        Object {
+          "marginTop": 20,
+        }
+      }
+    >
+      <div
+        className="publicGalleryTabContainer"
+      >
+        <Stack
+          tokens={
+            Object {
+              "childrenGap": 10,
+            }
+          }
+        >
+          <Stack
+            horizontal={true}
+            tokens={
+              Object {
+                "childrenGap": 20,
+                "padding": 10,
+              }
+            }
+            wrap={true}
+          >
+            <StackItem
+              grow={true}
+            >
+              <StyledSearchBox
+                onChange={[Function]}
+                placeholder="Search"
+              />
+            </StackItem>
+            <StackItem>
+              <StyledLabelBase>
+                Sort by
+              </StyledLabelBase>
+            </StackItem>
+            <StackItem
+              styles={
+                Object {
+                  "root": Object {
+                    "minWidth": 200,
+                  },
+                }
+              }
+            >
+              <Dropdown
+                onChange={[Function]}
+                options={
+                  Array [
+                    Object {
+                      "key": 0,
+                      "text": "Most viewed",
+                    },
+                    Object {
+                      "key": 1,
+                      "text": "Most downloaded",
+                    },
+                    Object {
+                      "key": 3,
+                      "text": "Most recent",
+                    },
+                    Object {
+                      "key": 2,
+                      "text": "Most favorited",
+                    },
+                  ]
+                }
+                selectedKey={0}
+              />
+            </StackItem>
+            <StackItem>
+              <InfoComponent />
+            </StackItem>
+          </Stack>
+          <StackItem>
+            <StyledSpinnerBase
+              size={3}
+            />
+          </StackItem>
+        </Stack>
+      </div>
+    </PivotItem>
    <PivotItem
      headerText="Official samples"
      itemKey="OfficialSamples"
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -149,7 +149,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      this.offer = this.database?.offer();
    }

-    const initialState: SettingsComponentState = {
+    this.state = {
      throughput: undefined,
      throughputBaseline: undefined,
      autoPilotThroughput: undefined,
@@ -199,12 +199,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      selectedTab: SettingsV2TabTypes.ScaleTab,
    };

-    this.state = {
-      ...initialState,
-      ...this.getBaselineValues(),
-      ...this.getAutoscaleBaselineValues(),
-    };
-
    this.saveSettingsButton = {
      isEnabled: this.isSaveSettingsButtonEnabled,
      isVisible: () => {
@@ -231,6 +225,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      this.loadMongoIndexes();
    }

+    this.setAutoPilotStates();
    this.setBaseline();
    if (this.props.settingsTab.isActive()) {
      useCommandBar.getState().setContextButtons(this.getTabsButtons());
@@ -291,24 +286,17 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    );
  };

-  private getAutoscaleBaselineValues = (): Partial<SettingsComponentState> => {
+  private setAutoPilotStates = (): void => {
    const autoscaleMaxThroughput = this.offer?.autoscaleMaxThroughput;

    if (autoscaleMaxThroughput && AutoPilotUtils.isValidAutoPilotThroughput(autoscaleMaxThroughput)) {
-      return {
+      this.setState({
        isAutoPilotSelected: true,
        wasAutopilotOriginallySet: true,
        autoPilotThroughput: autoscaleMaxThroughput,
        autoPilotThroughputBaseline: autoscaleMaxThroughput,
-      };
+      });
    }
-
-    return {
-      isAutoPilotSelected: false,
-      wasAutopilotOriginallySet: false,
-      autoPilotThroughput: undefined,
-      autoPilotThroughputBaseline: undefined,
-    };
  };

  public hasProvisioningTypeChanged = (): boolean =>
@@ -573,25 +561,21 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
  };

  public setBaseline = (): void => {
-    const baselineValues = this.getBaselineValues();
-    const autoscaleBaselineValues = this.getAutoscaleBaselineValues();
-    this.setState({ ...baselineValues, ...autoscaleBaselineValues } as SettingsComponentState);
-  };
-
-  private getBaselineValues = (): Partial<SettingsComponentState> => {
    const offerThroughput = this.offer?.manualThroughput;

    if (!this.isCollectionSettingsTab) {
-      return {
+      this.setState({
        throughput: offerThroughput,
        throughputBaseline: offerThroughput,
-      };
+      });
+
+      return;
    }

    const defaultTtl = this.collection.defaultTtl();

-    let timeToLive: TtlType;
-    let timeToLiveSeconds: number;
+    let timeToLive: TtlType = this.state.timeToLive;
+    let timeToLiveSeconds = this.state.timeToLiveSeconds;
    switch (defaultTtl) {
      case undefined:
      case 0:
@@ -636,7 +620,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      (this.collection.geospatialConfig && this.collection.geospatialConfig()?.type) || GeospatialConfigType.Geometry;
    const geoSpatialConfigType = GeospatialConfigType[geospatialConfigTypeString as keyof typeof GeospatialConfigType];

-    return {
+    this.setState({
      throughput: offerThroughput,
      throughputBaseline: offerThroughput,
      changeFeedPolicy: changeFeedPolicy,
@@ -659,7 +643,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      conflictResolutionPolicyProcedureBaseline: conflictResolutionPolicyProcedure,
      geospatialConfigType: geoSpatialConfigType,
      geospatialConfigTypeBaseline: geoSpatialConfigType,
-    };
+    });
  };

  private getTabsButtons = (): CommandButtonComponentProps[] => {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
@@ -65,8 +65,8 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
  constructor(props: SubSettingsComponentProps) {
    super(props);
    this.geospatialVisible = userContext.apiType === "SQL";
+    this.partitionKeyValue = "/" + this.props.collection.partitionKeyProperty;
    this.partitionKeyName = userContext.apiType === "Mongo" ? "Shard key" : "Partition key";
-    this.partitionKeyValue = this.getPartitionKeyValue();
  }

  componentDidMount(): void {
@@ -291,14 +291,6 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
    );
  };

-  private getPartitionKeyValue = (): string => {
-    if (userContext.apiType === "Mongo") {
-      return this.props.collection.partitionKeyProperties?.[0] || "";
-    }
-
-    return (this.props.collection.partitionKeyProperties || []).map((property) => "/" + property).join(", ");
-  };
-
  private getPartitionKeyComponent = (): JSX.Element => (
    <Stack {...titleAndInputStackProps}>
      {this.getPartitionKeyVisible() && (
@@ -310,9 +302,7 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
        />
      )}

-      {userContext.apiType === "SQL" && this.isLargePartitionKeyEnabled() && (
-        <Text>Large {this.partitionKeyName.toLowerCase()} has been enabled</Text>
-      )}
+      {this.isLargePartitionKeyEnabled() && <Text>Large {this.partitionKeyName.toLowerCase()} has been enabled</Text>}
    </Stack>
  );

@@ -320,8 +310,7 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
    if (
      userContext.apiType === "Cassandra" ||
      userContext.apiType === "Tables" ||
-      !this.props.collection.partitionKeyProperties ||
-      this.props.collection.partitionKeyProperties.length === 0 ||
+      !this.props.collection.partitionKeyProperty ||
      (userContext.apiType === "Mongo" && this.props.collection.partitionKey.systemKey)
    ) {
      return false;
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -19,7 +19,7 @@ import { Action, ActionModifiers } from "../../../../../Shared/Telemetry/Telemet
 import * as TelemetryProcessor from "../../../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../../../UserContext";
 import * as AutoPilotUtils from "../../../../../Utils/AutoPilotUtils";
-import { autoPilotThroughput1K } from "../../../../../Utils/AutoPilotUtils";
+import { minAutoPilotThroughput } from "../../../../../Utils/AutoPilotUtils";
 import { calculateEstimateNumber, usageInGB } from "../../../../../Utils/PricingUtils";
 import { Int32 } from "../../../../Panes/Tables/Validators/EntityPropertyValidationCommon";
 import {
@@ -82,6 +82,7 @@ interface ThroughputInputAutoPilotV3State {
  spendAckChecked: boolean;
  exceedFreeTierThroughput: boolean;
 }
+
 export class ThroughputInputAutoPilotV3Component extends React.Component<
  ThroughputInputAutoPilotV3Props,
  ThroughputInputAutoPilotV3State
@@ -539,7 +540,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
        step={AutoPilotUtils.autoPilotIncrementStep}
        value={this.overrideWithProvisionedThroughputSettings() ? "" : this.props.maxAutoPilotThroughput?.toString()}
        onChange={this.onAutoPilotThroughputChange}
-        min={autoPilotThroughput1K}
+        min={minAutoPilotThroughput}
        errorMessage={this.props.throughputError}
      />
      {!this.overrideWithProvisionedThroughputSettings() && this.getAutoPilotUsageCost()}
@@ -623,10 +624,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
    return (
      <>
        {warningMessage && (
-          <MessageBar
-            messageBarIconProps={{ iconName: "WarningSolid", className: "messageBarWarningIcon" }}
-            role="alert"
-          >
+          <MessageBar messageBarIconProps={{ iconName: "WarningSolid", className: "messageBarWarningIcon" }}>
            {warningMessage}
          </MessageBar>
        )}
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/snapshots/ThroughputInputAutoPilotV3Component.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/snapshots/ThroughputInputAutoPilotV3Component.test.tsx.snap
@@ -15,7 +15,6 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
        "iconName": "WarningSolid",
      }
    }
-    role="alert"
  >
    <Text
      styles={
@@ -146,7 +145,7 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
    id="autopilotInput"
    key="auto pilot throughput input"
    label="Max RU/s"
-    min={1000}
+    min={4000}
    onChange={[Function]}
    required={true}
    step={1000}
--- a/src/Explorer/Controls/Settings/TestUtils.tsx
+++ b/src/Explorer/Controls/Settings/TestUtils.tsx
@@ -39,7 +39,7 @@ export const collection = ({
    kind: "hash",
    version: 2,
  },
-  partitionKeyProperties: ["partitionKey"],
+  partitionKeyProperty: "partitionKey",
  readSettings: () => {
    return;
  },
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -35,7 +35,6 @@ exports[`SettingsComponent renders 1`] = `
                "onRefreshDatabasesKeyPress": [Function],
                "onRefreshResourcesClick": [Function],
                "phoenixClient": PhoenixClient {
-                  "armResourceId": undefined,
                  "retryOptions": Object {
                    "maxTimeout": 5000,
                    "minTimeout": 5000,
@@ -65,9 +64,7 @@ exports[`SettingsComponent renders 1`] = `
                "paths": Array [],
                "version": 2,
              },
-              "partitionKeyProperties": Array [
-                "partitionKey",
-              ],
+              "partitionKeyProperty": "partitionKey",
              "readSettings": [Function],
              "uniqueKeyPolicy": Object {},
              "usageSizeInKB": [Function],
@@ -112,7 +109,6 @@ exports[`SettingsComponent renders 1`] = `
                "onRefreshDatabasesKeyPress": [Function],
                "onRefreshResourcesClick": [Function],
                "phoenixClient": PhoenixClient {
-                  "armResourceId": undefined,
                  "retryOptions": Object {
                    "maxTimeout": 5000,
                    "minTimeout": 5000,
@@ -142,9 +138,7 @@ exports[`SettingsComponent renders 1`] = `
                "paths": Array [],
                "version": 2,
              },
-              "partitionKeyProperties": Array [
-                "partitionKey",
-              ],
+              "partitionKeyProperty": "partitionKey",
              "readSettings": [Function],
              "uniqueKeyPolicy": Object {},
              "usageSizeInKB": [Function],
--- a/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
+++ b/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
@@ -181,7 +181,7 @@ export class SmartUiComponent extends React.Component<SmartUiComponentProps, Sma
    const descriptionElement = (
      <Stack>
        {labelElement}
-        <Text id={`${dataFieldName}-text-display`} aria-labelledby={labelId} style={{ whiteSpace: "pre-line" }}>
+        <Text id={`${dataFieldName}-text-display`} aria-labelledby={labelId}>
          {this.props.getTranslation(description.textTKey)}{" "}
          {description.link && (
            <Link target="_blank" href={description.link.href}>
--- a/src/Explorer/Controls/SmartUi/snapshots/SmartUiComponent.test.tsx.snap
+++ b/src/Explorer/Controls/SmartUi/snapshots/SmartUiComponent.test.tsx.snap
@@ -27,11 +27,6 @@ exports[`SmartUiComponent disable all inputs 1`] = `
            <Text
              aria-labelledby="description-label"
              id="description-text-display"
-              style={
-                Object {
-                  "whiteSpace": "pre-line",
-                }
-              }
            >
              this is an example description text.
               
@@ -346,11 +341,6 @@ exports[`SmartUiComponent should render and honor input's hidden, disabled state
            <Text
              aria-labelledby="description-label"
              id="description-text-display"
-              style={
-                Object {
-                  "whiteSpace": "pre-line",
-                }
-              }
            >
              this is an example description text.
               
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx
@@ -5,7 +5,6 @@ const props = {
  isDatabase: false,
  showFreeTierExceedThroughputTooltip: true,
  isSharded: true,
-  isFreeTier: false,
  setThroughputValue: () => jest.fn(),
  setIsAutoscale: () => jest.fn(),
  setIsThroughputCapExceeded: () => jest.fn(),
@@ -23,12 +22,12 @@ describe("ThroughputInput Pane", () => {
  });

  it("should switch mode properly", () => {
-    wrapper.find('[aria-label="Manual database throughput"]').simulate("change");
+    wrapper.find('[aria-label="Manual mode"]').simulate("change");
    expect(wrapper.find('[aria-label="Throughput header"]').at(0).text()).toBe(
      "Container throughput (400 - unlimited RU/s)"
    );

-    wrapper.find('[aria-label="Autoscale database throughput"]').simulate("change");
+    wrapper.find('[aria-label="Autoscale mode"]').simulate("change");
    expect(wrapper.find('[aria-label="Throughput header"]').at(0).text()).toBe("Container throughput (autoscale)");
  });
 });
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -14,9 +14,7 @@ import "./ThroughputInput.less";
 export interface ThroughputInputProps {
  isDatabase: boolean;
  isSharded: boolean;
-  isFreeTier: boolean;
  showFreeTierExceedThroughputTooltip: boolean;
-  isQuickstart?: boolean;
  setThroughputValue: (throughput: number) => void;
  setIsAutoscale: (isAutoscale: boolean) => void;
  setIsThroughputCapExceeded: (isThroughputCapExceeded: boolean) => void;
@@ -25,19 +23,15 @@ export interface ThroughputInputProps {

 export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  isDatabase,
-  isSharded,
-  isFreeTier,
  showFreeTierExceedThroughputTooltip,
-  isQuickstart,
  setThroughputValue,
  setIsAutoscale,
  setIsThroughputCapExceeded,
+  isSharded,
  onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
  const [isAutoscaleSelected, setIsAutoScaleSelected] = useState<boolean>(true);
-  const [throughput, setThroughput] = useState<number>(
-    isFreeTier || isQuickstart ? AutoPilotUtils.autoPilotThroughput1K : AutoPilotUtils.autoPilotThroughput4K
-  );
+  const [throughput, setThroughput] = useState<number>(AutoPilotUtils.minAutoPilotThroughput);
  const [isCostAcknowledged, setIsCostAcknowledged] = useState<boolean>(false);
  const [throughputError, setThroughputError] = useState<string>("");
  const [totalThroughputUsed, setTotalThroughputUsed] = useState<number>(0);
@@ -157,14 +151,11 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({

  const handleOnChangeMode = (event: React.ChangeEvent<HTMLInputElement>, mode: string): void => {
    if (mode === "Autoscale") {
-      const defaultThroughput = isFreeTier
-        ? AutoPilotUtils.autoPilotThroughput1K
-        : AutoPilotUtils.autoPilotThroughput4K;
-      setThroughput(defaultThroughput);
+      setThroughput(AutoPilotUtils.minAutoPilotThroughput);
      setIsAutoScaleSelected(true);
-      setThroughputValue(defaultThroughput);
+      setThroughputValue(AutoPilotUtils.minAutoPilotThroughput);
      setIsAutoscale(true);
-      checkThroughputCap(defaultThroughput);
+      checkThroughputCap(AutoPilotUtils.minAutoPilotThroughput);
    } else {
      setThroughput(SharedConstants.CollectionCreation.DefaultCollectionRUs400);
      setIsAutoScaleSelected(false);
@@ -186,9 +177,8 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({

      <Stack horizontal verticalAlign="center">
        <input
-          id="Autoscale-input"
          className="throughputInputRadioBtn"
-          aria-label="Autoscale database throughput"
+          aria-label="Autoscale mode"
          aria-required={true}
          checked={isAutoscaleSelected}
          type="radio"
@@ -196,14 +186,11 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
          tabIndex={0}
          onChange={(e) => handleOnChangeMode(e, "Autoscale")}
        />
-        <label htmlFor="Autoscale-input" className="throughputInputRadioBtnLabel">
-          Autoscale
-        </label>
+        <span className="throughputInputRadioBtnLabel">Autoscale</span>

        <input
-          id="Manual-input"
          className="throughputInputRadioBtn"
-          aria-label="Manual database throughput"
+          aria-label="Manual mode"
          checked={!isAutoscaleSelected}
          type="radio"
          aria-required={true}
@@ -211,20 +198,14 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
          tabIndex={0}
          onChange={(e) => handleOnChangeMode(e, "Manual")}
        />
-        <label className="throughputInputRadioBtnLabel" htmlFor="Manual-input">
-          Manual
-        </label>
+        <span className="throughputInputRadioBtnLabel">Manual</span>
      </Stack>

      {isAutoscaleSelected && (
        <Stack className="throughputInputSpacing">
-          <Text variant="small" aria-label="capacity calculator of azure cosmos db">
+          <Text variant="small" aria-label="ruDescription">
            Estimate your required RU/s with{" "}
-            <Link
-              target="_blank"
-              href="https://cosmos.azure.com/capacitycalculator/"
-              aria-label="capacity calculator of azure cosmos db"
-            >
+            <Link target="_blank" href="https://cosmos.azure.com/capacitycalculator/" aria-label="ruDescription">
              capacity calculator
            </Link>
            .
@@ -238,7 +219,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
          </Stack>

          <TextField
-            id="autoscaleRUValueField"
            type="number"
            styles={{
              fieldGroup: { width: 300, height: 27 },
@@ -246,7 +226,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
            }}
            onChange={(event, newInput?: string) => onThroughputValueChange(newInput)}
            step={AutoPilotUtils.autoPilotIncrementStep}
-            min={AutoPilotUtils.autoPilotThroughput1K}
+            min={AutoPilotUtils.minAutoPilotThroughput}
            value={throughput.toString()}
            aria-label="Max request units per second"
            required={true}
--- a/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
+++ b/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`ThroughputInput Pane should render Default properly 1`] = `
 <ThroughputInput
  isDatabase={false}
-  isFreeTier={false}
  isSharded={true}
  onCostAcknowledgeChange={[Function]}
  setIsAutoscale={[Function]}
@@ -344,13 +343,13 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                  onMouseLeave={[Function]}
                >
                  <StyledIconBase
-                    ariaLabel="Set the throughput — Request Units per second (RU/s) — required for the workload. A read of a 1 KB document uses 1 RU. Select manual if you plan to scale RU/s yourself. Select autoscale to allow the system to scale RU/s based on usage."
+                    ariaLabel="Info"
                    className="panelInfoIcon"
                    iconName="Info"
                    tabIndex={0}
                  >
                    <IconBase
-                      ariaLabel="Set the throughput — Request Units per second (RU/s) — required for the workload. A read of a 1 KB document uses 1 RU. Select manual if you plan to scale RU/s yourself. Select autoscale to allow the system to scale RU/s based on usage."
+                      ariaLabel="Info"
                      className="panelInfoIcon"
                      iconName="Info"
                      styles={[Function]}
@@ -630,7 +629,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                      }
                    >
                      <i
-                        aria-label="Set the throughput — Request Units per second (RU/s) — required for the workload. A read of a 1 KB document uses 1 RU. Select manual if you plan to scale RU/s yourself. Select autoscale to allow the system to scale RU/s based on usage."
+                        aria-label="Info"
                        className="panelInfoIcon root-57"
                        data-icon-name="Info"
                        role="img"
@@ -655,43 +654,39 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
        className="ms-Stack css-58"
      >
        <input
-          aria-label="Autoscale database throughput"
+          aria-label="Autoscale mode"
          aria-required={true}
          checked={true}
          className="throughputInputRadioBtn"
-          id="Autoscale-input"
          key=".0:$.0"
          onChange={[Function]}
          role="radio"
          tabIndex={0}
          type="radio"
        />
-        <label
+        <span
          className="throughputInputRadioBtnLabel"
-          htmlFor="Autoscale-input"
          key=".0:$.1"
        >
          Autoscale
-        </label>
+        </span>
        <input
-          aria-label="Manual database throughput"
+          aria-label="Manual mode"
          aria-required={true}
          checked={false}
          className="throughputInputRadioBtn"
-          id="Manual-input"
          key=".0:$.2"
          onChange={[Function]}
          role="radio"
          tabIndex={0}
          type="radio"
        />
-        <label
+        <span
          className="throughputInputRadioBtnLabel"
-          htmlFor="Manual-input"
          key=".0:$.3"
        >
          Manual
-        </label>
+        </span>
      </div>
    </Stack>
    <Stack
@@ -701,23 +696,23 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
        className="ms-Stack throughputInputSpacing css-59"
      >
        <Text
-          aria-label="capacity calculator of azure cosmos db"
+          aria-label="ruDescription"
          key=".0:$.0"
          variant="small"
        >
          <span
-            aria-label="capacity calculator of azure cosmos db"
+            aria-label="ruDescription"
            className="css-54"
          >
            Estimate your required RU/s with
             
            <StyledLinkBase
-              aria-label="capacity calculator of azure cosmos db"
+              aria-label="ruDescription"
              href="https://cosmos.azure.com/capacitycalculator/"
              target="_blank"
            >
              <LinkBase
-                aria-label="capacity calculator of azure cosmos db"
+                aria-label="ruDescription"
                href="https://cosmos.azure.com/capacitycalculator/"
                styles={[Function]}
                target="_blank"
@@ -996,7 +991,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                }
              >
                <a
-                  aria-label="capacity calculator of azure cosmos db"
+                  aria-label="ruDescription"
                  className="ms-Link root-60"
                  href="https://cosmos.azure.com/capacitycalculator/"
                  onClick={[Function]}
@@ -1335,13 +1330,13 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                      onMouseLeave={[Function]}
                    >
                      <StyledIconBase
-                        ariaLabel="Set the max RU/s to the highest RU/s you want your container to scale to. The container will scale between 10% of max RU/s to the max RU/s based on usage."
+                        ariaLabel="Info"
                        className="panelInfoIcon"
                        iconName="Info"
                        tabIndex={0}
                      >
                        <IconBase
-                          ariaLabel="Set the max RU/s to the highest RU/s you want your container to scale to. The container will scale between 10% of max RU/s to the max RU/s based on usage."
+                          ariaLabel="Info"
                          className="panelInfoIcon"
                          iconName="Info"
                          styles={[Function]}
@@ -1621,7 +1616,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                          }
                        >
                          <i
-                            aria-label="Set the max RU/s to the highest RU/s you want your container to scale to. The container will scale between 10% of max RU/s to the max RU/s based on usage."
+                            aria-label="Info"
                            className="panelInfoIcon root-57"
                            data-icon-name="Info"
                            role="img"
@@ -1641,9 +1636,8 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
        <StyledTextFieldBase
          aria-label="Max request units per second"
          errorMessage=""
-          id="autoscaleRUValueField"
          key=".0:$.2"
-          min={1000}
+          min={4000}
          onChange={[Function]}
          required={true}
          step={1000}
@@ -1665,8 +1659,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
            aria-label="Max request units per second"
            deferredValidationTime={200}
            errorMessage=""
-            id="autoscaleRUValueField"
-            min={1000}
+            min={4000}
            onChange={[Function]}
            required={true}
            resizable={true}
@@ -1961,8 +1954,8 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                  <input
                    aria-invalid={false}
                    className="ms-TextField-field field-64"
-                    id="autoscaleRUValueField"
-                    min={1000}
+                    id="TextField2"
+                    min={4000}
                    onBlur={[Function]}
                    onChange={[Function]}
                    onFocus={[Function]}
--- a/src/Explorer/Controls/TreeComponent/TreeComponent.tsx
+++ b/src/Explorer/Controls/TreeComponent/TreeComponent.tsx
@@ -173,7 +173,6 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
        onClick={(event: React.MouseEvent<HTMLDivElement>) => this.onNodeClick(event, node)}
        onKeyPress={(event: React.KeyboardEvent<HTMLDivElement>) => this.onNodeKeyPress(event, node)}
        role="treeitem"
-        id={node.id}
      >
        <div
          className={`treeNodeHeader ${this.state.isMenuShowing ? "showingMenu" : ""}`}
--- a/src/Explorer/Controls/TreeComponent/snapshots/TreeComponent.test.tsx.snap
+++ b/src/Explorer/Controls/TreeComponent/snapshots/TreeComponent.test.tsx.snap
@@ -137,7 +137,6 @@ exports[`TreeNodeComponent does not render children by default 1`] = `
 exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`] = `
 <div
  className="nodeClassname main12 nodeItem "
-  id="id"
  onClick={[Function]}
  onKeyPress={[Function]}
  role="treeitem"
@@ -360,7 +359,6 @@ exports[`TreeNodeComponent renders loading icon 1`] = `
 exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents separated 1`] = `
 <div
  className="nodeClassname main12 nodeItem "
-  id="id"
  onClick={[Function]}
  onKeyPress={[Function]}
  role="treeitem"
--- a/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
@@ -133,6 +133,7 @@ describe("ContainerSampleGenerator", () => {
      } as DatabaseAccount,
    });

+    // Rejects with error that contains experience
    expect(ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub)).rejects.toMatch(experience);
  });

--- a/src/Explorer/DataSamples/ContainerSampleGenerator.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.ts
@@ -1,6 +1,5 @@
 import { createCollection } from "../../Common/dataAccess/createCollection";
 import { createDocument } from "../../Common/dataAccess/createDocument";
-import { createDocument as createMongoDocument } from "../../Common/MongoProxyClient";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { userContext } from "../../UserContext";
@@ -29,7 +28,7 @@ export class ContainerSampleGenerator {
      dataFileContent = await import(
        /* webpackChunkName: "gremlinSampleJsonData" */ "../../../sampleData/gremlinSampleData.json"
      );
-    } else if (userContext.apiType === "SQL" || userContext.apiType === "Mongo") {
+    } else if (userContext.apiType === "SQL") {
      dataFileContent = await import(
        /* webpackChunkName: "sqlSampleJsonData" */ "../../../sampleData/sqlSampleData.json"
      );
@@ -69,10 +68,11 @@ export class ContainerSampleGenerator {
    return database.findCollectionWithId(this.sampleDataFile.collectionId);
  }

-  public async populateContainerAsync(collection: ViewModels.Collection, shardKey?: string): Promise<void> {
+  private async populateContainerAsync(collection: ViewModels.Collection): Promise<void> {
    if (!collection) {
      throw new Error("No container to populate");
    }
+    const promises: Q.Promise<any>[] = [];

    if (userContext.apiType === "Gremlin") {
      // For Gremlin, all queries are executed sequentially, because some queries might be dependent on other queries
@@ -100,9 +100,7 @@ export class ContainerSampleGenerator {
      await Promise.all(
        this.sampleDataFile.data.map(async (doc) => {
          try {
-            userContext.apiType === "Mongo"
-              ? await createMongoDocument(collection.databaseId, collection, shardKey, doc)
-              : await createDocument(collection, doc);
+            await createDocument(collection, doc);
          } catch (error) {
            NotificationConsoleUtils.logConsoleError(error);
          }
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -1,26 +1,30 @@
 import { Link } from "@fluentui/react/lib/Link";
 import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
-import { IGalleryItem } from "Juno/JunoClient";
 import * as ko from "knockout";
 import React from "react";
 import _ from "underscore";
-import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
 import shallow from "zustand/shallow";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import * as Constants from "../Common/Constants";
-import { Areas, ConnectionStatusType, HttpStatusCodes, Notebook, PoolIdType } from "../Common/Constants";
+import { Areas, ConnectionStatusType, HttpStatusCodes, Notebook } from "../Common/Constants";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
 import { QueriesClient } from "../Common/QueriesClient";
 import * as DataModels from "../Contracts/DataModels";
-import { ContainerConnectionInfo, IPhoenixServiceInfo, IProvisionData, IResponse } from "../Contracts/DataModels";
+import {
+  ContainerConnectionInfo,
+  IPhoenixConnectionInfoResult,
+  IProvisionData,
+  IResponse,
+} 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 { IGalleryItem } from "../Juno/JunoClient";
 import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
@@ -42,7 +46,7 @@ import * as FileSystemUtil from "./Notebook/FileSystemUtil";
 import { SnapshotRequest } from "./Notebook/NotebookComponent/types";
 import { NotebookContentItem, NotebookContentItemType } from "./Notebook/NotebookContentItem";
 import type NotebookManager from "./Notebook/NotebookManager";
-import { NotebookPaneContent } from "./Notebook/NotebookManager";
+import type { NotebookPaneContent } from "./Notebook/NotebookManager";
 import { NotebookUtil } from "./Notebook/NotebookUtil";
 import { useNotebook } from "./Notebook/useNotebook";
 import { AddCollectionPanel } from "./Panes/AddCollectionPanel";
@@ -93,8 +97,7 @@ export default class Explorer {
      dataExplorerArea: Constants.Areas.ResourceTree,
    });
    this._isInitializingNotebooks = false;
-
-    this.phoenixClient = new PhoenixClient(userContext?.databaseAccount?.id);
+    this.phoenixClient = new PhoenixClient();
    useNotebook.subscribe(
      () => this.refreshCommandBarButtons(),
      (state) => state.isNotebooksEnabledForAccount
@@ -170,11 +173,7 @@ export default class Explorer {
    this.resourceTree = new ResourceTreeAdapter(this);

    // Override notebook server parameters from URL parameters
-    if (
-      userContext.features.notebookServerUrl &&
-      validateEndpoint(userContext.features.notebookServerUrl, allowedNotebookServerUrls) &&
-      userContext.features.notebookServerToken
-    ) {
+    if (userContext.features.notebookServerUrl && userContext.features.notebookServerToken) {
      useNotebook.getState().setNotebookServerInfo({
        notebookServerEndpoint: userContext.features.notebookServerUrl,
        authToken: userContext.features.notebookServerToken,
@@ -186,6 +185,19 @@ export default class Explorer {
      useNotebook.getState().setNotebookBasePath(userContext.features.notebookBasePath);
    }

+    if (userContext.features.livyEndpoint) {
+      useNotebook.getState().setSparkClusterConnectionInfo({
+        userName: undefined,
+        password: undefined,
+        endpoints: [
+          {
+            endpoint: userContext.features.livyEndpoint,
+            kind: DataModels.SparkClusterEndpointKind.Livy,
+          },
+        ],
+      });
+    }
+
    this.refreshExplorer();
  }

@@ -294,7 +306,7 @@ export default class Explorer {
        db1.id().localeCompare(db2.id())
      );
      useDatabases.setState({ databases: updatedDatabases });
-      await this.refreshAndExpandNewDatabases(deltaDatabases.toAdd, updatedDatabases);
+      await this.refreshAndExpandNewDatabases(deltaDatabases.toAdd, currentDatabases);
    } catch (error) {
      const errorMessage = getErrorMessage(error);
      TelemetryProcessor.traceFailure(
@@ -352,22 +364,23 @@ export default class Explorer {
        (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
    ) {
      const provisionData: IProvisionData = {
-        cosmosEndpoint: userContext?.databaseAccount?.properties?.documentEndpoint,
-        poolId: PoolIdType.DefaultPoolId,
+        cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
      };
      const connectionStatus: ContainerConnectionInfo = {
        status: ConnectionStatusType.Connecting,
      };
      useNotebook.getState().setConnectionInfo(connectionStatus);
-      let connectionInfo;
      try {
        TelemetryProcessor.traceStart(Action.PhoenixConnection, {
          dataExplorerArea: Areas.Notebook,
        });
        useNotebook.getState().setIsAllocating(true);
-        connectionInfo = await this.phoenixClient.allocateContainer(provisionData);
-        if (!connectionInfo?.data?.phoenixServiceUrl) {
-          throw new Error(`PhoenixServiceUrl is invalid!`);
+        const connectionInfo = await this.phoenixClient.allocateContainer(provisionData);
+        if (connectionInfo.status !== HttpStatusCodes.OK) {
+          throw new Error(`Received status code: ${connectionInfo?.status}`);
+        }
+        if (!connectionInfo?.data?.notebookServerUrl) {
+          throw new Error(`NotebookServerUrl is invalid!`);
        }
        await this.setNotebookInfo(connectionInfo, connectionStatus);
        TelemetryProcessor.traceSuccess(Action.PhoenixConnection, {
@@ -376,22 +389,11 @@ export default class Explorer {
      } catch (error) {
        TelemetryProcessor.traceFailure(Action.PhoenixConnection, {
          dataExplorerArea: Areas.Notebook,
-          status: error.status,
          error: getErrorMessage(error),
          errorStack: getErrorStack(error),
        });
        connectionStatus.status = ConnectionStatusType.Failed;
        useNotebook.getState().resetContainerConnection(connectionStatus);
-        if (error?.status === HttpStatusCodes.Forbidden && error.message) {
-          useDialog.getState().showOkModalDialog("Connection Failed", `${error.message}`);
-        } else {
-          useDialog
-            .getState()
-            .showOkModalDialog(
-              "Connection Failed",
-              "We are unable to connect to the temporary workspace. Please try again in a few minutes. If the error persists, file a support ticket."
-            );
-        }
        throw error;
      } finally {
        useNotebook.getState().setIsAllocating(false);
@@ -403,7 +405,7 @@ export default class Explorer {
  }

  private async setNotebookInfo(
-    connectionInfo: IResponse<IPhoenixServiceInfo>,
+    connectionInfo: IResponse<IPhoenixConnectionInfoResult>,
    connectionStatus: DataModels.ContainerConnectionInfo
  ) {
    const containerData = {
@@ -415,11 +417,8 @@ export default class Explorer {
    connectionStatus.status = ConnectionStatusType.Connected;
    useNotebook.getState().setConnectionInfo(connectionStatus);
    useNotebook.getState().setNotebookServerInfo({
-      notebookServerEndpoint:
-        (validateEndpoint(userContext.features.notebookServerUrl, allowedNotebookServerUrls) &&
-          userContext.features.notebookServerUrl) ||
-        connectionInfo.data.phoenixServiceUrl,
-      authToken: userContext.features.notebookServerToken || connectionInfo.data.authToken,
+      notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.data.notebookServerUrl,
+      authToken: userContext.features.notebookServerToken || connectionInfo.data.notebookAuthToken,
      forwardingId: connectionInfo.data.forwardingId,
    });
    this.notebookManager?.notebookClient
@@ -494,8 +493,8 @@ export default class Explorer {
      if (connectionInfo?.status !== HttpStatusCodes.OK) {
        throw new Error(`Reset Workspace: Received status code- ${connectionInfo?.status}`);
      }
-      if (!connectionInfo?.data?.phoenixServiceUrl) {
-        throw new Error(`Reset Workspace: PhoenixServiceUrl is invalid!`);
+      if (!connectionInfo?.data?.notebookServerUrl) {
+        throw new Error(`Reset Workspace: NotebookServerUrl is invalid!`);
      }
      if (useNotebook.getState().isPhoenixNotebooks) {
        await this.setNotebookInfo(connectionInfo, connectionStatus);
@@ -1057,10 +1056,6 @@ export default class Explorer {
        title = "Cassandra Shell";
        break;

-      case ViewModels.TerminalKind.Postgres:
-        title = "PSQL Shell";
-        break;
-
      default:
        throw new Error("Terminal kind: ${kind} not supported");
    }
@@ -1120,7 +1115,7 @@ export default class Explorer {
            account: userContext.databaseAccount,
            container: this,
            junoClient: this.notebookManager?.junoClient,
-            selectedTab: selectedTab || GalleryTabKind.OfficialSamples,
+            selectedTab: selectedTab || GalleryTabKind.PublicGallery,
            notebookUrl,
            galleryItem,
            isFavorite,
@@ -1130,12 +1125,7 @@ export default class Explorer {
    }
  }

-  public async onNewCollectionClicked(
-    options: {
-      databaseId?: string;
-      isQuickstart?: boolean;
-    } = {}
-  ): Promise<void> {
+  public async onNewCollectionClicked(databaseId?: string): Promise<void> {
    if (userContext.apiType === "Cassandra") {
      useSidePanel
        .getState()
@@ -1150,7 +1140,7 @@ export default class Explorer {
        : await useDatabases.getState().loadDatabaseOffers();
      useSidePanel
        .getState()
-        .openSidePanel("New " + getCollectionName(), <AddCollectionPanel explorer={this} {...options} />);
+        .openSidePanel("New " + getCollectionName(), <AddCollectionPanel explorer={this} databaseId={databaseId} />);
    }
  }

@@ -1247,18 +1237,13 @@ export default class Explorer {
  }

  public async refreshExplorer(): Promise<void> {
-    if (userContext.apiType !== "Postgres") {
-      userContext.authType === AuthType.ResourceToken
-        ? this.refreshDatabaseForResourceToken()
-        : this.refreshAllDatabases();
-    }
+    userContext.authType === AuthType.ResourceToken
+      ? this.refreshDatabaseForResourceToken()
+      : this.refreshAllDatabases();
    await useNotebook.getState().refreshNotebooksEnabledStateForAccount();

    // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled =
-      userContext.features.notebooksDownBanner ||
-      useNotebook.getState().isPhoenixNotebooks ||
-      useNotebook.getState().isPhoenixFeatures;
+    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenixNotebooks;
    useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
    useNotebook
      .getState()
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
@@ -6,9 +6,8 @@
 import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
 import * as React from "react";
-import { userContext } from "UserContext";
 import create, { UseStore } from "zustand";
-import { ConnectionStatusType, StyleConstants } from "../../../Common/Constants";
+import { StyleConstants } from "../../../Common/Constants";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
@@ -34,22 +33,6 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
  const buttons = useCommandBar((state) => state.contextButtons);
  const backgroundColor = StyleConstants.BaseLight;

-  if (userContext.apiType === "Postgres") {
-    const buttons = CommandBarComponentButtonFactory.createPostgreButtons(container);
-    return (
-      <div className="commandBarContainer">
-        <FluentCommandBar
-          ariaLabel="Use left and right arrow keys to navigate between commands"
-          items={CommandBarUtil.convertButton(buttons, backgroundColor)}
-          styles={{
-            root: { backgroundColor: backgroundColor },
-          }}
-          overflowButtonProps={{ ariaLabel: "More commands" }}
-        />
-      </div>
-    );
-  }
-
  const staticButtons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(container, selectedNodeState);
  const contextButtons = (buttons || []).concat(
    CommandBarComponentButtonFactory.createContextCommandBarButtons(container, selectedNodeState)
@@ -70,12 +53,7 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
  const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
  uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));

-  const connectionInfo = useNotebook((state) => state.connectionInfo);
-
-  if (
-    (useNotebook.getState().isPhoenixNotebooks || useNotebook.getState().isPhoenixFeatures) &&
-    connectionInfo?.status !== ConnectionStatusType.Connect
-  ) {
+  if (useNotebook.getState().isPhoenixNotebooks || useNotebook.getState().isPhoenixFeatures) {
    uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus(container, "connectionStatus"));
  }

--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -104,10 +104,6 @@ export function createStaticCommandBarButtons(
        if (!useNotebook.getState().isPhoenixFeatures) {
          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
        }
-      } else if (btn.commandButtonLabel.indexOf("Open Terminal") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
-          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
-        }
      } else if (!useNotebook.getState().isPhoenixNotebooks) {
        applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
      }
@@ -313,7 +309,6 @@ function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandB
  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
    const label = "New SQL Query";
    return {
-      id: "newQueryBtn",
      iconSrc: AddSqlQueryIcon,
      iconAlt: label,
      onCommandClick: () => {
@@ -328,7 +323,6 @@ function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandB
  } else if (userContext.apiType === "Mongo") {
    const label = "New Query";
    return {
-      id: "newQueryBtn",
      iconSrc: AddSqlQueryIcon,
      iconAlt: label,
      onCommandClick: () => {
@@ -415,7 +409,6 @@ function applyNotebooksTemporarilyDownStyle(buttonProps: CommandButtonComponentP
 function createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
  const label = "New Notebook";
  return {
-    id: "newNotebookBtn",
    iconSrc: NewNotebookIcon,
    iconAlt: label,
    onCommandClick: () => container.onNewNotebookClicked(),
@@ -523,28 +516,6 @@ function createOpenCassandraTerminalButton(container: Explorer): CommandButtonCo
  };
 }

-function createOpenPsqlTerminalButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Open PSQL Shell";
-  const disableButton =
-    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
-  return {
-    iconSrc: HostedTerminalIcon,
-    iconAlt: label,
-    onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled) {
-        container.openNotebookTerminal(ViewModels.TerminalKind.Postgres);
-      }
-    },
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: disableButton,
-    ariaLabel: label,
-    tooltipText: !disableButton
-      ? ""
-      : "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.",
-  };
-}
-
 function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
  const label = "Reset Workspace";
  return {
@@ -607,9 +578,3 @@ function createStaticCommandBarButtonsForResourceToken(

  return [newSqlQueryBtn, openQueryBtn];
 }
-
-export function createPostgreButtons(container: Explorer): CommandButtonComponentProps[] {
-  const openPostgreShellBtn = createOpenPsqlTerminalButton(container);
-
-  return [openPostgreShellBtn];
-}
--- a/src/Explorer/Notebook/NotebookContainerClient.ts
+++ b/src/Explorer/Notebook/NotebookContainerClient.ts
@@ -1,15 +1,14 @@
 /**
 * Notebook container related stuff
 */
-import { useDialog } from "Explorer/Controls/Dialog";
 import promiseRetry, { AbortError } from "p-retry";
 import { PhoenixClient } from "Phoenix/PhoenixClient";
 import * as Constants from "../../Common/Constants";
-import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook, PoolIdType } from "../../Common/Constants";
+import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "../../Common/Constants";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import * as DataModels from "../../Contracts/DataModels";
-import { IPhoenixServiceInfo, IProvisionData, IResponse } from "../../Contracts/DataModels";
+import { IPhoenixConnectionInfoResult, IProvisionData, IResponse } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
 import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
@@ -20,45 +19,44 @@ export class NotebookContainerClient {
  private isResettingWorkspace: boolean;
  private phoenixClient: PhoenixClient;
  private retryOptions: promiseRetry.Options;
-  private scheduleTimerId: NodeJS.Timeout;

  constructor(private onConnectionLost: () => void) {
-    this.phoenixClient = new PhoenixClient(userContext?.databaseAccount?.id);
+    this.phoenixClient = new PhoenixClient();
    this.retryOptions = {
      retries: Notebook.retryAttempts,
      maxTimeout: Notebook.retryAttemptDelayMs,
      minTimeout: Notebook.retryAttemptDelayMs,
    };
-
-    this.initHeartbeat(Constants.Notebook.heartbeatDelayMs);
-  }
-
-  private initHeartbeat(delayMs: number): void {
-    this.scheduleHeartbeat(delayMs);
-
-    useNotebook.subscribe(
-      () => this.scheduleHeartbeat(delayMs),
-      (state) => state.notebookServerInfo
-    );
-  }
-
-  private scheduleHeartbeat(delayMs: number) {
-    if (this.scheduleTimerId) {
-      clearInterval(this.scheduleTimerId);
-    }
-
    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
    if (notebookServerInfo?.notebookServerEndpoint) {
-      this.scheduleTimerId = setInterval(async () => {
-        const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-        if (notebookServerInfo?.notebookServerEndpoint) {
-          const memoryUsageInfo = await this.getMemoryUsage();
-          useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
-        }
-      }, delayMs);
+      this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+    } else {
+      const unsub = useNotebook.subscribe(
+        (newServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => {
+          if (newServerInfo?.notebookServerEndpoint) {
+            this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+          }
+          unsub();
+        },
+        (state) => state.notebookServerInfo
+      );
    }
  }

+  /**
+   * Heartbeat: each ping schedules another ping
+   */
+  private scheduleHeartbeat(delayMs: number): void {
+    setTimeout(async () => {
+      const memoryUsageInfo = await this.getMemoryUsage();
+      useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (notebookServerInfo?.notebookServerEndpoint) {
+        this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+      }
+    }, delayMs);
+  }
+
  public async getMemoryUsage(): Promise<DataModels.MemoryUsageInfo> {
    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
    if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
@@ -129,9 +127,9 @@ export class NotebookContainerClient {
    );
  }

-  public async resetWorkspace(): Promise<IResponse<IPhoenixServiceInfo>> {
+  public async resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
    this.isResettingWorkspace = true;
-    let response: IResponse<IPhoenixServiceInfo>;
+    let response: IResponse<IPhoenixConnectionInfoResult>;
    try {
      response = await this._resetWorkspace();
    } catch (error) {
@@ -142,7 +140,7 @@ export class NotebookContainerClient {
    return response;
  }

-  private async _resetWorkspace(): Promise<IResponse<IPhoenixServiceInfo>> {
+  private async _resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
    if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
      const error = "No server endpoint detected";
@@ -154,23 +152,12 @@ export class NotebookContainerClient {
      if (useNotebook.getState().isPhoenixNotebooks) {
        const provisionData: IProvisionData = {
          cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
-          poolId: PoolIdType.DefaultPoolId,
        };
        return await this.phoenixClient.resetContainer(provisionData);
      }
      return null;
    } catch (error) {
      Logger.logError(getErrorMessage(error), "NotebookContainerClient/resetWorkspace");
-      if (error?.status === HttpStatusCodes.Forbidden && error.message) {
-        useDialog.getState().showOkModalDialog("Connection Failed", `${error.message}`);
-      } else {
-        useDialog
-          .getState()
-          .showOkModalDialog(
-            "Connection Failed",
-            "We are unable to connect to the temporary workspace. Please try again in a few minutes. If the error persists, file a support ticket."
-          );
-      }
      throw error;
    }
  }
--- a/src/Explorer/Notebook/NotebookContentClient.ts
+++ b/src/Explorer/Notebook/NotebookContentClient.ts
@@ -303,8 +303,8 @@ export class NotebookContentClient {
  private getServerConfig(): ServerConfig {
    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
    return {
-      endpoint: notebookServerInfo?.notebookServerEndpoint,
-      token: notebookServerInfo?.authToken,
+      endpoint: notebookServerInfo.notebookServerEndpoint,
+      token: notebookServerInfo.authToken,
      crossDomain: true,
    };
  }
--- a/src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzer.tsx
+++ b/src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzer.tsx
@@ -5,7 +5,6 @@ import Immutable from "immutable";
 import * as React from "react";
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
-import * as Logger from "../../../Common/Logger";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import { traceFailure, traceStart, traceSuccess } from "../../../Shared/Telemetry/TelemetryProcessor";
 import loadTransform from "../NotebookComponent/loadTransform";
@@ -101,7 +100,6 @@ export class SchemaAnalyzer extends React.Component<SchemaAnalyzerProps, SchemaA
    // Only in cases where CosmosMongoKernel runs into an error we get a single output
    if (outputs.size === 1) {
      traceFailure(Action.SchemaAnalyzerClickAnalyze, data, this.clickAnalyzeTelemetryStartKey);
-      Logger.logError(`Failed to analyze schema: ${JSON.stringify(data)}`, "SchemaAnalyzer/traceClickAnalyzeComplete");
    } else {
      traceSuccess(Action.SchemaAnalyzerClickAnalyze, data, this.clickAnalyzeTelemetryStartKey);
    }
--- a/src/Explorer/Notebook/useNotebook.ts
+++ b/src/Explorer/Notebook/useNotebook.ts
@@ -4,12 +4,12 @@ import { PhoenixClient } from "Phoenix/PhoenixClient";
 import create, { UseStore } from "zustand";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
-import { ConnectionStatusType, HttpStatusCodes } from "../../Common/Constants";
+import { ConnectionStatusType } from "../../Common/Constants";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
-import { ContainerConnectionInfo, ContainerInfo, PhoenixErrorType } from "../../Contracts/DataModels";
+import { ContainerConnectionInfo, ContainerInfo } from "../../Contracts/DataModels";
 import { useTabs } from "../../hooks/useTabs";
 import { IPinnedRepo } from "../../Juno/JunoClient";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
@@ -96,7 +96,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  containerStatus: {
    status: undefined,
    durationLeftInMinutes: undefined,
-    phoenixServerInfo: undefined,
+    notebookServerInfo: undefined,
  },
  isPhoenixNotebooks: undefined,
  isPhoenixFeatures: undefined,
@@ -124,9 +124,8 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
    }

    const firstWriteLocation =
-      userContext.apiType === "Postgres"
-        ? databaseAccount?.location
-        : databaseAccount?.properties?.writeLocations?.[0]?.locationName.toLowerCase();
+      databaseAccount?.properties?.writeLocations &&
+      databaseAccount?.properties?.writeLocations[0]?.locationName.toLowerCase();
    const disallowedLocationsUri = `${configContext.BACKEND_ENDPOINT}/api/disallowedLocations`;
    const authorizationHeader = getAuthorizationHeader();
    try {
@@ -297,33 +296,22 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
    useNotebook.getState().setContainerStatus({
      status: undefined,
      durationLeftInMinutes: undefined,
-      phoenixServerInfo: undefined,
+      notebookServerInfo: undefined,
    });
  },
  setIsRefreshed: (isRefreshed: boolean) => set({ isRefreshed }),
  setContainerStatus: (containerStatus: ContainerInfo) => set({ containerStatus }),
  getPhoenixStatus: async () => {
    if (get().isPhoenixNotebooks === undefined || get().isPhoenixFeatures === undefined) {
-      let isPhoenixNotebooks = false;
-      let isPhoenixFeatures = false;
-
-      const isPublicInternetAllowed = isPublicInternetAccessAllowed();
-      const phoenixClient = new PhoenixClient(userContext?.databaseAccount?.id);
-      const dbAccountAllowedInfo = await phoenixClient.getDbAccountAllowedStatus();
-
-      if (dbAccountAllowedInfo.status === HttpStatusCodes.OK) {
-        if (dbAccountAllowedInfo?.type === PhoenixErrorType.PhoenixFlightFallback) {
-          isPhoenixNotebooks = isPublicInternetAllowed && userContext.features.phoenixNotebooks === true;
-          isPhoenixFeatures =
-            isPublicInternetAllowed &&
-            // phoenix needs to be enabled for Postgres accounts since the PSQL shell requires phoenix containers
-            (userContext.features.phoenixFeatures === true || userContext.apiType === "Postgres");
-        } else {
-          isPhoenixNotebooks = isPhoenixFeatures = isPublicInternetAllowed;
-        }
-      } else {
-        isPhoenixNotebooks = isPhoenixFeatures = false;
+      let isPhoenix = false;
+      if (userContext.features.phoenixNotebooks || userContext.features.phoenixFeatures) {
+        const phoenixClient = new PhoenixClient();
+        isPhoenix = isPublicInternetAccessAllowed() && (await phoenixClient.isDbAcountWhitelisted());
      }
+
+      const isPhoenixNotebooks = userContext.features.phoenixNotebooks && isPhoenix;
+      const isPhoenixFeatures = userContext.features.phoenixFeatures && isPhoenix;
+
      set({ isPhoenixNotebooks: isPhoenixNotebooks });
      set({ isPhoenixFeatures: isPhoenixFeatures });
    }
--- a/Show More
+++ b/Show More