Bump @azure/cosmos from 3.16.2 to 4.0.0

Bumps [@azure/cosmos](https://github.com/Azure/azure-sdk-for-js) from 3.16.2 to 4.0.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-js/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md)
- [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/cosmos_3.16.2...@azure/cosmos_4.0.0)

---
updated-dependencies:
- dependency-name: "@azure/cosmos"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -85,8 +85,6 @@ jobs:
           path: .cache
           key: ${{ runner.os }}-build-cache
       - run: npm run pack:prod
-        env:
-          NODE_OPTIONS: '--max-old-space-size=4096'
       - run: cp -r ./Contracts ./dist/contracts
       - run: cp -r ./configs ./dist/configs
       - uses: actions/upload-artifact@v2

.vscode/settings.json

@@ -23,6 +23,5 @@
     "source.fixAll.eslint": true,
     "source.organizeImports": true
   },
-  "typescript.preferences.importModuleSpecifier": "non-relative",
-  "editor.defaultFormatter": "esbenp.prettier-vscode"
+  "typescript.preferences.importModuleSpecifier": "non-relative"
 }

less/Common/Constants.less

@@ -10,7 +10,6 @@
 @DataExplorerFont: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
 @SemiboldFont: "Segoe UI Semibold", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
 @GrayScale: "grayscale()";
-@NoColor: "brightness(0) saturate(100%)";
 
 @xSmallFontSize: 4px;
 @smallFontSize: 8px;
@@ -148,41 +147,14 @@
 // CommandBar
 @CommandBarButtonHeight: 40px;
 
-/**********************************************************************************
-                              Portal Consts
-/**********************************************************************************/
-
-@PortalAccentMediumHigh: #0058ad;
-@PortalAccentMedium: #004e87;
-@PortalAccentLight: #eef7ff;
-@PortalAccentAccentExtra: #ddf0ff;
-
-/**********************************************************************************
-                              Fabric Consts
-/**********************************************************************************/
-
-@FabricFont: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif;
-
-@FabricBoxBorderRadius: 8px;
-@FabricBoxBorderShadow: 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.14);
-@FabricBoxMargin: 4px 3px 4px 3px;
-
-@FabricAccentMediumHigh: #0c695a;
-@FabricAccentMedium: #117865;
-@FabricAccentLight: #f5f5f5;
-@FabricAccentExtra: #ebebeb;
-
-@FabricButtonBorderRadius: 4px;
-
-
 /**********************************************************************************
                               Common Flex Property
 /**********************************************************************************/
 
 .flex-display(@display: flex) {
-  display:~"-webkit-@{display}";
-  display:~"-ms-@{display}box"; // IE10 uses -ms-flexbox
-  display:~"-ms-@{display}"; // IE11
+  display: ~"-webkit-@{display}";
+  display: ~"-ms-@{display}box"; // IE10 uses -ms-flexbox
+  display: ~"-ms-@{display}"; // IE11
   display: @display;
 }
 
@@ -196,15 +168,13 @@
                                  High contrast mode active
 **************************************************************************************/
 
-@media all and (-ms-high-contrast: none),
-(-ms-high-contrast: active) {
-
+@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
   .selectedRadio,
   .selectedRadio:hover,
   .selectedRadio:active,
   .selectedRadio.dirty,
-  .tab [type="radio"]:checked~label,
-  .tab [type="radio"]:checked~label:hover {
+  .tab [type="radio"]:checked ~ label,
+  .tab [type="radio"]:checked ~ label:hover {
     -ms-high-contrast-adjust: none;
     -webkit-text-fill-color: HighlightText;
     color: HighlightText;
@@ -213,7 +183,6 @@
   }
 
   .queryMetricsSummaryTuple {
-
     th,
     td {
       &:nth-child(2) {
@@ -333,4 +302,4 @@
   width: 0;
   height: 0;
   border-color: @InfoPointerColor transparent;
-}
+}

less/documentDB.less

@@ -2646,11 +2646,6 @@ a:link {
   width: @ActiveTabWidth;
 }
 
-.nav-tabs > li.active > .tabNavContentContainer > .tab_Content > .tabNavText {
-  font-weight: bolder;
-  border-bottom: 2px solid rgba(0,120,212,1);
-}
-
 .nav-tabs > li.active:focus > .tabNavContentContainer {
   .focus();
 }

less/documentDBFabric.less

@@ -1,211 +0,0 @@
-@import "./Common/Constants";
-
-html {
-  font-family: @FabricFont;
-}
-
-body {
-  font-family: @FabricFont;
-  background-color: #f5f5f5;
-}
-
-a {
-  color: @FabricAccentMedium;
-  text-decoration: none;
-}
-
-a:hover,
-a:focus {
-  color: @FabricAccentMediumHigh;
-  text-decoration: underline;
-}
-
-#divExplorer {
-  background-color: #f5f5f5;
-}
-
-.resourceTreeAndTabs {
-  border-radius: @FabricBoxBorderRadius;
-  box-shadow: @FabricBoxBorderShadow;
-  margin: @FabricBoxMargin;
-  margin-top: 4px;
-  background-color: #ffffff;
-}
-
-.tabsManagerContainer {
-  background-color: #fafafa
-}
-
-.nav-tabs-margin {
-  padding-top: 8px;
-  background-color: #fafafa
-}
-
-.commandBarContainer {
-  background-color: #ffffff;
-  border-bottom: none;
-  border-radius: @FabricBoxBorderRadius;
-  box-shadow: @FabricBoxBorderShadow;
-  margin: @FabricBoxMargin;
-  padding-top: 2px;
-}
-
-.dividerContainer {
-  padding: @SmallSpace 0px @SmallSpace 0px;
-  .flex-display();
-
-  span {
-    border-left: @ButtonBorderWidth solid @BaseMedium;
-    margin: 0 10px 0 10px;
-  }
-}
-
-
-.nav-tabs>li>.tabNavContentContainer>.tab_Content:hover {
-  border-bottom: 2px solid #e0e0e0;
-}
-
-.nav-tabs>li.active>.tabNavContentContainer>.tab_Content,
-.nav-tabs>li.active>.tabNavContentContainer>.tab_Content:hover {
-  border-bottom: 2px solid @FabricAccentMedium;
-}
-
-.nav-tabs>li.active>.tabNavContentContainer>.tab_Content>.tabNavText {
-  border-bottom: 0px none transparent;
-}
-
-.tabNavContentContainer {
-  padding: @SmallSpace 0px @SmallSpace 0px;
-
-  &:hover {
-    background-color: transparent;
-    border-color: transparent;
-  }
-
-  .tab_Content {
-    border-right: 0px none transparent;
-    margin: 0px @SmallSpace 0px @SmallSpace;
-    width: calc(@TabsWidth - (@SmallSpace * 2));
-    padding-bottom: @SmallSpace;
-
-    .statusIconContainer {
-      margin-left: 0px;
-    }
-
-    .tabIconSection {
-      .cancelButton {
-        padding: 0px 0px 0px @SmallSpace;
-
-        &:hover {
-          background-color: transparent;
-        }
-
-        &:focus {
-          background-color: transparent;
-        }
-
-        &:active {
-          background-color: transparent;
-        }
-      }
-    }
-  }
-}
-
-
-.resourceTree {
-  padding: 12px;
-}
-
-.accordion {
-  .accordionItemContainer {
-    .accordionItemHeader {
-      border-radius: 4px;
-    }
-  }
-}
-
-.treeComponent {
-  .nodeItem {
-    &:focus {
-      outline: 2px @FabricAccentMedium;
-    }
-
-    .treeNodeHeader {
-      padding: 5px 5px;
-      border-radius: 4px;
-
-      &:hover {
-        background-color: @FabricAccentLight;
-
-        .treeMenuEllipsis {
-          opacity: 1;
-        }
-      }
-
-      &.showingMenu {
-        background-color: #eee;
-      }
-    }
-
-    .selected {
-      &>.treeNodeHeader {
-        background-color: @FabricAccentExtra;
-      }
-    }
-  }
-}
-
-
-.dataExplorerErrorConsoleContainer {
-  border-radius: @FabricBoxBorderRadius;
-  box-shadow: @FabricBoxBorderShadow;
-  margin: @FabricBoxMargin;
-  width: auto;
-  align-self: auto;
-}
-
-
-
-.filterbtnstyle {
-  background: #fff;
-  color: #000;
-  border: solid 1px #d1d1d1;
-  border-radius: 4px;
-}
-
-.filterbtnstyle:hover {
-  background: @FabricAccentLight;
-  color: #000;
-  border: solid 1px #d1d1d1;
-}
-
-.filterbtnstyle:active {
-  background: @FabricAccentLight;
-  color: #000;
-  border: solid 1px #d1d1d1;
-}
-
-.filterbtnstyle:focus {
-  background: #fff;
-  color: #000;
-  border: solid 1px #d1d1d1;
-}
-
-
-.gridRowSelected .tabdocumentsGridElement:hover {
-  background-color: @FabricAccentLight !important;
-}
-
-
-.refreshcol {
-  filter: brightness(0) saturate(100%);
-}
-
-.refreshcol1 {
-  filter: brightness(0) saturate(100%);
-}
-
-.fileImportImg img {
-  filter: brightness(0) saturate(100%);
-}

package-lock.json

@@ -100,22 +100,31 @@
       }
     },
     "@azure/core-rest-pipeline": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.8.1.tgz",
-      "integrity": "sha512-R/XpxZcDgGbnneEifnsAcjLoR2NCmlDxKDmzd8oi5jx5YEnPE6gsxHQWAk2+uY55Ka717x/fdctyoCYKnumrqw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.1.tgz",
+      "integrity": "sha512-SsyWQ+T5MFQRX+M8H/66AlaI6HyCbQStGfFngx2fuiW+vKI2DkhtOvbYodPyf9fOe/ARLWWc3ohX54lQ5Kmaog==",
       "requires": {
         "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.3.0",
+        "@azure/core-auth": "^1.4.0",
         "@azure/core-tracing": "^1.0.1",
-        "@azure/core-util": "^1.0.0",
+        "@azure/core-util": "^1.3.0",
         "@azure/logger": "^1.0.0",
         "form-data": "^4.0.0",
-        "http-proxy-agent": "^4.0.1",
+        "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
-        "tslib": "^2.2.0",
-        "uuid": "^8.3.0"
+        "tslib": "^2.2.0"
       },
       "dependencies": {
+        "@azure/core-auth": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.5.0.tgz",
+          "integrity": "sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==",
+          "requires": {
+            "@azure/abort-controller": "^1.0.0",
+            "@azure/core-util": "^1.1.0",
+            "tslib": "^2.2.0"
+          }
+        },
         "@azure/core-tracing": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz",
@@ -124,6 +133,11 @@
             "tslib": "^2.2.0"
           }
         },
+        "@tootallnate/once": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+          "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="
+        },
         "form-data": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -134,15 +148,20 @@
             "mime-types": "^2.1.12"
           }
         },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        "http-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+          "requires": {
+            "@tootallnate/once": "2",
+            "agent-base": "6",
+            "debug": "4"
+          }
         },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+        "tslib": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
@@ -164,27 +183,30 @@
       }
     },
     "@azure/core-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.0.0.tgz",
-      "integrity": "sha512-yWshY9cdPthlebnb3Zuz/j0Lv4kjU6u7PR5sW7A9FF7EX+0irMRJAtyTq5TPiDHJfjH8gTSlnIYFj9m7Ed76IQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.4.0.tgz",
+      "integrity": "sha512-eGAyJpm3skVQoLiRqm/xPa+SXi/NPDdSHMxbRAz2lSprd+Zs+qrpQGQQ2VQ3Nttu+nSZR4XoYQC71LbEI7jsig==",
       "requires": {
+        "@azure/abort-controller": "^1.0.0",
         "tslib": "^2.2.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@azure/cosmos": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.16.2.tgz",
-      "integrity": "sha512-sceY5LWj0BHGj8PSyaVCfDRQLVZyoCfIY78kyIROJVEw0k+p9XFs8fhpykN8JklkCftL0WlaVY+X25SQwnhZsw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.0.0.tgz",
+      "integrity": "sha512-/Z27p1+FTkmjmm8jk90zi/HrczPHw2t8WecFnsnTe4xGocWl0Z4clP0YlLUTJPhRLWYa5upwD9rMvKJkS1f1kg==",
       "requires": {
+        "@azure/abort-controller": "^1.0.0",
         "@azure/core-auth": "^1.3.0",
         "@azure/core-rest-pipeline": "^1.2.0",
+        "@azure/core-tracing": "^1.0.0",
         "debug": "^4.1.1",
         "fast-json-stable-stringify": "^2.1.0",
         "jsbi": "^3.1.3",
@@ -205,9 +227,9 @@
           }
         },
         "tslib": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         },
         "universal-user-agent": {
           "version": "6.0.0",
@@ -6052,7 +6074,8 @@
     "@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true
     },
     "@types/anymatch": {
       "version": "1.3.1",
@@ -13316,6 +13339,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
       "requires": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -18838,9 +18862,9 @@
       }
     },
     "jsbi": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.1.4.tgz",
-      "integrity": "sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz",
+      "integrity": "sha512-aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="
     },
     "jsbn": {
       "version": "0.1.1",
@@ -19972,9 +19996,9 @@
       }
     },
     "node-abort-controller": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
-      "integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="
     },
     "node-fetch": {
       "version": "2.6.1",
@@ -21433,7 +21457,7 @@
     "priorityqueuejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz",
-      "integrity": "sha1-LuTyPCVgkT4IwHzlzN1t498sWvg="
+      "integrity": "sha512-lg++21mreCEOuGWTbO5DnJKAdxfjrdN0S9ysoW9SzdSJvbkWpkaDdpG/cdsPCsEnoLUwmd9m3WcZhngW7yKA2g=="
     },
     "prismjs": {
       "version": "1.23.0",

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "3.16.2",
+    "@azure/cosmos": "4.0.0",
     "@azure/cosmos-language-service": "0.0.5",
     "@azure/identity": "1.2.1",
     "@azure/ms-rest-nodeauth": "3.0.7",
@@ -199,7 +199,6 @@
     "pack:fast": "webpack  --mode development --progress",
     "copyToConsumers": "node copyToConsumers",
     "test": "rimraf coverage && jest",
-    "test:debug": "jest --runInBand",
     "test:e2e": "jest -c ./jest.config.playwright.js --detectOpenHandles",
     "watch": "npm run start",
     "wait-for-server": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/",

src/Common/Constants.ts

@@ -365,6 +365,9 @@ export const EmulatorMasterKey =
   //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
   "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
 
+// A variable @MyVariable defined in Constants.less is accessible as StyleConstants.MyVariable
+export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
+
 export class Notebook {
   public static readonly defaultBasePath = "./notebooks";
   public static readonly heartbeatDelayMs = 60000;

src/Common/ResourceTreeContainer.tsx

@@ -5,10 +5,8 @@ import refreshImg from "../../images/refresh-cosmos.svg";
 import { AuthType } from "../AuthType";
 import Explorer from "../Explorer/Explorer";
 import { ResourceTokenTree } from "../Explorer/Tree/ResourceTokenTree";
-import { ResourceTree2 } from "../Explorer/Tree2/ResourceTree";
 import { userContext } from "../UserContext";
 import { getApiShortDisplayName } from "../Utils/APITypeUtils";
-import { Platform, configContext } from "./../ConfigContext";
 import { NormalizedEventKey } from "./Constants";
 
 export interface ResourceTreeContainerProps {
@@ -78,10 +76,10 @@ export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps
           <ResourceTokenTree />
         ) : userContext.features.enableKoResourceTree ? (
           <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
-        ) : configContext.platform === Platform.Fabric ? (
-          <ResourceTree2 container={container} />
         ) : (
           <ResourceTree container={container} />
+          // Uncomment the following line to use the fluent ui tree
+          // <ResourceTree2 container={container} />
         )}
       </div>
       {/*  Collections Window - End */}

src/Common/StyleConstants.ts

@@ -1,18 +0,0 @@
-import { Platform, configContext } from "../ConfigContext";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
-
-export function updateStyles(): void {
-  if (configContext.platform === Platform.Fabric) {
-    StyleConstants.AccentMediumHigh = StyleConstants.FabricAccentMediumHigh;
-    StyleConstants.AccentMedium = StyleConstants.FabricAccentMedium;
-    StyleConstants.AccentLight = StyleConstants.FabricAccentLight;
-    StyleConstants.AccentAccentExtra = StyleConstants.FabricAccentMediumHigh;
-  } else {
-    StyleConstants.AccentMediumHigh = StyleConstants.PortalAccentMediumHigh;
-    StyleConstants.AccentMedium = StyleConstants.PortalAccentMedium;
-    StyleConstants.AccentLight = StyleConstants.PortalAccentLight;
-    StyleConstants.AccentAccentExtra = StyleConstants.PortalAccentMediumHigh;
-  }
-}

src/ConfigContext.ts

@@ -16,7 +16,6 @@ export enum Platform {
   Portal = "Portal",
   Hosted = "Hosted",
   Emulator = "Emulator",
-  Fabric = "Fabric",
 }
 
 export interface ConfigContext {
@@ -68,7 +67,7 @@ let configContext: Readonly<ConfigContext> = {
   ARM_AUTH_AREA: "https://management.azure.com/",
   ARM_ENDPOINT: "https://management.azure.com/",
   ARM_API_VERSION: "2016-06-01",
-  GRAPH_ENDPOINT: "https://graph.microsoft.com",
+  GRAPH_ENDPOINT: "https://graph.windows.net",
   GRAPH_API_VERSION: "1.6",
   ARCADIA_ENDPOINT: "https://workspaceartifacts.projectarcadia.net",
   ARCADIA_LIVY_ENDPOINT_DNS_ZONE: "dev.azuresynapse.net",
@@ -188,7 +187,6 @@ export async function initializeConfiguration(): Promise<ConfigContext> {
           console.error(`Invalid platform query parameter: ${platform}`);
           break;
         case Platform.Portal:
-        case Platform.Fabric:
         case Platform.Hosted:
         case Platform.Emulator:
           updateConfigContext({ platform });

src/Controls/Heatmap/Heatmap.ts

@@ -1,7 +1,7 @@
 import dayjs from "dayjs";
 import * as Plotly from "plotly.js-cartesian-dist-min";
+import { StyleConstants } from "../../Common/Constants";
 import { sendCachedDataMessage, sendReadyMessage } from "../../Common/MessageHandler";
-import { StyleConstants } from "../../Common/StyleConstants";
 import { MessageTypes } from "../../Contracts/ExplorerContracts";
 import { isInvalidParentFrameOrigin } from "../../Utils/MessageValidation";
 import "./Heatmap.less";

src/Explorer/ContextMenuButtonFactory.tsx

@@ -18,7 +18,6 @@ import * as ViewModels from "../Contracts/ViewModels";
 import { userContext } from "../UserContext";
 import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
 import { useSidePanel } from "../hooks/useSidePanel";
-import { Platform, configContext } from "./../ConfigContext";
 import { TreeNodeMenuItem } from "./Controls/TreeComponent/TreeComponent";
 import Explorer from "./Explorer";
 import { useNotebook } from "./Notebook/useNotebook";
@@ -100,10 +99,7 @@ export const createCollectionContextMenuButton = (
     });
   }
 
-  if (
-    configContext.platform !== Platform.Fabric &&
-    (userContext.apiType === "SQL" || userContext.apiType === "Gremlin")
-  ) {
+  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
     items.push({
       iconSrc: AddStoredProcedureIcon,
       onClick: () => {

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

@@ -32,20 +32,6 @@ const testCassandraAccount: DataModels.DatabaseAccount = {
   },
 };
 
-const testPostgresAccount: DataModels.DatabaseAccount = {
-  ...testAccount,
-  properties: {
-    postgresqlEndpoint: "https://testPostgresEndpoint.azure.com/",
-  },
-};
-
-const testVCoreMongoAccount: DataModels.DatabaseAccount = {
-  ...testAccount,
-  properties: {
-    vcoreMongoEndpoint: "https://testVCoreMongoEndpoint.azure.com/",
-  },
-};
-
 const testNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com",
@@ -64,18 +50,6 @@ const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInf
   forwardingId: "Id",
 };
 
-const testPostgresNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
-  authToken: "authToken",
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/postgresql",
-  forwardingId: "Id",
-};
-
-const testVCoreMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
-  authToken: "authToken",
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongovcore",
-  forwardingId: "Id",
-};
-
 describe("NotebookTerminalComponent", () => {
   it("renders terminal", () => {
     const props: NotebookTerminalComponentProps = {
@@ -120,27 +94,4 @@ describe("NotebookTerminalComponent", () => {
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
     expect(wrapper).toMatchSnapshot();
   });
-
-  it("renders Postgres shell", () => {
-    const props: NotebookTerminalComponentProps = {
-      databaseAccount: testPostgresAccount,
-      notebookServerInfo: testPostgresNotebookServerInfo,
-      tabId: undefined,
-    };
-
-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("renders vCore Mongo shell", () => {
-    const props: NotebookTerminalComponentProps = {
-      databaseAccount: testVCoreMongoAccount,
-      notebookServerInfo: testVCoreMongoNotebookServerInfo,
-      tabId: undefined,
-      username: "username",
-    };
-
-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
 });

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

@@ -1,17 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`NotebookTerminalComponent renders Postgres shell 1`] = `
-<div
-  className="notebookTerminalContainer"
->
-  <iframe
-    onLoad={[Function]}
-    src="terminal.html"
-    title="Terminal to Notebook Server"
-  />
-</div>
-`;
-
 exports[`NotebookTerminalComponent renders cassandra shell 1`] = `
 <div
   className="notebookTerminalContainer"
@@ -59,15 +47,3 @@ exports[`NotebookTerminalComponent renders terminal 1`] = `
   />
 </div>
 `;
-
-exports[`NotebookTerminalComponent renders vCore Mongo shell 1`] = `
-<div
-  className="notebookTerminalContainer"
->
-  <iframe
-    onLoad={[Function]}
-    src="terminal.html"
-    title="Terminal to Notebook Server"
-  />
-</div>
-`;

src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx

@@ -23,9 +23,9 @@ import * as React from "react";
 import * as _ from "underscore";
 import SaveQueryBannerIcon from "../../../../images/save_query_banner.png";
 import * as Constants from "../../../Common/Constants";
+import { StyleConstants } from "../../../Common/Constants";
 import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
 import { QueriesClient } from "../../../Common/QueriesClient";
-import { StyleConstants } from "../../../Common/StyleConstants";
 import * as DataModels from "../../../Contracts/DataModels";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";

src/Explorer/Controls/Settings/SettingsRenderUtils.tsx

@@ -23,8 +23,7 @@ import {
   Text,
 } from "@fluentui/react";
 import * as React from "react";
-import { Urls } from "../../../Common/Constants";
-import { StyleConstants } from "../../../Common/StyleConstants";
+import { StyleConstants, Urls } from "../../../Common/Constants";
 import { hoursInAMonth } from "../../../Shared/Constants";
 import {
   computeRUUsagePriceHourly,

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -18,7 +18,6 @@ import LoadingIndicator_3Squares from "../../../../images/LoadingIndicator_3Squa
 import TriangleDownIcon from "../../../../images/Triangle-down.svg";
 import TriangleRightIcon from "../../../../images/Triangle-right.svg";
 import * as Constants from "../../../Common/Constants";
-import { StyleConstants } from "../../../Common/StyleConstants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 
@@ -238,7 +237,7 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
   private renderContextMenuButton(node: TreeNode): JSX.Element {
     const menuItemLabel = "More";
     const buttonStyles: Partial<IButtonStyles> = {
-      rootFocused: { outline: `1px dashed ${StyleConstants.FocusColor}` },
+      rootFocused: { outline: `1px dashed ${Constants.StyleConstants.FocusColor}` },
     };
 
     return (

src/Explorer/Explorer.tsx

@@ -1,7 +1,7 @@
 import { Link } from "@fluentui/react/lib/Link";
 import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import { sendMessage } from "Common/MessageHandler";
-import { Platform, configContext } from "ConfigContext";
+import { Platform } from "ConfigContext";
 import { MessageTypes } from "Contracts/ExplorerContracts";
 import { IGalleryItem } from "Juno/JunoClient";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
@@ -1343,10 +1343,9 @@ export default class Explorer {
 
     // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
     const isNotebookEnabled =
-      configContext.platform !== Platform.Fabric &&
-      (userContext.features.notebooksDownBanner ||
-        useNotebook.getState().isPhoenixNotebooks ||
-        useNotebook.getState().isPhoenixFeatures);
+      userContext.features.notebooksDownBanner ||
+      useNotebook.getState().isPhoenixNotebooks ||
+      useNotebook.getState().isPhoenixFeatures;
     useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
     useNotebook
       .getState()

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -8,9 +8,7 @@ import { useNotebook } from "Explorer/Notebook/useNotebook";
 import { userContext } from "UserContext";
 import * as React from "react";
 import create, { UseStore } from "zustand";
-import { ConnectionStatusType, PoolIdType } from "../../../Common/Constants";
-import { StyleConstants } from "../../../Common/StyleConstants";
-import { Platform, configContext } from "../../../ConfigContext";
+import { ConnectionStatusType, PoolIdType, StyleConstants } from "../../../Common/Constants";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
@@ -86,27 +84,15 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
     );
   }
 
-  const rootStyle =
-    configContext.platform === Platform.Fabric
-      ? {
-          root: {
-            backgroundColor: "transparent",
-            padding: "0px 14px 0px 14px",
-          },
-        }
-      : {
-          root: {
-            backgroundColor: backgroundColor,
-          },
-        };
-
   return (
     <div className="commandBarContainer">
       <FluentCommandBar
         ariaLabel="Use left and right arrow keys to navigate between commands"
         items={uiFabricStaticButtons.concat(uiFabricTabsButtons)}
         farItems={uiFabricControlButtons}
-        styles={rootStyle}
+        styles={{
+          root: { backgroundColor: backgroundColor },
+        }}
         overflowButtonProps={{ ariaLabel: "More commands" }}
       />
     </div>

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts

@@ -343,31 +343,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
   });
 
-  describe("Open Postgres and vCore Mongo buttons", () => {
-    const openPostgresShellButtonLabel = "Open PSQL shell";
-    const openVCoreMongoShellButtonLabel = "Open MongoDB (vcore) shell";
-
-    beforeAll(() => {
-      mockExplorer = {} as Explorer;
-    });
-
-    it("creates Postgres shell button", () => {
-      const buttons = CommandBarComponentButtonFactory.createPostgreButtons(mockExplorer);
-      const openPostgresShellButton = buttons.find(
-        (button) => button.commandButtonLabel === openPostgresShellButtonLabel
-      );
-      expect(openPostgresShellButton).toBeDefined();
-    });
-
-    it("creates vCore Mongo shell button", () => {
-      const buttons = CommandBarComponentButtonFactory.createVCoreMongoButtons(mockExplorer);
-      const openVCoreMongoShellButton = buttons.find(
-        (button) => button.commandButtonLabel === openVCoreMongoShellButtonLabel
-      );
-      expect(openVCoreMongoShellButton).toBeDefined();
-    });
-  });
-
   describe("GitHub buttons", () => {
     const connectToGitHubBtnLabel = "Connect to GitHub";
     const manageGitHubSettingsBtnLabel = "Manage GitHub settings";

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -54,11 +54,7 @@ export function createStaticCommandBarButtons(
   const buttons: CommandButtonComponentProps[] = [];
 
   buttons.push(newCollectionBtn);
-  if (
-    configContext.platform !== Platform.Fabric &&
-    userContext.apiType !== "Tables" &&
-    userContext.apiType !== "Cassandra"
-  ) {
+  if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra") {
     const addSynapseLink = createOpenSynapseLinkDialogButton(container);
 
     if (addSynapseLink) {
@@ -261,9 +257,7 @@ export function createDivider(): CommandButtonComponentProps {
 }
 
 function areScriptsSupported(): boolean {
-  return (
-    configContext.platform !== Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin")
-  );
+  return userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
 }
 
 function createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {

src/Explorer/Menus/CommandBar/CommandBarUtil.tsx

@@ -9,9 +9,7 @@ import {
 import * as React from "react";
 import _ from "underscore";
 import ChevronDownIcon from "../../../../images/Chevron_down.svg";
-import { PoolIdType } from "../../../Common/Constants";
-import { StyleConstants } from "../../../Common/StyleConstants";
-import { configContext, Platform } from "../../../ConfigContext";
+import { PoolIdType, StyleConstants } from "../../../Common/Constants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
@@ -26,14 +24,11 @@ import { MemoryTracker } from "./MemoryTrackerComponent";
 export const convertButton = (btns: CommandButtonComponentProps[], backgroundColor: string): ICommandBarItemProps[] => {
   const buttonHeightPx = StyleConstants.CommandBarButtonHeight;
 
-  const hoverColor =
-    configContext.platform == Platform.Fabric ? StyleConstants.FabricAccentLight : StyleConstants.AccentLight;
-
   const getFilter = (isDisabled: boolean): string => {
     if (isDisabled) {
       return StyleConstants.GrayScale;
     }
-    return configContext.platform == Platform.Fabric ? StyleConstants.NoColor : undefined;
+    return undefined;
   };
 
   return btns
@@ -73,7 +68,6 @@ export const convertButton = (btns: CommandButtonComponentProps[], backgroundCol
               height: buttonHeightPx,
               paddingRight: 0,
               paddingLeft: 0,
-              borderRadius: configContext.platform == Platform.Fabric ? StyleConstants.FabricButtonBorderRadius : "0px",
               minWidth: 24,
               marginLeft: isSplit ? 0 : 5,
               marginRight: isSplit ? 0 : 5,
@@ -85,17 +79,17 @@ export const convertButton = (btns: CommandButtonComponentProps[], backgroundCol
             splitButtonMenuButton: {
               backgroundColor: backgroundColor,
               selectors: {
-                ":hover": { backgroundColor: hoverColor },
+                ":hover": { backgroundColor: StyleConstants.AccentLight },
               },
               width: 16,
             },
             label: { fontSize: StyleConstants.mediumFontSize },
-            rootHovered: { backgroundColor: hoverColor },
-            rootPressed: { backgroundColor: hoverColor },
+            rootHovered: { backgroundColor: StyleConstants.AccentLight },
+            rootPressed: { backgroundColor: StyleConstants.AccentLight },
             splitButtonMenuButtonExpanded: {
               backgroundColor: StyleConstants.AccentExtra,
               selectors: {
-                ":hover": { backgroundColor: hoverColor },
+                ":hover": { backgroundColor: StyleConstants.AccentLight },
               },
             },
             splitButtonDivider: {
@@ -126,7 +120,7 @@ export const convertButton = (btns: CommandButtonComponentProps[], backgroundCol
                 // TODO Remove all this crazy styling once we adopt Ui-Fabric Azure themes
                 selectors: {
                   ".ms-ContextualMenu-itemText": { fontSize: StyleConstants.mediumFontSize },
-                  ".ms-ContextualMenu-link:hover": { backgroundColor: hoverColor },
+                  ".ms-ContextualMenu-link:hover": { backgroundColor: StyleConstants.AccentLight },
                   ".ms-ContextualMenu-icon": { width: 16, height: 16 },
                 },
               },

src/Explorer/Notebook/NotebookRenderer/StatusBar.tsx

@@ -3,7 +3,7 @@ import distanceInWordsToNow from "date-fns/distance_in_words_to_now";
 import React from "react";
 import { connect } from "react-redux";
 import styled from "styled-components";
-import { StyleConstants } from "../../../Common/StyleConstants";
+import { StyleConstants } from "../../../Common/Constants";
 
 interface Props {
   lastSaved?: Date | null;

src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx

@@ -1,15 +1,8 @@
-import {
-  DetailsList,
-  DetailsListLayoutMode,
-  DirectionalHint,
-  IColumn,
-  SelectionMode,
-  TooltipHost,
-} from "@fluentui/react";
+import { DetailsList, DetailsListLayoutMode, IColumn, SelectionMode } from "@fluentui/react";
 import { Upload } from "Common/Upload/Upload";
 import { UploadDetailsRecord } from "Contracts/ViewModels";
-import { logConsoleError } from "Utils/NotificationConsoleUtils";
 import React, { ChangeEvent, FunctionComponent, useState } from "react";
+import { logConsoleError } from "Utils/NotificationConsoleUtils";
 import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
@@ -81,21 +74,12 @@ export const UploadItemsPane: FunctionComponent = () => {
   ];
 
   const _renderItemColumn = (item: UploadDetailsRecord, index: number, column: IColumn) => {
-    let fieldContent: string;
-    const tooltipId = `tooltip-${index}-${column.key}`;
-
     switch (column.key) {
       case "status":
-        fieldContent = `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
-        break;
+        return `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
       default:
-        fieldContent = item.fileName;
+        return item.fileName;
     }
-    return (
-      <TooltipHost content={fieldContent} id={tooltipId} directionalHint={DirectionalHint.rightCenter}>
-        {fieldContent}
-      </TooltipHost>
-    );
   };
 
   return (

src/Explorer/QueryCopilot/CopilotCarousel.tsx

@@ -11,9 +11,8 @@ import {
   Stack,
   Text,
 } from "@fluentui/react";
-import { QueryCopilotSampleDatabaseId } from "Common/Constants";
+import { QueryCopilotSampleDatabaseId, StyleConstants } from "Common/Constants";
 import { handleError } from "Common/ErrorHandlingUtils";
-import { StyleConstants } from "Common/StyleConstants";
 import { createCollection } from "Common/dataAccess/createCollection";
 import * as DataModels from "Contracts/DataModels";
 import { ContainerSampleGenerator } from "Explorer/DataSamples/ContainerSampleGenerator";

src/Explorer/QueryCopilot/Modal/WelcomeModal.tsx

@@ -60,7 +60,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
               <Text>
                 Ask Copilot to generate a query by describing the query in your words.
                 <br />
-                <Link href="https://aka.ms/cdb-copilot-learn-more">Learn more</Link>
+                <Link href="http://aka.ms/cdb-copilot-learn-more">Learn more</Link>
               </Text>
             </Stack.Item>
             <Stack.Item align="center" className="text">
@@ -78,7 +78,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
               <Text>
                 AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
                 <br />
-                <Link href="https://aka.ms/cdb-copilot-preview-terms">Read preview terms</Link>
+                <Link href="http://aka.ms/cdb-copilot-preview-terms">Read preview terms</Link>
               </Text>
             </Stack.Item>
             <Stack.Item align="center" className="text">
@@ -97,7 +97,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
                 While in Private Preview, Query Copilot is setup to work on sample database we have configured for you
                 at no cost.
                 <br />
-                <Link href="https://aka.ms/cdb-copilot-learn-more">Learn more</Link>
+                <Link href="http://aka.ms/cdb-copilot-learn-more">Learn more</Link>
               </Text>
             </Stack.Item>
           </Stack>

src/Explorer/QueryCopilot/Modal/__snapshots__/WelcomeModal.test.tsx.snap

@@ -102,7 +102,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
             Ask Copilot to generate a query by describing the query in your words.
             <br />
             <StyledLinkBase
-              href="https://aka.ms/cdb-copilot-learn-more"
+              href="http://aka.ms/cdb-copilot-learn-more"
             >
               Learn more
             </StyledLinkBase>
@@ -138,7 +138,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
             AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
             <br />
             <StyledLinkBase
-              href="https://aka.ms/cdb-copilot-preview-terms"
+              href="http://aka.ms/cdb-copilot-preview-terms"
             >
               Read preview terms
             </StyledLinkBase>
@@ -174,7 +174,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
             While in Private Preview, Query Copilot is setup to work on sample database we have configured for you at no cost.
             <br />
             <StyledLinkBase
-              href="https://aka.ms/cdb-copilot-learn-more"
+              href="http://aka.ms/cdb-copilot-learn-more"
             >
               Learn more
             </StyledLinkBase>

src/Explorer/QueryCopilot/QueryCopilotTab.tsx

@@ -434,7 +434,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
                       }}
                     >
                       Learn about{" "}
-                      <Link target="_blank" href="https://aka.ms/cdb-copilot-writing">
+                      <Link target="_blank" href="http://aka.ms/cdb-copilot-writing">
                         writing effective prompts
                       </Link>
                     </Text>
@@ -448,7 +448,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
         <Stack style={{ marginTop: 8, marginBottom: 24 }}>
           <Text style={{ fontSize: 12 }}>
             AI-generated content can have mistakes. Make sure it&apos;s accurate and appropriate before using it.{" "}
-            <Link href="https://aka.ms/cdb-copilot-preview-terms" target="_blank">
+            <Link href="http://aka.ms/cdb-copilot-preview-terms" target="_blank">
               Read preview terms
             </Link>
             {showErrorMessageBar && (

src/Explorer/QueryCopilot/V2/Bubbles/Explanation/Button/ExplanationButton.test.tsx

@@ -1,69 +0,0 @@
-import { Text } from "@fluentui/react";
-import { shallow } from "enzyme";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
-import React from "react";
-import { ExplanationButton } from "./ExplanationButton";
-
-describe("Explanation Button", () => {
-  const initialStoreState = useQueryCopilot.getState();
-  beforeEach(() => {
-    useQueryCopilot.setState(initialStoreState, true);
-    useQueryCopilot.getState().showExplanationBubble = true;
-    useQueryCopilot.getState().shouldIncludeInMessages = false;
-    jest.useFakeTimers();
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-    jest.useRealTimers();
-  });
-
-  it("should render explanation bubble with generated comments", () => {
-    useQueryCopilot.getState().shouldIncludeInMessages = true;
-
-    const wrapper = shallow(<ExplanationButton />);
-
-    expect(wrapper.find("Stack")).toHaveLength(1);
-    expect(wrapper.find("Text")).toHaveLength(1);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("should render 'Explain this query' link", () => {
-    useQueryCopilot.getState().shouldIncludeInMessages = true;
-    const mockSetChatMessages = jest.fn();
-    const mockSetIsGeneratingExplanation = jest.fn();
-    const mockSetShouldIncludeInMessages = jest.fn();
-    const mockSetShowExplanationBubble = jest.fn();
-    useQueryCopilot.getState().setChatMessages = mockSetChatMessages;
-    useQueryCopilot.getState().setIsGeneratingExplanation = mockSetIsGeneratingExplanation;
-    useQueryCopilot.getState().setShouldIncludeInMessages = mockSetShouldIncludeInMessages;
-    useQueryCopilot.getState().setShowExplanationBubble = mockSetShowExplanationBubble;
-
-    const wrapper = shallow(<ExplanationButton />);
-
-    const textElement = wrapper.find(Text);
-    textElement.simulate("click");
-
-    expect(mockSetChatMessages).toHaveBeenCalledWith([
-      ...initialStoreState.chatMessages,
-      { source: 0, message: "Explain this query to me" },
-    ]);
-    expect(mockSetIsGeneratingExplanation).toHaveBeenCalledWith(true);
-    expect(mockSetShouldIncludeInMessages).toHaveBeenCalledWith(true);
-    expect(mockSetShowExplanationBubble).toHaveBeenCalledWith(false);
-
-    jest.advanceTimersByTime(3000);
-
-    expect(mockSetIsGeneratingExplanation).toHaveBeenCalledWith(false);
-    expect(mockSetChatMessages).toHaveBeenCalled();
-  });
-
-  it("should render nothing when conditions are not met", () => {
-    useQueryCopilot.getState().showExplanationBubble = false;
-
-    const wrapper = shallow(<ExplanationButton />);
-
-    expect(wrapper.isEmptyRender()).toBe(true);
-    expect(wrapper).toMatchSnapshot();
-  });
-});

src/Explorer/QueryCopilot/V2/Bubbles/Explanation/Button/__snapshots__/ExplanationButton.test.tsx.snap

@@ -1,32 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Explanation Button should render explanation bubble with generated comments 1`] = `
-<Stack
-  style={
-    Object {
-      "alignItems": "center",
-      "display": "flex",
-      "margin": "5px",
-      "padding": "5px 5px 5px 50px",
-    }
-  }
->
-  <Text
-    onClick={[Function]}
-    style={
-      Object {
-        "border": "1.5px solid #B0BEFF",
-        "borderRadius": "4px",
-        "cursor": "pointer",
-        "marginBottom": "5px",
-        "padding": "2px",
-        "width": "100%",
-      }
-    }
-  >
-    Explain this query to me
-  </Text>
-</Stack>
-`;
-
-exports[`Explanation Button should render nothing when conditions are not met 1`] = `""`;

src/Explorer/QueryCopilot/V2/Bubbles/Explanation/ExplainationBubble.tsx

@@ -1,26 +0,0 @@
-import { Stack, Text } from "@fluentui/react";
-import { CopilotMessage } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
-import { FeedbackButtons } from "Explorer/QueryCopilot/V2/Bubbles/Output/Buttons/Feedback/FeedbackButtons";
-import React from "react";
-
-export const ExplanationBubble = ({ copilotMessage }: { copilotMessage: CopilotMessage }): JSX.Element => {
-  return (
-    <Stack
-      horizontalAlign="start"
-      verticalAlign="start"
-      tokens={{ padding: 8, childrenGap: 8 }}
-      style={{
-        backgroundColor: "white",
-        borderRadius: "8px",
-        margin: "5px 10px",
-        textAlign: "start",
-      }}
-    >
-      <Text>{copilotMessage.message}</Text>
-      <FeedbackButtons sqlQuery={copilotMessage.sqlQuery} />
-      <Text style={{ fontWeight: 400, fontSize: "10px", lineHeight: "14px" }}>
-        AI-generated content may be incorrect
-      </Text>
-    </Stack>
-  );
-};

src/Explorer/QueryCopilot/V2/Bubbles/Explanation/ExplanationBubble.test.tsx

@@ -1,17 +1,69 @@
-import { CopilotMessage } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
-import { ExplanationBubble } from "Explorer/QueryCopilot/V2/Bubbles/Explanation/ExplainationBubble";
+import { Text } from "@fluentui/react";
 import { shallow } from "enzyme";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";
+import { ExplanationBubble } from "./ExplanationBubble";
 
-describe("Explanation Bubble snapshot tests", () => {
-  it("should render", () => {
-    const mockCopilotMessage: CopilotMessage = {
-      source: 2,
-      message: "Mock message",
-    };
+describe("Explanation Bubble", () => {
+  const initialStoreState = useQueryCopilot.getState();
+  beforeEach(() => {
+    useQueryCopilot.setState(initialStoreState, true);
+    useQueryCopilot.getState().showExplanationBubble = true;
+    useQueryCopilot.getState().shouldIncludeInMessages = false;
+    jest.useFakeTimers();
+  });
 
-    const wrapper = shallow(<ExplanationBubble copilotMessage={mockCopilotMessage} />);
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.useRealTimers();
+  });
 
+  it("should render explanation bubble with generated comments", () => {
+    useQueryCopilot.getState().shouldIncludeInMessages = true;
+
+    const wrapper = shallow(<ExplanationBubble />);
+
+    expect(wrapper.find("Stack")).toHaveLength(1);
+    expect(wrapper.find("Text")).toHaveLength(1);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should render 'Explain this query' link", () => {
+    useQueryCopilot.getState().shouldIncludeInMessages = true;
+    const mockSetChatMessages = jest.fn();
+    const mockSetIsGeneratingExplanation = jest.fn();
+    const mockSetShouldIncludeInMessages = jest.fn();
+    const mockSetShowExplanationBubble = jest.fn();
+    useQueryCopilot.getState().setChatMessages = mockSetChatMessages;
+    useQueryCopilot.getState().setIsGeneratingExplanation = mockSetIsGeneratingExplanation;
+    useQueryCopilot.getState().setShouldIncludeInMessages = mockSetShouldIncludeInMessages;
+    useQueryCopilot.getState().setShowExplanationBubble = mockSetShowExplanationBubble;
+
+    const wrapper = shallow(<ExplanationBubble />);
+
+    const textElement = wrapper.find(Text);
+    textElement.simulate("click");
+
+    expect(mockSetChatMessages).toHaveBeenCalledWith([
+      ...initialStoreState.chatMessages,
+      { source: 0, message: "Explain this query to me" },
+    ]);
+    expect(mockSetIsGeneratingExplanation).toHaveBeenCalledWith(true);
+    expect(mockSetShouldIncludeInMessages).toHaveBeenCalledWith(true);
+    expect(mockSetShowExplanationBubble).toHaveBeenCalledWith(false);
+
+    jest.advanceTimersByTime(3000);
+
+    expect(mockSetIsGeneratingExplanation).toHaveBeenCalledWith(false);
+    expect(mockSetChatMessages).toHaveBeenCalled();
+  });
+
+  it("should render nothing when conditions are not met", () => {
+    useQueryCopilot.getState().showExplanationBubble = false;
+
+    const wrapper = shallow(<ExplanationBubble />);
+
+    expect(wrapper.isEmptyRender()).toBe(true);
     expect(wrapper).toMatchSnapshot();
   });
 });

src/Explorer/QueryCopilot/V2/Bubbles/Explanation/ExplanationBubble.tsx

@@ -2,13 +2,12 @@ import { Stack, Text } from "@fluentui/react";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";
 
-export const ExplanationButton: React.FC = (): JSX.Element => {
+export const ExplanationBubble: React.FC = (): JSX.Element => {
   const {
     showExplanationBubble,
     isGeneratingQuery,
     chatMessages,
     setChatMessages,
-    generatedQuery,
     generatedQueryComments,
     isGeneratingExplanation,
     setIsGeneratingExplanation,
@@ -25,7 +24,7 @@ export const ExplanationButton: React.FC = (): JSX.Element => {
     setTimeout(() => {
       if (useQueryCopilot.getState().shouldIncludeInMessages) {
         setIsGeneratingExplanation(false);
-        setChatMessages([...chatMessages, { source: 2, message: generatedQueryComments, sqlQuery: generatedQuery }]);
+        setChatMessages([...chatMessages, { source: 2, message: generatedQueryComments }]);
       }
     }, 3000);
   };

src/Explorer/QueryCopilot/V2/Bubbles/Explanation/__snapshots__/ExplanationBubble.test.tsx.snap

@@ -1,38 +1,32 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Explanation Bubble snapshot tests should render 1`] = `
+exports[`Explanation Bubble should render explanation bubble with generated comments 1`] = `
 <Stack
-  horizontalAlign="start"
   style={
     Object {
-      "backgroundColor": "white",
-      "borderRadius": "8px",
-      "margin": "5px 10px",
-      "textAlign": "start",
+      "alignItems": "center",
+      "display": "flex",
+      "margin": "5px",
+      "padding": "5px 5px 5px 50px",
     }
   }
-  tokens={
-    Object {
-      "childrenGap": 8,
-      "padding": 8,
-    }
-  }
-  verticalAlign="start"
 >
-  <Text>
-    Mock message
-  </Text>
-  <FeedbackButtons />
   <Text
+    onClick={[Function]}
     style={
       Object {
-        "fontSize": "10px",
-        "fontWeight": 400,
-        "lineHeight": "14px",
+        "border": "1.5px solid #B0BEFF",
+        "borderRadius": "4px",
+        "cursor": "pointer",
+        "marginBottom": "5px",
+        "padding": "2px",
+        "width": "100%",
       }
     }
   >
-    AI-generated content may be incorrect
+    Explain this query to me
   </Text>
 </Stack>
 `;
+
+exports[`Explanation Bubble should render nothing when conditions are not met 1`] = `""`;

src/Explorer/QueryCopilot/V2/Bubbles/Output/OutputBubble.tsx

@@ -2,31 +2,18 @@ import { Stack, Text } from "@fluentui/react";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { CopilotMessage } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
 import { OutputBubbleButtons } from "Explorer/QueryCopilot/V2/Bubbles/Output/Buttons/OutputBubbleButtons";
-import { userContext } from "UserContext";
 import React, { useState } from "react";
 
 export const OutputBubble = ({ copilotMessage }: { copilotMessage: CopilotMessage }): JSX.Element => {
   const [windowHeight, setWindowHeight] = useState<string>();
-  const textHeightWithPadding = 16;
 
   const calculateQueryWindowHeight = (): string => {
-    const outputWidth = document.getElementById("outputBubble")?.clientWidth;
-    const responseLength = copilotMessage.sqlQuery.length;
-
-    if (outputWidth > responseLength) {
-      return `${textHeightWithPadding * 3}px`;
-    } else {
-      const neededLines = Math.ceil(responseLength / outputWidth);
-      return `${neededLines * textHeightWithPadding}px`;
-    }
+    const calculatedHeight = document.getElementById("outputBubble")?.clientHeight * (3 / 5);
+    return `${calculatedHeight}px`;
   };
 
   React.useEffect(() => {
-    if (userContext.features.copilotChatFixedMonacoEditorHeight) {
-      setWindowHeight(`${textHeightWithPadding * 5}px`);
-    } else {
-      setWindowHeight(calculateQueryWindowHeight());
-    }
+    setWindowHeight(calculateQueryWindowHeight());
   }, []);
 
   return (

src/Explorer/QueryCopilot/V2/Modal/WelcomeSidebarModal.tsx

@@ -65,7 +65,7 @@ export const WelcomeSidebarModal: React.FC = (): JSX.Element => {
                   <Text>
                     Ask Copilot to generate a query by describing the query in your words.
                     <br />
-                    <Link href="https://aka.ms/cdb-copilot-learn-more">Learn more</Link>
+                    <Link href="http://aka.ms/cdb-copilot-learn-more">Learn more</Link>
                   </Text>
                 </Stack.Item>
               </Stack>
@@ -87,7 +87,7 @@ export const WelcomeSidebarModal: React.FC = (): JSX.Element => {
                   <Text>
                     AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
                     <br />
-                    <Link href="https://aka.ms/cdb-copilot-preview-terms">Read preview terms</Link>
+                    <Link href="http://aka.ms/cdb-copilot-preview-terms">Read preview terms</Link>
                   </Text>
                 </Stack.Item>
               </Stack>
@@ -109,7 +109,7 @@ export const WelcomeSidebarModal: React.FC = (): JSX.Element => {
                   <Text>
                     Copilot is setup on a sample database we have configured for you at no cost
                     <br />
-                    <Link href="https://aka.ms/cdb-copilot-learn-more">Learn more</Link>
+                    <Link href="http://aka.ms/cdb-copilot-learn-more">Learn more</Link>
                   </Text>
                 </Stack.Item>
               </Stack>

src/Explorer/QueryCopilot/V2/Sidebar/QueryCopilotSidebar.tsx

@@ -1,7 +1,6 @@
 import { Stack } from "@fluentui/react";
 import { QueryCopilotProps } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
-import { ExplanationButton } from "Explorer/QueryCopilot/V2/Bubbles/Explanation/Button/ExplanationButton";
-import { ExplanationBubble } from "Explorer/QueryCopilot/V2/Bubbles/Explanation/ExplainationBubble";
+import { ExplanationBubble } from "Explorer/QueryCopilot/V2/Bubbles/Explanation/ExplanationBubble";
 import { OutputBubble } from "Explorer/QueryCopilot/V2/Bubbles/Output/OutputBubble";
 import { RetrievingBubble } from "Explorer/QueryCopilot/V2/Bubbles/Retriveing/RetrievingBubble";
 import { SampleBubble } from "Explorer/QueryCopilot/V2/Bubbles/Sample/SampleBubble";
@@ -43,34 +42,27 @@ export const QueryCopilotSidebar: React.FC<QueryCopilotProps> = ({ explorer }: Q
             }}
           >
             <WelcomeBubble />
-            {chatMessages.map((message, index) => {
-              switch (message.source) {
-                case 0:
-                  return (
-                    <Stack
-                      key={index}
-                      horizontalAlign="center"
-                      tokens={{ padding: 8, childrenGap: 8 }}
-                      style={{
-                        backgroundColor: "#E0E7FF",
-                        borderRadius: "8px",
-                        margin: "5px 10px",
-                        textAlign: "start",
-                      }}
-                    >
-                      {message.message}
-                    </Stack>
-                  );
-                case 1:
-                  return <OutputBubble key={index} copilotMessage={message} />;
-                case 2:
-                  return <ExplanationBubble key={index} copilotMessage={message} />;
-                default:
-                  return <></>;
-              }
-            })}
+            {chatMessages.map((message, index) =>
+              message.source === 0 || message.source === 2 ? (
+                <Stack
+                  key={index}
+                  horizontalAlign="center"
+                  tokens={{ padding: 8, childrenGap: 8 }}
+                  style={{
+                    backgroundColor: message.source === 0 ? "#E0E7FF" : "white",
+                    borderRadius: "8px",
+                    margin: "5px 10px",
+                    textAlign: "start",
+                  }}
+                >
+                  {message.message}
+                </Stack>
+              ) : (
+                <OutputBubble key={index} copilotMessage={message} />
+              )
+            )}
             <RetrievingBubble />
-            <ExplanationButton />
+            <ExplanationBubble />
 
             {chatMessages.length === 0 && !isGeneratingQuery && <SampleBubble />}
           </Stack>

src/Explorer/QueryCopilot/__snapshots__/QueryCopilotTab.test.tsx.snap

@@ -102,7 +102,7 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
         AI-generated content can have mistakes. Make sure it's accurate and appropriate before using it.
          
         <StyledLinkBase
-          href="https://aka.ms/cdb-copilot-preview-terms"
+          href="http://aka.ms/cdb-copilot-preview-terms"
           target="_blank"
         >
           Read preview terms

src/Explorer/Quickstart/QuickstartCarousel.tsx

@@ -4,6 +4,7 @@ import { traceSuccess } from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
 import { useCarousel } from "hooks/useCarousel";
 import React, { useState } from "react";
+import Youtube from "react-youtube";
 import Image1 from "../../../images/CarouselImage1.svg";
 import Image2 from "../../../images/CarouselImage2.svg";
 
@@ -78,12 +79,7 @@ const getHeaderText = (page: number): string => {
 const getContent = (page: number): JSX.Element => {
   switch (page) {
     case 1:
-      return (
-        <video controls width="640" height="360" controlsList="nofullscreen nodownload ">
-          <source src="src/Explorer/Quickstart/Videos/Cosmos-db-turorial.mp4" type="video/mp4"></source>
-          Your browser does not support the video tag.
-        </video>
-      );
+      return <Youtube videoId="Jvgh64rvdXU" onPlay={() => traceSuccess(Action.PlayCarouselVideo)} />;
     case 2:
       return <Image style={{ width: 640 }} src={Image1} />;
     case 3:

src/Explorer/Tabs/Shared/CheckFirewallRules.test.ts

@@ -1,91 +0,0 @@
-import { DatabaseAccount, FirewallRule } from "Contracts/DataModels";
-import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
-import { updateUserContext } from "UserContext";
-import { mockFunction } from "Utils/JestUtils";
-import { armRequest } from "Utils/arm/request";
-import React from "react";
-
-jest.mock("Utils/arm/request");
-const armRequestMock = mockFunction(armRequest);
-
-describe("CheckFirewallRule tests", () => {
-  const apiVersion = "2023-03-15-preview";
-  const rulePredicate = (rule: FirewallRule) =>
-    rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255";
-  let isAllPublicIPAddressEnabled: boolean;
-  const setIsAllPublicIPAddressEnabled = jest.fn((value) => (isAllPublicIPAddressEnabled = value));
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const useStateMock: any = (initState: any) => [initState, setIsAllPublicIPAddressEnabled];
-  jest.spyOn(React, "useState").mockImplementation(useStateMock);
-
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: {
-        id: "testResourceId",
-      } as DatabaseAccount,
-    });
-  });
-
-  it("returns 'all public IP addresses' is enabled for account with the proper firewall rule", async () => {
-    armRequestMock.mockResolvedValueOnce({
-      value: [
-        {
-          id: "resourceId",
-          name: "AllowAll",
-          type: "Microsoft.DocumentDB/mongoClusters/firewallRules",
-          properties: {
-            provisioningState: "Succeeded",
-            startIpAddress: "0.0.0.0",
-            endIpAddress: "255.255.255.255",
-          },
-        },
-      ],
-    });
-
-    await checkFirewallRules(apiVersion, rulePredicate, setIsAllPublicIPAddressEnabled);
-
-    expect(isAllPublicIPAddressEnabled).toBe(true);
-  });
-
-  it("returns 'all public IP addresses' is NOT enabled for account without the proper firewall rule", async () => {
-    armRequestMock.mockResolvedValueOnce([
-      {
-        id: "resourceId",
-        name: "AllowAll",
-        type: "Microsoft.DocumentDB/mongoClusters/firewallRules",
-        properties: {
-          provisioningState: "Succeeded",
-          startIpAddress: "10.10.10.10",
-          endIpAddress: "10.10.10.10",
-        },
-      },
-    ]);
-
-    await checkFirewallRules(apiVersion, rulePredicate, setIsAllPublicIPAddressEnabled);
-
-    expect(isAllPublicIPAddressEnabled).toBe(false);
-  });
-
-  it("sets message for account without the proper firewall rule", async () => {
-    armRequestMock.mockResolvedValueOnce([
-      {
-        id: "resourceId",
-        name: "AllowAll",
-        type: "Microsoft.DocumentDB/mongoClusters/firewallRules",
-        properties: {
-          provisioningState: "Succeeded",
-          startIpAddress: "0.0.0.0",
-          endIpAddress: "255.255.255.255",
-        },
-      },
-    ]);
-
-    const warningMessage = "This is a warning message";
-    let warningMessageResult: string;
-    const warningMessageFunc = (msg: string) => (warningMessageResult = msg);
-
-    await checkFirewallRules(apiVersion, rulePredicate, undefined, warningMessageFunc, warningMessage);
-
-    expect(warningMessageResult).toEqual(warningMessage);
-  });
-});

src/Explorer/Tabs/Tabs.tsx

@@ -138,7 +138,12 @@ function TabNav({ tab, active, tabKind }: { tab?: Tab; active: boolean; tabKind?
               />
             )}
           </span>
-          <span className="tabNavText">{useObservable(tab?.tabTitle || getReactTabTitle())}</span>
+          <span
+            className="tabNavText"
+            style={active ? { fontWeight: "bolder", borderBottom: "2px solid rgba(0,120,212,1)" } : {}}
+          >
+            {useObservable(tab?.tabTitle || getReactTabTitle())}
+          </span>
           {tabKind !== ReactTabKind.Home && (
             <span className="tabIconSection">
               <CloseButton tab={tab} active={active} hovering={hovering} tabKind={tabKind} />

src/Explorer/Tree/Collection.ts

@@ -37,7 +37,6 @@ import QueryTablesTab from "../Tabs/QueryTablesTab";
 import { CollectionSettingsTabV2 } from "../Tabs/SettingsTabV2";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
-import { Platform, configContext } from "./../../ConfigContext";
 import ConflictId from "./ConflictId";
 import DocumentId from "./DocumentId";
 import StoredProcedure from "./StoredProcedure";
@@ -206,8 +205,7 @@ export default class Collection implements ViewModels.Collection {
         .map((node) => <Trigger>node);
     });
 
-    const showScriptsMenus: boolean =
-      configContext.platform != Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
+    const showScriptsMenus: boolean = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
     this.showStoredProcedures = ko.observable<boolean>(showScriptsMenus);
     this.showTriggers = ko.observable<boolean>(showScriptsMenus);
     this.showUserDefinedFunctions = ko.observable<boolean>(showScriptsMenus);

src/Explorer/Tree/ResourceTree.tsx

@@ -39,7 +39,6 @@ import { GitHubReposPanel } from "../Panes/GitHubReposPanel/GitHubReposPanel";
 import TabsBase from "../Tabs/TabsBase";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
-import { Platform, configContext } from "./../../ConfigContext";
 import StoredProcedure from "./StoredProcedure";
 import Trigger from "./Trigger";
 import UserDefinedFunction from "./UserDefinedFunction";
@@ -70,8 +69,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
     shallow
   );
   const { activeTab, refreshActiveTab } = useTabs();
-  const showScriptNodes =
-    configContext.platform !== Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
+  const showScriptNodes = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
   const pseudoDirPath = "PsuedoDir";
 
   const buildGalleryCallout = (): JSX.Element => {

src/Explorer/Tree/ResourceTreeAdapter.tsx

@@ -40,7 +40,6 @@ import { GitHubReposPanel } from "../Panes/GitHubReposPanel/GitHubReposPanel";
 import TabsBase from "../Tabs/TabsBase";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
-import { Platform, configContext } from "./../../ConfigContext";
 import StoredProcedure from "./StoredProcedure";
 import Trigger from "./Trigger";
 import UserDefinedFunction from "./UserDefinedFunction";
@@ -250,9 +249,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
    * @param container
    */
   private static showScriptNodes(container: Explorer): boolean {
-    return (
-      configContext.platform !== Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin")
-    );
+    return userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
   }
 
   private buildCollectionNode(database: ViewModels.Database, collection: ViewModels.Collection): TreeNode {

src/Explorer/Tree2/ResourceTree.tsx

@@ -89,8 +89,8 @@ export const ResourceTree2: React.FC<ResourceTreeProps> = ({ container }: Resour
           aria-label="CosmosDB resources"
           openItems={openItems}
           onOpenChange={handleOpenChange}
-          size="medium"
-          style={{ height: "100%", width: "290px" }}
+          size="small"
+          style={{ height: "100%" }}
         >
           {[dataNodeTree].map((node) => (
             <TreeNode2Component

src/Explorer/Tree2/containerTreeNodeUtil.ts

@@ -17,7 +17,6 @@ import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
 import { mostRecentActivity } from "../MostRecentActivity/MostRecentActivity";
 import { useNotebook } from "../Notebook/useNotebook";
 import { useSelectedNode } from "../useSelectedNode";
-import { Platform, configContext } from "./../../ConfigContext";
 
 export const buildCollectionNode = (
   database: ViewModels.Database,
@@ -26,46 +25,6 @@ export const buildCollectionNode = (
   container: Explorer,
   refreshActiveTab: (comparator: (tab: TabsBase) => boolean) => void
 ): TreeNode2 => {
-  let children: TreeNode2[];
-
-  // Flat Tree for Fabric
-  if (configContext.platform !== Platform.Fabric) {
-    children = buildCollectionNodeChildren(database, collection, isNotebookEnabled, container, refreshActiveTab);
-  }
-
-  return {
-    label: collection.id(),
-    iconSrc: CollectionIcon,
-    children: children,
-    className: "collectionHeader",
-    contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
-    onClick: () => {
-      useSelectedNode.getState().setSelectedNode(collection);
-      collection.openTab();
-      // push to most recent
-      mostRecentActivity.collectionWasOpened(userContext.databaseAccount?.id, collection);
-    },
-    onExpanded: () => {
-      // Rewritten version of expandCollapseCollection
-      useSelectedNode.getState().setSelectedNode(collection);
-      useCommandBar.getState().setContextButtons([]);
-      refreshActiveTab(
-        (tab: TabsBase) =>
-          tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
-      );
-    },
-    isSelected: () => useSelectedNode.getState().isDataNodeSelected(collection.databaseId, collection.id()),
-    onContextMenuOpen: () => useSelectedNode.getState().setSelectedNode(collection),
-  };
-};
-
-const buildCollectionNodeChildren = (
-  database: ViewModels.Database,
-  collection: ViewModels.Collection,
-  isNotebookEnabled: boolean,
-  container: Explorer,
-  refreshActiveTab: (comparator: (tab: TabsBase) => boolean) => void
-): TreeNode2[] => {
   const showScriptNodes = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
   const children: TreeNode2[] = [];
   children.push({
@@ -151,7 +110,27 @@ const buildCollectionNodeChildren = (
     });
   }
 
-  return children;
+  return {
+    label: collection.id(),
+    iconSrc: CollectionIcon,
+    children: children,
+    className: "collectionHeader",
+    contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
+    onClick: () => {
+      useSelectedNode.getState().setSelectedNode(collection);
+    },
+    onExpanded: () => {
+      // Rewritten version of expandCollapseCollection
+      useSelectedNode.getState().setSelectedNode(collection);
+      useCommandBar.getState().setContextButtons([]);
+      refreshActiveTab(
+        (tab: TabsBase) =>
+          tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
+      );
+    },
+    isSelected: () => useSelectedNode.getState().isDataNodeSelected(collection.databaseId, collection.id()),
+    onContextMenuOpen: () => useSelectedNode.getState().setSelectedNode(collection),
+  };
 };
 
 const buildStoredProcedureNode = (

src/Explorer/Tree2/useDatabaseTreeNodes.ts

@@ -9,7 +9,6 @@ import * as ResourceTreeContextMenuButtonFactory from "../ContextMenuButtonFacto
 import Explorer from "../Explorer";
 import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
 import { useSelectedNode } from "../useSelectedNode";
-import { Platform, configContext } from "./../../ConfigContext";
 
 export const useDatabaseTreeNodes = (container: Explorer, isNotebookEnabled: boolean): TreeNode2[] => {
   const databases = useDatabases((state) => state.databases);
@@ -36,7 +35,7 @@ export const useDatabaseTreeNodes = (container: Explorer, isNotebookEnabled: boo
       onContextMenuOpen: () => useSelectedNode.getState().setSelectedNode(database),
     };
 
-    if (database.isDatabaseShared() && configContext.platform !== Platform.Fabric) {
+    if (database.isDatabaseShared()) {
       databaseNode.children.push({
         id: database.isSampleDB ? "sampleScaleSettings" : "",
         label: "Scale",

src/Main.tsx

@@ -1,5 +1,5 @@
 // CSS Dependencies
-import { initializeIcons, loadTheme } from "@fluentui/react";
+import { initializeIcons } from "@fluentui/react";
 import { QuickstartCarousel } from "Explorer/Quickstart/QuickstartCarousel";
 import { MongoQuickstartTutorial } from "Explorer/Quickstart/Tutorials/MongoQuickstartTutorial";
 import { SQLQuickstartTutorial } from "Explorer/Quickstart/Tutorials/SQLQuickstartTutorial";
@@ -26,8 +26,6 @@ import "../less/TableStyles/CustomizeColumns.less";
 import "../less/TableStyles/EntityEditor.less";
 import "../less/TableStyles/fulldatatables.less";
 import "../less/TableStyles/queryBuilder.less";
-import * as StyleConstants from "./Common/StyleConstants";
-import { configContext, Platform } from "ConfigContext";
 import "../less/documentDB.less";
 import "../less/forms.less";
 import "../less/infobox.less";
@@ -59,7 +57,6 @@ import "./Libs/jquery";
 import "./Shared/appInsights";
 import { useConfig } from "./hooks/useConfig";
 import { useKnockoutExplorer } from "./hooks/useKnockoutExplorer";
-import { appThemeFabric } from "./Platform/Fabric/FabricTheme";
 
 initializeIcons();
 
@@ -70,10 +67,6 @@ const App: React.FunctionComponent = () => {
   const shouldShowModal = useQueryCopilot((state) => state.showFeedbackModal);
 
   const config = useConfig();
-  if (config?.platform === Platform.Fabric) {
-    loadTheme(appThemeFabric);
-  }
-  StyleConstants.updateStyles();
   const explorer = useKnockoutExplorer(config?.platform);
 
   const toggleLeftPaneExpanded = () => {
@@ -91,7 +84,6 @@ const App: React.FunctionComponent = () => {
 
   return (
     <div className="flexContainer" aria-hidden="false">
-      <LoadFabricOverrides />
       <div id="divExplorer" className="flexContainer hideOverflows">
         <div id="freeTierTeachingBubble"> </div>
         {/* Main Command Bar - Start */}
@@ -143,19 +135,6 @@ const App: React.FunctionComponent = () => {
 
 ReactDOM.render(<App />, document.body);
 
-function LoadFabricOverrides(): JSX.Element {
-  if (configContext.platform === Platform.Fabric) {
-    const FabricStyle = React.lazy(() => import("./Platform/Fabric/FabricPlatform"));
-    return (
-      <React.Suspense fallback={<div></div>}>
-        <FabricStyle />
-      </React.Suspense>
-    );
-  } else {
-    return <></>;
-  }
-}
-
 function LoadingExplorer(): JSX.Element {
   return (
     <div className="splashLoaderContainer">

src/Platform/Fabric/FabricPlatform.tsx

@@ -1,7 +0,0 @@
-import React from "react";
-import "../../../less/documentDBFabric.less";
-// This is a dummy export, allowing us to conditionally import documentDBFabric.less
-// by lazy-importing this in Main.tsx (see LoadFabricOverrides() there)
-export default function InitFabric() {
-  return <></>;
-}

src/Platform/Fabric/FabricTheme.tsx

@@ -1,208 +0,0 @@
-import { Theme, createTheme } from "@fluentui/react";
-
-export const appThemeFabric: Theme = createTheme({
-  palette: {
-    /**
-     * Color code for themeDarker.
-     */
-    themeDarker: "#033f38",
-    /**
-     * Color code for themeDark.
-     */
-    themeDark: "#0a5c50",
-    /**
-     * Color code for themeDarkAlt.
-     */
-    themeDarkAlt: "#0c695a",
-    /**
-     * Color code for themePrimary.
-     */
-    themePrimary: "#117865",
-    /**
-     * Color code for themeSecondary.
-     */
-    themeSecondary: "#1f937e",
-    /**
-     * Color code for themeTertiary.
-     */
-    themeTertiary: "#52c7aa",
-    /**
-     * Color code for themeLight.
-     */
-    themeLight: "#9ee0cb",
-    /**
-     * Color code for themeLighter.
-     */
-    themeLighter: "#c0ecdd",
-    /**
-     * Color code for themeLighterAlt.
-     */
-    themeLighterAlt: "#e3f7ef",
-    /**
-     * Color code for the strongest color, which is black in the default theme.
-     * This is a very light color in inverted themes.
-     */
-    black: "#000000",
-    /**
-     * Color code for blackTranslucent40.
-     */
-    blackTranslucent40: "rgba(0, 0, 0, 0.4)",
-    /**
-     * Color code for neutralDark.
-     */
-    neutralDark: "#141414",
-    /**
-     * Color code for neutralPrimary.
-     */
-    neutralPrimary: "#242424",
-    /**
-     * Color code for neutralPrimaryAlt.
-     */
-    neutralPrimaryAlt: "#383838",
-    /**
-     * Color code for neutralSecondary.
-     */
-    neutralSecondary: "#5c5c5c",
-    /**
-     * Color code for neutralSecondaryAlt.
-     */
-    neutralSecondaryAlt: "#858585",
-    /**
-     * Color code for neutralTertiary.
-     */
-    neutralTertiary: "#9e9e9e",
-    /**
-     * Color code for neutralTertiaryAlt.
-     */
-    neutralTertiaryAlt: "#c7c7c7",
-    /**
-     * Color code for neutralQuaternary.
-     */
-    neutralQuaternary: "#d1d1d1",
-    /**
-     * Color code for neutralQuaternaryAlt.
-     */
-    neutralQuaternaryAlt: "#e0e0e0",
-    /**
-     * Color code for neutralLight.
-     */
-    neutralLight: "#ebebeb",
-    /**
-     * Color code for neutralLighter.
-     */
-    neutralLighter: "#f5f5f5",
-    /**
-     * Color code for neutralLighterAlt.
-     */
-    neutralLighterAlt: "#fafafa",
-    /**
-     * Color code for the accent.
-     */
-    accent: "#117865",
-    /**
-     * Color code for the softest color, which is white in the default theme. This is a very dark color in dark themes.
-     * This is the page background.
-     */
-    white: "#ffffff",
-    /**
-     * Color code for whiteTranslucent40
-     */
-    whiteTranslucent40: "rgba(255, 255, 255, 0.4)",
-    /**
-     * Color code for yellowDark.
-     */
-    yellowDark: "#d39300",
-    /**
-     * Color code for yellow.
-     */
-    yellow: "#fde300",
-    /**
-     * Color code for yellowLight.
-     */
-    yellowLight: "#fef7b2",
-    /**
-     * Color code for orange.
-     */
-    orange: "#f7630c",
-    /**
-     * Color code for orangeLight.
-     */
-    orangeLight: "#f98845",
-    /**
-     * Color code for orangeLighter.
-     */
-    orangeLighter: "#fdcfb4",
-    /**
-     * Color code for redDark.
-     */
-    redDark: "#750b1c",
-    /**
-     * Color code for red.
-     */
-    red: "#d13438",
-    /**
-     * Color code for magentaDark.
-     */
-    magentaDark: "#6b0043",
-    /**
-     * Color code for magenta.
-     */
-    magenta: "#bf0077",
-    /**
-     * Color code for magentaLight.
-     */
-    magentaLight: "#d957a8",
-    /**
-     * Color code for purpleDark.
-     */
-    purpleDark: "#401b6c",
-    /**
-     * Color code for purple.
-     */
-    purple: "#5c2e91",
-    /**
-     * Color code for purpleLight.
-     */
-    purpleLight: "#c6b1de",
-    /**
-     * Color code for blueDark.
-     */
-    blueDark: "#003966",
-    /**
-     * Color code for blueMid.
-     */
-    blueMid: "#004e8c",
-    /**
-     * Color code for blue.
-     */
-    blue: "#0078d4",
-    /**
-     * Color code for blueLight.
-     */
-    blueLight: "#3a96dd",
-    /**
-     * Color code for tealDark.
-     */
-    tealDark: "#006666",
-    /**
-     * Color code for teal.
-     */
-    teal: "#038387",
-    /**
-     * Color code for tealLight.
-     */
-    tealLight: "#00b7c3",
-    /**
-     * Color code for greenDark.
-     */
-    greenDark: "#0b6a0b",
-    /**
-     * Color code for green.
-     */
-    green: "#107c10",
-    /**
-     * Color code for greenLight.
-     */
-    greenLight: "#13a10e",
-  },
-});

src/Platform/Hosted/Components/AccountSwitcher.tsx

@@ -4,7 +4,7 @@
 import { DefaultButton, IButtonStyles, IContextualMenuItem } from "@fluentui/react";
 import * as React from "react";
 import { FunctionComponent, useEffect, useState } from "react";
-import { StyleConstants } from "../../../Common/StyleConstants";
+import { StyleConstants } from "../../../Common/Constants";
 import { DatabaseAccount } from "../../../Contracts/DataModels";
 import { useDatabaseAccounts } from "../../../hooks/useDatabaseAccounts";
 import { useSubscriptions } from "../../../hooks/useSubscriptions";

src/Platform/Hosted/Components/ConnectExplorer.tsx

@@ -1,7 +1,7 @@
 import { useBoolean } from "@fluentui/react-hooks";
 import * as React from "react";
-import ConnectImage from "../../../../images/HdeConnectCosmosDB.svg";
 import ErrorImage from "../../../../images/error.svg";
+import ConnectImage from "../../../../images/HdeConnectCosmosDB.svg";
 import { AuthType } from "../../../AuthType";
 import { HttpHeaders } from "../../../Common/Constants";
 import { configContext } from "../../../ConfigContext";
@@ -16,19 +16,6 @@ interface Props {
   setAuthType: (authType: AuthType) => void;
 }
 
-export const fetchEncryptedToken = async (connectionString: string): Promise<string> => {
-  const headers = new Headers();
-  headers.append(HttpHeaders.connectionString, connectionString);
-  const url = configContext.BACKEND_ENDPOINT + "/api/guest/tokens/generateToken";
-  const response = await fetch(url, { headers, method: "POST" });
-  if (!response.ok) {
-    throw response;
-  }
-  // This API has a quirk where it must be parsed twice
-  const result: GenerateTokenResponse = JSON.parse(await response.json());
-  return decodeURIComponent(result.readWrite || result.read);
-};
-
 export const ConnectExplorer: React.FunctionComponent<Props> = ({
   setEncryptedToken,
   login,
@@ -57,8 +44,16 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
                   return;
                 }
 
-                const encryptedToken = await fetchEncryptedToken(connectionString);
-                setEncryptedToken(encryptedToken);
+                const headers = new Headers();
+                headers.append(HttpHeaders.connectionString, connectionString);
+                const url = configContext.BACKEND_ENDPOINT + "/api/guest/tokens/generateToken";
+                const response = await fetch(url, { headers, method: "POST" });
+                if (!response.ok) {
+                  throw response;
+                }
+                // This API has a quirk where it must be parsed twice
+                const result: GenerateTokenResponse = JSON.parse(await response.json());
+                setEncryptedToken(decodeURIComponent(result.readWrite || result.read));
                 setAuthType(AuthType.ConnectionString);
               }}
             >

src/Platform/Hosted/extractFeatures.ts

@@ -40,7 +40,6 @@ export type Features = {
   readonly copilotVersion?: string;
   readonly disableCopilotPhoenixGateaway: boolean;
   readonly enableCopilotFullSchema: boolean;
-  readonly copilotChatFixedMonacoEditorHeight: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -113,7 +112,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     copilotVersion: get("copilotversion") ?? "v1.0",
     disableCopilotPhoenixGateaway: "true" === get("disablecopilotphoenixgateaway"),
     enableCopilotFullSchema: "true" === get("enablecopilotfullschema", "true"),
-    copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
   };
 }
 

src/SelfServe/SelfServeStyles.tsx

@@ -1,5 +1,5 @@
 import { IButtonStyles, ICommandBarStyles, ISeparatorStyles, IStackTokens } from "@fluentui/react";
-import { StyleConstants } from "../Common/StyleConstants";
+import { StyleConstants } from "../Common/Constants";
 
 export const commandBarItemStyles: IButtonStyles = { root: { paddingLeft: 20 } };
 

src/Utils/EndpointValidation.ts

@@ -55,17 +55,6 @@ export const defaultAllowedBackendEndpoints: ReadonlyArray<string> = [
   "https://localhost:1234",
 ];
 
-export const PortalBackendIPs: { [key: string]: string[] } = {
-  "https://main.documentdb.ext.azure.com": ["104.42.195.92", "40.76.54.131"],
-  // DE doesn't talk to prod2 (main2) but it might be added
-  //"https://main2.documentdb.ext.azure.com": ["104.42.196.69"],
-  "https://main.documentdb.ext.azure.cn": ["139.217.8.252"],
-  "https://main.documentdb.ext.azure.us": ["52.244.48.71"],
-  // Add ussec and usnat when endpoint address is known:
-  //ussec: ["29.26.26.67", "29.26.26.66"],
-  //usnat: ["7.28.202.68"],
-};
-
 export const allowedMongoProxyEndpoints: ReadonlyArray<string> = [
   "https://main.documentdb.ext.azure.com",
   "https://main.documentdb.ext.azure.cn",
@@ -78,7 +67,7 @@ export const allowedEmulatorEndpoints: ReadonlyArray<string> = ["https://localho
 
 export const allowedMongoBackendEndpoints: ReadonlyArray<string> = ["https://localhost:1234"];
 
-export const allowedGraphEndpoints: ReadonlyArray<string> = ["https://graph.microsoft.com"];
+export const allowedGraphEndpoints: ReadonlyArray<string> = ["https://graph.windows.net"];
 
 export const allowedArcadiaEndpoints: ReadonlyArray<string> = ["https://workspaceartifacts.projectarcadia.net"];
 

src/Utils/JestUtils.ts

@@ -1,4 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function mockFunction<T extends (...args: any[]) => any>(fn: T): jest.MockedFunction<T> {
-  return fn as jest.MockedFunction<T>;
-}

src/Utils/NetworkUtility.test.ts

@@ -1,106 +0,0 @@
-import { resetConfigContext, updateConfigContext } from "ConfigContext";
-import { DatabaseAccount, IpRule } from "Contracts/DataModels";
-import { updateUserContext } from "UserContext";
-import { PortalBackendIPs } from "Utils/EndpointValidation";
-import { getNetworkSettingsWarningMessage } from "./NetworkUtility";
-
-describe("NetworkUtility tests", () => {
-  describe("getNetworkSettingsWarningMessage", () => {
-    const publicAccessMessagePart = "Please enable public access to proceed";
-    const accessMessagePart = "Please allow access from Azure Portal to proceed";
-    // validEnpoints are a subset of those from Utils/EndpointValidation/PortalBackendIPs
-    const validEndpoints = [
-      "https://main.documentdb.ext.azure.com",
-      "https://main.documentdb.ext.azure.cn",
-      "https://main.documentdb.ext.azure.us",
-    ];
-
-    let warningMessageResult: string;
-    const warningMessageFunc = (msg: string) => (warningMessageResult = msg);
-
-    beforeEach(() => {
-      warningMessageResult = undefined;
-    });
-
-    afterEach(() => {
-      resetConfigContext();
-    });
-
-    it("should return no message when publicNetworkAccess is enabled", async () => {
-      updateUserContext({
-        databaseAccount: {
-          properties: {
-            publicNetworkAccess: "Enabled",
-          },
-        } as DatabaseAccount,
-      });
-
-      await getNetworkSettingsWarningMessage(warningMessageFunc);
-      expect(warningMessageResult).toBeUndefined();
-    });
-
-    it("should return publicAccessMessage when publicNetworkAccess is disabled", async () => {
-      updateUserContext({
-        databaseAccount: {
-          properties: {
-            publicNetworkAccess: "Disabled",
-          },
-        } as DatabaseAccount,
-      });
-
-      await getNetworkSettingsWarningMessage(warningMessageFunc);
-      expect(warningMessageResult).toContain(publicAccessMessagePart);
-    });
-
-    it(`should return no message when the appropriate ip rules are added to mongo/cassandra account per endpoint`, () => {
-      validEndpoints.forEach(async (endpoint) => {
-        updateUserContext({
-          databaseAccount: {
-            kind: "MongoDB",
-            properties: {
-              ipRules: PortalBackendIPs[endpoint].map((ip: string) => ({ ipAddressOrRange: ip } as IpRule)),
-              publicNetworkAccess: "Enabled",
-            },
-          } as DatabaseAccount,
-        });
-
-        updateConfigContext({
-          BACKEND_ENDPOINT: endpoint,
-        });
-
-        let asyncWarningMessageResult: string;
-        const asyncWarningMessageFunc = (msg: string) => (asyncWarningMessageResult = msg);
-
-        await getNetworkSettingsWarningMessage(asyncWarningMessageFunc);
-        expect(asyncWarningMessageResult).toBeUndefined();
-      });
-    });
-
-    it("should return accessMessage when incorrent ip rule is added to mongo/cassandra account per endpoint", () => {
-      validEndpoints.forEach(async (endpoint) => {
-        updateUserContext({
-          databaseAccount: {
-            kind: "MongoDB",
-            properties: {
-              ipRules: [{ ipAddressOrRange: "1.1.1.1" }],
-              publicNetworkAccess: "Enabled",
-            },
-          } as DatabaseAccount,
-        });
-
-        updateConfigContext({
-          BACKEND_ENDPOINT: endpoint,
-        });
-
-        let asyncWarningMessageResult: string;
-        const asyncWarningMessageFunc = (msg: string) => (asyncWarningMessageResult = msg);
-
-        await getNetworkSettingsWarningMessage(asyncWarningMessageFunc);
-        expect(asyncWarningMessageResult).toContain(accessMessagePart);
-      });
-    });
-
-    // Postgres and vcore mongo account checks basically pass through to CheckFirewallRules so those
-    // tests are omitted here and included in CheckFirewallRules.test.ts
-  });
-});

src/Utils/NetworkUtility.ts

@@ -1,7 +1,15 @@
-import { configContext } from "ConfigContext";
 import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
 import { userContext } from "UserContext";
-import { PortalBackendIPs } from "Utils/EndpointValidation";
+
+const PortalIPs: { [key: string]: string[] } = {
+  prod1: ["104.42.195.92", "40.76.54.131"],
+  prod2: ["104.42.196.69"],
+  mooncake: ["139.217.8.252"],
+  blackforest: ["51.4.229.218"],
+  fairfax: ["52.244.48.71"],
+  ussec: ["29.26.26.67", "29.26.26.66"],
+  usnat: ["7.28.202.68"],
+};
 
 export const getNetworkSettingsWarningMessage = async (
   setStateFunc: (warningMessage: string) => void
@@ -20,7 +28,6 @@ export const getNetworkSettingsWarningMessage = async (
       setStateFunc,
       accessMessage
     );
-    return;
   } else if (userContext.apiType === "VCoreMongo") {
     checkFirewallRules(
       "2023-03-01-preview",
@@ -31,7 +38,6 @@ export const getNetworkSettingsWarningMessage = async (
       setStateFunc,
       accessMessage
     );
-    return;
   } else if (accountProperties) {
     // public network access is disabled
     if (
@@ -39,14 +45,13 @@ export const getNetworkSettingsWarningMessage = async (
       accountProperties.publicNetworkAccess !== "SecuredByPerimeter"
     ) {
       setStateFunc(publicAccessMessage);
-      return;
     }
 
     const ipRules = accountProperties.ipRules;
     // public network access is NOT set to "All networks"
-    if (ipRules?.length > 0) {
+    if (ipRules.length > 0) {
       if (userContext.apiType === "Cassandra" || userContext.apiType === "Mongo") {
-        const portalIPs = PortalBackendIPs[configContext.BACKEND_ENDPOINT];
+        const portalIPs = PortalIPs[userContext.portalEnv];
         let numberOfMatches = 0;
         ipRules.forEach((ipRule) => {
           if (portalIPs.indexOf(ipRule.ipAddressOrRange) !== -1) {

src/Utils/WindowUtils.ts

@@ -1,5 +1,3 @@
-import { Platform, configContext } from "./../ConfigContext";
-
 export const getDataExplorerWindow = (currentWindow: Window): Window | undefined => {
   // Data explorer is always loaded in an iframe, so traverse the parents until we hit the top and return the first child window.
   try {
@@ -7,11 +5,7 @@ export const getDataExplorerWindow = (currentWindow: Window): Window | undefined
       if (currentWindow.parent === currentWindow) {
         return undefined;
       }
-      if (configContext.platform === Platform.Fabric && currentWindow.parent.parent === currentWindow.top) {
-        // in Fabric data explorer is inside an extension iframe, so we have two parent iframes
-        return currentWindow;
-      }
-      if (configContext.platform !== Platform.Fabric && currentWindow.parent === currentWindow.top) {
+      if (currentWindow.parent === currentWindow.top) {
         return currentWindow;
       }
       currentWindow = currentWindow.parent;

src/hooks/useKnockoutExplorer.ts

@@ -1,8 +1,6 @@
 import { createUri } from "Common/UrlUtility";
 import Explorer from "Explorer/Explorer";
-import { fetchEncryptedToken } from "Platform/Hosted/Components/ConnectExplorer";
 import { getNetworkSettingsWarningMessage } from "Utils/NetworkUtility";
-import { fetchAccessData } from "hooks/usePortalAccessToken";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
 import { useEffect, useState } from "react";
 import { AuthType } from "../AuthType";
@@ -62,26 +60,6 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
         } else if (platform === Platform.Portal) {
           const explorer = await configurePortal();
           setExplorer(explorer);
-        } else if (platform === Platform.Fabric) {
-          // TODO For now, retrieve info from session storage. Replace with info injected into Data Explorer
-          const connectionString = sessionStorage.getItem("connectionString");
-          if (!connectionString) {
-            console.error("No connection string found in session storage");
-            return;
-          }
-          const encryptedToken = await fetchEncryptedToken(connectionString);
-          // TODO Duplicated from useTokenMetadata
-          const encryptedTokenMetadata = await fetchAccessData(encryptedToken);
-
-          const win = (window as unknown) as HostedExplorerChildFrame;
-          win.hostedConfig = {
-            authType: AuthType.EncryptedToken,
-            encryptedToken,
-            encryptedTokenMetadata,
-          };
-
-          const explorer = await configureHosted();
-          setExplorer(explorer);
         }
       }
     };

src/userContext.test.ts

@@ -57,22 +57,4 @@ describe("shouldShowQueryPageOptions()", () => {
     });
     expect(userContext.apiType).toBe("Mongo");
   });
-
-  it("should be 'Postgres' for Postgres API", () => {
-    updateUserContext({
-      databaseAccount: {
-        kind: "Postgres",
-      } as DatabaseAccount,
-    });
-    expect(userContext.apiType).toBe("Postgres");
-  });
-
-  it("should be 'VCoreMongo' for vCore Mongo", () => {
-    updateUserContext({
-      databaseAccount: {
-        kind: "VCoreMongo",
-      } as DatabaseAccount,
-    });
-    expect(userContext.apiType).toBe("VCoreMongo");
-  });
 });

web.config

@@ -21,7 +21,7 @@
         <clear />
         <add name="X-Xss-Protection" value="1; mode=block" />
         <add name="X-Content-Type-Options" value="nosniff" />
-        <add name="Content-Security-Policy" value="frame-ancestors 'self' portal.azure.com *.portal.azure.com portal.azure.us portal.azure.cn portal.microsoftazure.de df.onecloud.azure-test.net *.fabric.microsoft.com *.powerbi.com *.analysis-df.windows.net" />
+        <add name="Content-Security-Policy" value="frame-ancestors 'self' portal.azure.com *.portal.azure.com portal.azure.us portal.azure.cn portal.microsoftazure.de df.onecloud.azure-test.net" />
       </customHeaders>
       <redirectHeaders>
         <clear />