From 9f3236c29ca38c44ec9314345b0be24f1858dcfb Mon Sep 17 00:00:00 2001
From: SATYA SB <107645008+satya07sb@users.noreply.github.com>
Date: Wed, 30 Apr 2025 11:35:58 +0530
Subject: [PATCH 01/16] [accessibility-3560183]:[Screen reader - Cosmos DB
 Query Copilot - Query Faster with Copilot>Enable Query Advisor]: Screen
 reader does not announce the dialog information on invoking 'Clear editor'
 button. (#2068)

Co-authored-by: Satyapriya Bai <v-satybai@microsoft.com>
---
 src/Explorer/QueryCopilot/Popup/DeletePopup.tsx       | 11 ++++++++---
 .../Popup/__snapshots__/DeletePopup.test.tsx.snap     |  8 ++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx b/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
index 2a4e29641..6e2fbed54 100644
--- a/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
+++ b/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
@@ -22,12 +22,17 @@ export const DeletePopup = ({
   };
 
   return (
-    <Modal isOpen={showDeletePopup} styles={{ main: { minHeight: "122px", minWidth: "880px" } }}>
+    <Modal
+      isOpen={showDeletePopup}
+      styles={{ main: { minHeight: "122px", minWidth: "880px" } }}
+      titleAriaId="deleteDialogTitle"
+      subtitleAriaId="deleteDialogSubTitle"
+    >
       <Stack style={{ padding: "16px 24px", height: "auto" }}>
-        <Text style={{ height: 24, fontSize: "18px" }}>
+        <Text id="deleteDialogTitle" style={{ height: 24, fontSize: "18px" }}>
           <b>Delete code?</b>
         </Text>
-        <Text style={{ marginTop: 10, marginBottom: 20 }}>
+        <Text id="deleteDialogSubTitle" style={{ marginTop: 10, marginBottom: 20 }}>
           This will clear the query from the query builder pane along with all comments and also reset the prompt pane
         </Text>
         <Stack horizontal tokens={{ childrenGap: 10 }} horizontalAlign="start">
diff --git a/src/Explorer/QueryCopilot/Popup/__snapshots__/DeletePopup.test.tsx.snap b/src/Explorer/QueryCopilot/Popup/__snapshots__/DeletePopup.test.tsx.snap
index 698138f5a..988fd88db 100644
--- a/src/Explorer/QueryCopilot/Popup/__snapshots__/DeletePopup.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Popup/__snapshots__/DeletePopup.test.tsx.snap
@@ -11,6 +11,8 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
       },
     }
   }
+  subtitleAriaId="deleteDialogSubTitle"
+  titleAriaId="deleteDialogTitle"
 >
   <Stack
     style={
@@ -21,6 +23,7 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
     }
   >
     <Text
+      id="deleteDialogTitle"
       style={
         {
           "fontSize": "18px",
@@ -33,6 +36,7 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
       </b>
     </Text>
     <Text
+      id="deleteDialogSubTitle"
       style={
         {
           "marginBottom": 20,
@@ -89,6 +93,8 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
       },
     }
   }
+  subtitleAriaId="deleteDialogSubTitle"
+  titleAriaId="deleteDialogTitle"
 >
   <Stack
     style={
@@ -99,6 +105,7 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
     }
   >
     <Text
+      id="deleteDialogTitle"
       style={
         {
           "fontSize": "18px",
@@ -111,6 +118,7 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
       </b>
     </Text>
     <Text
+      id="deleteDialogSubTitle"
       style={
         {
           "marginBottom": 20,

From 8bcad6e0e0dd9b1452b9f19a9853139c92cae6e6 Mon Sep 17 00:00:00 2001
From: Nishtha Ahuja <45535788+nishthaAhujaa@users.noreply.github.com>
Date: Wed, 30 Apr 2025 13:32:53 +0530
Subject: [PATCH 02/16] Emulator Quickstart Tutorials (#2121)

* updated all outdated sample apps
Co-authored-by: nishthaAhujaa <nishtha17354@iiittd.ac.in>
---
 less/quickstart.less | 1322 +++++++++++++++++++++---------------------
 src/quickstart.html  |   62 +-
 2 files changed, 688 insertions(+), 696 deletions(-)

diff --git a/less/quickstart.less b/less/quickstart.less
index dd9b2e33a..539d63448 100644
--- a/less/quickstart.less
+++ b/less/quickstart.less
@@ -1,927 +1,923 @@
 @import "./Common/Constants";
 
 html {
-    font-family: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
-    padding: 0px;
-    margin: 0px;
-    overflow: hidden;
+  font-family: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
+  padding: 0px;
+  margin: 0px;
+  overflow: hidden;
 }
 
 body {
-    font-family: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
-    font-size: 12px;
+  font-family: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
+  font-size: 12px;
 }
 
 .fixedleftpane {
-    background: #2f2d2d;
-    height: 100vh;
-    width: 80px;
-    float: left;
+  background: #2f2d2d;
+  height: 100vh;
+  width: 80px;
+  float: left;
 }
 
 #divQuickStart,
 #divExplorer {
-    display: inline-block;
-    width: 100%;
-    white-space: nowrap;
+  display: inline-block;
+  width: 100%;
+  white-space: nowrap;
 }
 
 #imgiconwidth1 {
-    width: 72%;
+  width: 72%;
 }
 
 #Quickstart {
-    text-align: center;
-    width: 80px;
-    height: 60px;
-    margin: 0 auto;
-    padding-top: 5px;
-    position: relative;
+  text-align: center;
+  width: 80px;
+  height: 60px;
+  margin: 0 auto;
+  padding-top: 5px;
+  position: relative;
 }
 
 .collectionheading {
-    text-transform: uppercase;
-    font-size: 10px;
+  text-transform: uppercase;
+  font-size: 10px;
 }
 
 #Quickstart #imgiconwidth1 {
-    width: 24px;
-    height: 24px;
-    position: absolute;
-    right: 27px;
+  width: 24px;
+  height: 24px;
+  position: absolute;
+  right: 27px;
 }
 
 .topSelected {
-    border-left: 4px solid @AccentMediumHigh;
-    background: #666666;
+  border-left: 4px solid @AccentMediumHigh;
+  background: #666666;
 }
 
 .topSelected:hover {
-    border-left: 4px solid @AccentMediumHigh;
-    background: #666666!important;
-    cursor: default!important;
+  border-left: 4px solid @AccentMediumHigh;
+  background: #666666 !important;
+  cursor: default !important;
 }
 
 #Quickstart:hover span.activemenu,
 #Quickstart:active span.activemenu {
-    color: #fff;
+  color: #fff;
 }
 
 #Explorer:hover span.menuExplorer,
 #Explorer:active span.menuExplorer {
-    color: #fff;
+  color: #fff;
 }
 
 menuQuickStart {
-    margin-left: 0;
-    padding-left: 0;
-    display: block;
-    right: 12px;
-    top: 30px;
-    position: absolute;
+  margin-left: 0;
+  padding-left: 0;
+  display: block;
+  right: 12px;
+  top: 30px;
+  position: absolute;
 }
 
 #Explorer {
-    text-align: center;
-    display: inline-block;
-    width: 80px;
-    height: 60px;
-    margin: 0 auto;
-    padding-top: 9px;
-    position: relative;
+  text-align: center;
+  display: inline-block;
+  width: 80px;
+  height: 60px;
+  margin: 0 auto;
+  padding-top: 9px;
+  position: relative;
 }
 
 #Explorer #imgiconwidth1,
 .feedbackstyle #imgiconwidth1,
 .settingstyle #imgiconwidth1 {
-    width: 24px;
-    height: 24px;
-    position: absolute;
-    right: 30px;
+  width: 24px;
+  height: 24px;
+  position: absolute;
+  right: 30px;
 }
 
 #Explorer span.menuExplorer {
-    margin-left: 0;
-    padding-left: 0;
-    display: block;
-    right: 19px;
-    top: 33px;
-    position: absolute;
+  margin-left: 0;
+  padding-left: 0;
+  display: block;
+  right: 19px;
+  top: 33px;
+  position: absolute;
 }
 
 .feedbackstyle span.menuExplorer {
-    margin-left: 0;
-    padding-left: 0;
-    display: block;
-    right: 19px;
-    top: 33px;
-    position: absolute;
+  margin-left: 0;
+  padding-left: 0;
+  display: block;
+  right: 19px;
+  top: 33px;
+  position: absolute;
 }
 
 .settingstyle span.menuExplorer {
-    margin-left: 0;
-    padding-left: 0;
-    display: block;
-    right: 19px;
-    top: 33px;
-    position: absolute;
+  margin-left: 0;
+  padding-left: 0;
+  display: block;
+  right: 19px;
+  top: 33px;
+  position: absolute;
 }
 
 .content {
-    display: inline-block;
-    width: 100%;
-    transition: all .4s ease-in-out;
-    -ms-transition: all .4s ease-in-out;
-    -webkit-transition: all .4s ease-in-out;
-    -moz-transition: all .4s ease-in-out;
-    height: 100vh;
+  display: inline-block;
+  width: 100%;
+  transition: all 0.4s ease-in-out;
+  -ms-transition: all 0.4s ease-in-out;
+  -webkit-transition: all 0.4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
+  height: 100vh;
 }
 
 .mini {
-    width: 0%;
-    float: left;
-    transition: all .4s ease-in-out;
-    -webkit-transition: all .4s ease-in-out;
-    -moz-transition: all .4s ease-in-out;
-    height: 100vh;
-    background-color: white;
+  width: 0%;
+  float: left;
+  transition: all 0.4s ease-in-out;
+  -webkit-transition: all 0.4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
+  height: 100vh;
+  background-color: white;
 }
 
 #sidebar-wrapper {
-    z-index: 1000;
-    position: fixed;
-    left: 250px;
-    width: 0;
-    height: 100%;
-    margin-left: -250px;
-    overflow-y: auto;
-    background: white;
-    -webkit-transition: all 0.5s ease;
-    -moz-transition: all 0.5s ease;
-    -o-transition: all 0.5s ease;
-    transition: all 0.5s ease;
+  z-index: 1000;
+  position: fixed;
+  left: 250px;
+  width: 0;
+  height: 100%;
+  margin-left: -250px;
+  overflow-y: auto;
+  background: white;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+  transition: all 0.5s ease;
 }
 
 .toggle-left {
-    width: 0%;
-    overflow: hidden;
+  width: 0%;
+  overflow: hidden;
 }
 
 .toggle-minicontent {
-    width: 100%;
+  width: 100%;
 }
 
 .toggle-maincontent {
-    width: 100%;
+  width: 100%;
 }
 
 .toggle-mini {
-    width: 50px;
+  width: 50px;
 }
 
 .toggle-main {
-    width: 100%;
+  width: 100%;
 }
 
 .activepartitionmode {
-    background-color: @AccentMediumHigh;
+  background-color: @AccentMediumHigh;
 }
 
 .paddingpartition {
-    color: white;
-    padding-left: 15px;
-    padding-top: 25px;
+  color: white;
+  padding-left: 15px;
+  padding-top: 25px;
 }
 
 .paddingspan2 {
-    padding-top: 20px;
-    color: #000;
-    padding-left: 15px;
+  padding-top: 20px;
+  color: #000;
+  padding-left: 15px;
 }
 
 .paddingspan4 {
-    padding-top: 20px;
-    padding-bottom: 20px;
-    color: white;
-    padding-left: 15px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  color: white;
+  padding-left: 15px;
 }
 
 .whitegroove {
-    width: 344px;
-    border: groove;
+  width: 344px;
+  border: groove;
 }
 
 .dropdownbtn {
-    color: white;
-    width: 340px;
-    background: #262626;
+  color: white;
+  width: 340px;
+  background: #262626;
 }
 
 .queryclr {
-    color: white;
-    background: #262626;
+  color: white;
+  background: #262626;
 }
 
 .pointer {
-    cursor: pointer;
+  cursor: pointer;
 }
 
-#tbodycontent>tr>td {
-    border-bottom: 1px solid #cccccc;
+#tbodycontent > tr > td {
+  border-bottom: 1px solid #cccccc;
 }
 
-#tbodycontent>tr:last-child>td {
-    border-bottom: 1px solid #ddd;
+#tbodycontent > tr:last-child > td {
+  border-bottom: 1px solid #ddd;
 }
 
 .gridRowSelected {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .gridRowSelected:hover {
-    background-color: #DEF!important;
-    cursor: initial;
+  background-color: #def !important;
+  cursor: initial;
 }
 
 .collectionNodeSelected {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .collectionNodeSelected:hover {
-    background-color: #DEF!important;
-    cursor: default!important;
+  background-color: #def !important;
+  cursor: default !important;
 }
 
 .databaseNodeSelected {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .databaseNodeSelected:hover {
-    background-color: #DEF!important;
-    cursor: default!important;
+  background-color: #def !important;
+  cursor: default !important;
 }
 
 .leftsidepanle-hr {
-    margin: 16px 0px;
-    border-top: 1px solid #eee;
-    margin-left: -17px;
-    width: 100%;
-    color: 1px solid #53575B;
+  margin: 16px 0px;
+  border-top: 1px solid #eee;
+  margin-left: -17px;
+  width: 100%;
+  color: 1px solid #53575b;
 }
 
 .partitioning-btn {
-    padding-bottom: 16px;
+  padding-bottom: 16px;
 }
 
 .btncreatecoll1 {
-    border: 1px solid @AccentMediumHigh;
-    background-color: @AccentMediumHigh;
-    color: #fff;
-    padding: 2px 30px;
-    cursor: pointer;
-    font-size: 12px;
+  border: 1px solid @AccentMediumHigh;
+  background-color: @AccentMediumHigh;
+  color: #fff;
+  padding: 2px 30px;
+  cursor: pointer;
+  font-size: 12px;
 }
 
 .btncreatecoll1:hover {
-    background: @AccentMediumHigh;
-    color: #fff;
-    border-color: @AccentMediumHigh;
-    cursor: pointer;
-    font-size: 12px;
+  background: @AccentMediumHigh;
+  color: #fff;
+  border-color: @AccentMediumHigh;
+  cursor: pointer;
+  font-size: 12px;
 }
 
 .btncreatecoll1:active {
-    border: 1px solid #0072c6;
-    background-color: #0072c6;
-    color: white;
-    padding: 2px 30px;
-    cursor: pointer;
-    font-size: 12px;
+  border: 1px solid #0072c6;
+  background-color: #0072c6;
+  color: white;
+  padding: 2px 30px;
+  cursor: pointer;
+  font-size: 12px;
 }
 
 .btncreatecoll1-off {
-    border: 1px solid #969696;
-    background-color: #000;
-    color: white;
-    padding: 2px 30px;
-    cursor: pointer;
-    font-size: 12px;
-    margin-left: -5px;
+  border: 1px solid #969696;
+  background-color: #000;
+  color: white;
+  padding: 2px 30px;
+  cursor: pointer;
+  font-size: 12px;
+  margin-left: -5px;
 }
 
 .leftpanel-okbut {
-    padding: 20px 0px 24px 30px;
+  padding: 20px 0px 24px 30px;
 }
 
 .btnpricepad {
-    margin-left: 24px;
+  margin-left: 24px;
 }
 
 .collid {
-    background: #fff;
-    width: calc(~"100% - 80px");
+  background: #fff;
+  width: calc(~"100% - 80px");
 }
 
 .textfontclr {
-    color: #000;
+  color: #000;
 }
 
 .collid-white {
-    width: 100%;
-    border: solid 1px #DDD;
+  width: 100%;
+  border: solid 1px #ddd;
 }
 
 .plusimg-but {
-    background-image: url(../images/plus_normal.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/plus_normal.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .plusimg-but:hover {
-    background-image: url(../images/plus_hover.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/plus_hover.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .plusimg-but:active {
-    background-image: url(../images/plus_pressed.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/plus_pressed.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .plusimg-but:disabled {
-    background-image: url(../images/plus_disabled.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/plus_disabled.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .minusimg-but {
-    background-image: url(../images/minus_normal.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/minus_normal.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .minusimg-but:hover {
-    background-image: url(../images/minus_hover.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/minus_hover.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .minusimg-but:active {
-    background-image: url(../images/minus_pressed.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/minus_pressed.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .minusimg-but:disabled {
-    background-image: url(../images/minus_disabled.svg);
-    background-repeat: no-repeat;
-    padding: 6px 16px;
-    position: static;
-    padding-top: 4px;
+  background-image: url(../images/minus_disabled.svg);
+  background-repeat: no-repeat;
+  padding: 6px 16px;
+  position: static;
+  padding-top: 4px;
 }
 
 .firstdivbg {
-    padding: @MediumSpace 0px @DefaultSpace (2 * @LargeSpace);
-    background-color: @BaseLight;
+  padding: @MediumSpace 0px @DefaultSpace (2 * @LargeSpace);
+  background-color: @BaseLight;
 }
 
 p {
-    margin: 0 0 4px;
-    color: #000;
+  margin: 0 0 4px;
+  color: #000;
 }
 
 .closeImg {
-    float: right;
-    margin: 0px 20px 0px 0px;
-    cursor: pointer;
-    padding: 6px 20px 20px 6px;
-    width: 20px;
-    height: 20px;
+  float: right;
+  margin: 0px 20px 0px 0px;
+  cursor: pointer;
+  padding: 6px 20px 20px 6px;
+  width: 20px;
+  height: 20px;
 }
 
 .seconddivpadding {
-    padding-top: 16px;
+  padding-top: 16px;
 }
 
 .seconddivbg {
-    height: 100vh;
-    padding-left: 32px;
-    padding-top: 16px;
+  height: 100vh;
+  padding-left: 32px;
+  padding-top: 16px;
 }
 
 .pkPadding {
-    padding-top: 12px;
+  padding-top: 12px;
 }
 
 .mandatoryStar {
-    color: #ff0707;
-    font-size: 14px;
-    font-weight: bold;
+  color: #ff0707;
+  font-size: 14px;
+  font-weight: bold;
 }
 
 .pricingtierimg {
-    padding-left: 20px;
-    padding-top: 10px;
-    padding-bottom: 20px;
+  padding-left: 20px;
+  padding-top: 10px;
+  padding-bottom: 20px;
 }
 
 .headerline {
-    color: @BaseDark;
-    font-size: 16px;
-    border-bottom: 1px solid @BaseMedium; 
+  color: @BaseDark;
+  font-size: 16px;
+  border-bottom: 1px solid @BaseMedium;
 }
 
 .partitionkeystyle {
-    font-size: 10px;
+  font-size: 10px;
 }
 
 .arrowprice {
-    margin-left: 230px;
+  margin-left: 230px;
 }
 
 .paddingspan {
-    padding: 20px;
-    color: white;
-    font-size: 14px;
+  padding: 20px;
+  color: white;
+  font-size: 14px;
 }
 
 input::-webkit-calendar-picker-indicator {
-    opacity: 100;
+  opacity: 100;
 }
 
 .paddingspan3 {
-    color: white;
-    font-size: 14px;
-    position: absolute;
-    width: 100%;
-    height: 100px;
-    bottom: 150px;
+  color: white;
+  font-size: 14px;
+  position: absolute;
+  width: 100%;
+  height: 100px;
+  bottom: 150px;
 }
 
 .paddingspan4 {
-    padding-top: 20px;
-    padding-left: 20px;
-    color: white;
-    font-size: 14px;
+  padding-top: 20px;
+  padding-left: 20px;
+  color: white;
+  font-size: 14px;
 }
 
 .closebtnn {
-    float: right;
-    padding: 0 10px;
-    cursor: pointer;
+  float: right;
+  padding: 0 10px;
+  cursor: pointer;
 }
 
 label {
-    white-space: nowrap;
-    font: 12px "Segoe UI";
+  white-space: nowrap;
+  font: 12px "Segoe UI";
 }
 
 .Introlines {
-    padding-top: 27px;
-    padding-left: 25px;
+  padding-top: 27px;
+  padding-left: 25px;
 }
 
 .Introline1 {
-    font-size: 16px;
+  font-size: 16px;
 }
 
 .Introline2 {
-    font-size: 14px;
-    padding-top: 10px;
+  font-size: 14px;
+  padding-top: 10px;
 }
 
 .datalist-arrow {
-    position: relative;
+  position: relative;
 }
 
 .datalist-arrow:hover:after {
-    background: #969696;
+  background: #969696;
 }
 
 .datalist-arrow:focus:after,
 .datalist-arrow:active:after {
-    background: #1EBBEE;
+  background: #1ebbee;
 }
 
 input::-webkit-calendar-picker-indicator::after {
-    content: '\276F';
-    right: 0;
-    top: -8%;
-    display: block;
-    width: 27px;
-    height: 25px;
-    line-height: 25px;
-    color: #fff;
-    text-align: center;
-    pointer-events: none;
-    transform: rotate(90deg);
+  content: "\276F";
+  right: 0;
+  top: -8%;
+  display: block;
+  width: 27px;
+  height: 25px;
+  line-height: 25px;
+  color: #fff;
+  text-align: center;
+  pointer-events: none;
+  transform: rotate(90deg);
 }
 
 .datalist-arrow:after:hover {
-    content: '\276F';
-    position: absolute;
-    right: 1px;
-    top: 6%;
-    transform: rotate(90deg);
-    display: block;
-    width: 27px;
-    height: 25px;
-    line-height: 25px;
-    color: #fff;
-    text-align: center;
-    pointer-events: none;
-    background-color: #1EBBEE;
+  content: "\276F";
+  position: absolute;
+  right: 1px;
+  top: 6%;
+  transform: rotate(90deg);
+  display: block;
+  width: 27px;
+  height: 25px;
+  line-height: 25px;
+  color: #fff;
+  text-align: center;
+  pointer-events: none;
+  background-color: #1ebbee;
 }
 
 .Introline3 {
-    padding-top: 10px;
-    font-size: 14px;
-    font-weight: 1000;
+  padding-top: 10px;
+  font-size: 14px;
+  font-weight: 1000;
 }
 
 .collectionCollapsed {
-    color: black;
-    font-weight: 400;
-    font-size: 14px;
-    position: relative;
-    display: block;
-    padding: 8px 15px;
-    cursor: pointer;
-    margin-right: 13px;
-    border: 1px solid #fff;
+  color: black;
+  font-weight: 400;
+  font-size: 14px;
+  position: relative;
+  display: block;
+  padding: 8px 15px;
+  cursor: pointer;
+  margin-right: 13px;
+  border: 1px solid #fff;
 }
 
 .collectionCollapsed:hover {
-    background: #EEEEEE;
+  background: #eeeeee;
 }
 
 .collectionCollapsed:active {
-    border: solid 1px @AccentMediumHigh;
+  border: solid 1px @AccentMediumHigh;
 }
 
 .collectionCollapsed:focus {
-    border: Solid 1px @AccentMediumHigh;
+  border: Solid 1px @AccentMediumHigh;
 }
 
 .arrowCollapsed {
-    cursor: pointer;
-    width: 16px;
-    height: 16px;
-    transform: rotate(-90deg) translateX(-100%);
-    -webkit-transform: rotate(-90deg) translateX(-100%);
-    -ms-transform: rotate(-90deg) translateX(-100%);
-    margin: -30px 3px 0px 2px;
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  transform: rotate(-90deg) translateX(-100%);
+  -webkit-transform: rotate(-90deg) translateX(-100%);
+  -ms-transform: rotate(-90deg) translateX(-100%);
+  margin: -30px 3px 0px 2px;
 }
 
 .leftarrowCollapsed {
-    padding: 2px 4px 4px 5px;
-    border: solid 1px #FFF;
-    margin: 6px 4px 0px -11px;
+  padding: 2px 4px 4px 5px;
+  border: solid 1px #fff;
+  margin: 6px 4px 0px -11px;
 }
 
 .leftarrowCollapsed:hover {
-    background-color: #EEEEEE;
+  background-color: #eeeeee;
 }
 
 .leftarrowCollapsed:active {
-    border: solid 1px @AccentMediumHigh;
+  border: solid 1px @AccentMediumHigh;
 }
 
 .leftarrowCollapsed:focus {
-    border: Solid 1px @AccentMediumHigh;
+  border: Solid 1px @AccentMediumHigh;
 }
 
 .qslevel {
-    padding-top: 10px;
-    padding-left: 10px;
-    width: 60%;
-    min-width: 960px;
+  padding-top: 10px;
+  padding-left: 10px;
+  width: 60%;
+  min-width: 960px;
 }
 
 .nav-tabs-margin {
-    margin-top: 20px;
+  margin-top: 20px;
 }
 
 .numbersize {
-    font-size: 30px;
-    display: inline;
-    font-weight: 600;
+  font-size: 30px;
+  display: inline;
+  font-weight: 600;
 }
 
 .numbersizePadding {
-    padding-right: 5px;
+  padding-right: 5px;
 }
 
 .numberheading {
-    display: inline;
-    position: absolute;
-    padding-top: 10px;
-    font-size: 16px;
-    padding-left: 15px;
+  display: inline;
+  position: absolute;
+  padding-top: 10px;
+  font-size: 16px;
+  padding-left: 15px;
 }
 
-.numberheading>p {
-    padding-top: 10px;
-    font-size: 12px;
+.numberheading > p {
+  padding-top: 10px;
+  font-size: 12px;
 }
 
-.numberheading>ul {
-    padding-top: 10px;
-    padding-left: 0px;
-    list-style-type: none;
+.numberheading > ul {
+  padding-top: 10px;
+  padding-left: 0px;
+  list-style-type: none;
 }
 
 .numberheading ul li {
-    padding-bottom: 5px;
+  padding-bottom: 5px;
 }
 
-.numberheading>ul>li>a {
-    font-size: 12px;
-    color: #0058ad;
+.numberheading > ul > li > a {
+  font-size: 12px;
+  color: #0058ad;
 }
 
-.netApp {
-    padding-bottom: 80px;
-}
-
-.pythonApp {
-    padding-bottom: 45px;
+.sampleApp {
+  padding-bottom: 45px;
 }
 
 .step1 {
-    padding-bottom: 110px;
+  padding-bottom: 110px;
 }
 
-.step1>input {
-    font-size: 12px;
+.step1 > input {
+  font-size: 12px;
 }
 
 .btncreatecoll {
-    background: #0058ad;
-    color: #fff;
-    padding: 5px 20px;
-    cursor: pointer;
-    font-size: 12px;
-    border: 1px solid #0058ad;
+  background: #0058ad;
+  color: #fff;
+  padding: 5px 20px;
+  cursor: pointer;
+  font-size: 12px;
+  border: 1px solid #0058ad;
 }
 
 .btncreatecoll:hover {
-    background-color: #0074e0;
+  background-color: #0074e0;
 }
 
 .atags:focus {
-    color: @AccentMediumHigh;
+  color: @AccentMediumHigh;
 }
 
 .atags {
-    color: @AccentMediumHigh;
-    font-weight: 400;
-    cursor: pointer
+  color: @AccentMediumHigh;
+  font-weight: 400;
+  cursor: pointer;
 }
 
 .qsmenuicons {
-    width: 25px;
-    height: 25px;
-    margin-right: 5px;
+  width: 25px;
+  height: 25px;
+  margin-right: 5px;
 }
 
 .HeaderBg {
-    background-color: #202428;
-    height: 60px;
+  background-color: #202428;
+  height: 60px;
 }
 
 .title {
-    color: @AccentMediumHigh;
-    font-size: 20px;
-    padding-left: 10px;
+  color: @AccentMediumHigh;
+  font-size: 20px;
+  padding-left: 10px;
 }
 
 .items {
-    padding-left: 24px;
-    padding-top: 15px;
+  padding-left: 24px;
+  padding-top: 15px;
 }
 
 .divmenuquickstartpadding {
-    padding-left: 24px;
-    padding-bottom: 8px;
+  padding-left: 24px;
+  padding-bottom: 8px;
 }
 
 .menuQuickStart {
-    font-size: 12px;
-    color: white;
-    padding-left: 10px;
+  font-size: 12px;
+  color: white;
+  padding-left: 10px;
 }
 
 .menuExplorer {
-    font-size: 12px;
-    color: white;
-    padding-left: 20px;
+  font-size: 12px;
+  color: white;
+  padding-left: 20px;
 }
 
 .activemenu {
-    color: #fff;
+  color: #fff;
 }
 
 .rightarrowimg {
-    padding-left: 5px;
-    padding-bottom: 2px;
+  padding-left: 5px;
+  padding-bottom: 2px;
 }
 
 a:hover,
 a:visited,
 a:active,
 a:link {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 .command {
-    padding: 8px;
+  padding: 8px;
 }
 
 .command:hover {
-    background-color: #E6E6E6;
-    cursor: pointer;
-    padding-bottom: 12px;
+  background-color: #e6e6e6;
+  cursor: pointer;
+  padding-bottom: 12px;
 }
 
 .command:active {
-    background-color: #CCCCCC;
-    border: solid 1px @AccentMediumHigh;
+  background-color: #cccccc;
+  border: solid 1px @AccentMediumHigh;
 }
 
 .command:focus {
-    padding: 7px 8px 11px 8px;
-    border: solid 1px @AccentMediumHigh;
-    outline: none;
+  padding: 7px 8px 11px 8px;
+  border: solid 1px @AccentMediumHigh;
+  outline: none;
 }
 
-.nav>li>a:focus {
-    background-color: white;
+.nav > li > a:focus {
+  background-color: white;
 }
 
 .commandIcon {
-    margin: 0 5px 0 0;
-    vertical-align: text-top;
-    width: 18px;
-    height: 18px;
+  margin: 0 5px 0 0;
+  vertical-align: text-top;
+  width: 18px;
+  height: 18px;
 }
 
 .iconpadclick {
-    background-color: #e6e6e6;
-    cursor: pointer;
-    border: 1px solid #1ebbee;
-    padding: 5px;
+  background-color: #e6e6e6;
+  cursor: pointer;
+  border: 1px solid #1ebbee;
+  padding: 5px;
 }
 
 .divimgleftarrow {
-    display: inline-block;
-    margin-top: 16px;
-    margin-right: 10px;
+  display: inline-block;
+  margin-top: 16px;
+  margin-right: 10px;
 }
 
 .divimgleftarrow:hover {
-    background-color: #e6e6e6;
-    cursor: pointer;
-    border: 1px solid #1ebbee;
+  background-color: #e6e6e6;
+  cursor: pointer;
+  border: 1px solid #1ebbee;
 }
 
 .adddeliconspan {
-    display: none;
-    float: right;
-    padding: 5px;
+  display: none;
+  float: right;
+  padding: 5px;
 }
 
 .spanparent:hover .adddeliconspan {
-    display: inline;
+  display: inline;
 }
 
 .spanchild:hover .adddeliconspan {
-    display: inline;
+  display: inline;
 }
 
 .collectiontitle {
-    font-size: 14px;
-    text-transform: uppercase;
+  font-size: 14px;
+  text-transform: uppercase;
 }
 
 .titlepadcol {
-    padding-left: 20px;
-    font-weight: 500;
-    height: 28px;
-    display: inline-block;
-    padding-top: 5px;
+  padding-left: 20px;
+  font-weight: 500;
+  height: 28px;
+  display: inline-block;
+  padding-top: 5px;
 }
 
 .btnmainslide {
-    height: 14px;
-    margin-top: 14px;
-    cursor: pointer;
+  height: 14px;
+  margin-top: 14px;
+  cursor: pointer;
 }
 
 .well {
-    padding: 19px 0px;
-    padding-top: 0px;
-    margin-bottom: 20px;
-    border: 0px;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0);
-    background: white;
+  padding: 19px 0px;
+  padding-top: 0px;
+  margin-bottom: 20px;
+  border: 0px;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0);
+  background: white;
 }
 
 .splitter {
-    z-index: 1;
-    border-left: 5px solid white;
-    width: 8px;
-    border-right: 1px solid #cccccc;
-    float: left;
-    height: 100%;
-    position: absolute;
-    margin-left: 240px;
-    padding: 0px;
-    background-color: white;
+  z-index: 1;
+  border-left: 5px solid white;
+  width: 8px;
+  border-right: 1px solid #cccccc;
+  float: left;
+  height: 100%;
+  position: absolute;
+  margin-left: 240px;
+  padding: 0px;
+  background-color: white;
 }
 
 .testClass {
-    padding-left: 30px;
+  padding-left: 30px;
 }
 
 .level {
-    padding-left: 16px;
-    padding-top: 0px;
+  padding-left: 16px;
+  padding-top: 0px;
 }
 
 .imgiconwidth {
-    margin-right: 5px;
+  margin-right: 5px;
 }
 
 .id {
-    padding-left: 8px;
-    color: #000;
-    font-weight: bold;
-    margin-left: 6px;
+  padding-left: 8px;
+  color: #000;
+  font-weight: bold;
+  margin-left: 6px;
 }
 
 .documentsGridHeaderContainer {
-    padding-left: 5px;
-    padding-right: 15px;
-    width: 200px;
+  padding-left: 5px;
+  padding-right: 15px;
+  width: 200px;
 }
 
 .documentsGridHeader {
-    padding: 8px;
-    color: #000;
-    font-weight: bold;
+  padding: 8px;
+  color: #000;
+  font-weight: bold;
 }
 
 .fixedWidthHeader {
-    width: 82px;
+  width: 82px;
 }
 
 .tabdocuments {
-    padding: 4px 4px -1px 0px;
+  padding: 4px 4px -1px 0px;
 }
 
-#divcontent>.mongoDocumentEditor .monaco-editor.vs .redsquiggly {
-    display: none !important;
+#divcontent > .mongoDocumentEditor .monaco-editor.vs .redsquiggly {
+  display: none !important;
 }
 
 td a {
-    color: #393939;
+  color: #393939;
 }
 
 td a:hover {
-    color: #393939;
+  color: #393939;
 }
 
 .loadMore {
-    padding-left: 32%;
-    cursor: pointer;
+  padding-left: 32%;
+  cursor: pointer;
 }
 
 .table-fixed thead {
-    width: 97%;
-    padding-left: 18px;
+  width: 97%;
+  padding-left: 18px;
 }
 
 .table-fixed tbody {
-    height: 510px;
-    overflow-y: auto;
-    width: 100%;
-    overflow-x: hidden;
+  height: 510px;
+  overflow-y: auto;
+  width: 100%;
+  overflow-x: hidden;
 }
 
 .table-fixed thead,
@@ -929,383 +925,383 @@ td a:hover {
 .table-fixed tr,
 .table-fixed td,
 .table-fixed th {
-    display: block;
+  display: block;
 }
 
 .table-fixed tbody td,
-.table-fixed thead>tr>th {
-    float: left;
-    border-bottom-width: 0;
+.table-fixed thead > tr > th {
+  float: left;
+  border-bottom-width: 0;
 }
 
 a:hover,
 a:visited,
 a:active,
 a:link {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 .tabs {
-    position: relative;
-    clear: both;
-    margin: 15px 0 25px 0;
-    display: table;
-    width: 100%;
+  position: relative;
+  clear: both;
+  margin: 15px 0 25px 0;
+  display: table;
+  width: 100%;
 }
 
 .tab {
-    float: left;
+  float: left;
 }
 
 .tab label {
-    padding: 10px;
-    border: 1px solid #bbbbbb;
-    margin-left: -1px;
-    position: inherit;
-    left: 1px;
-    color: #393939;
+  padding: 10px;
+  border: 1px solid #bbbbbb;
+  margin-left: -1px;
+  position: inherit;
+  left: 1px;
+  color: #393939;
 }
 
-.tab [type=radio] {
-    display: none;
+.tab [type="radio"] {
+  display: none;
 }
 
 .tabcontent {
-    position: absolute;
-    top: 30px;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    padding: 15px 0px 20px 0;
+  position: absolute;
+  top: 30px;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 15px 0px 20px 0;
 }
 
-.tab [type=radio]:checked~label {
-    border: 1px solid #0072c6;
-    background-color: @AccentMediumHigh;
-    color: white;
-    z-index: 2;
+.tab [type="radio"]:checked ~ label {
+  border: 1px solid #0072c6;
+  background-color: @AccentMediumHigh;
+  color: white;
+  z-index: 2;
 }
 
-.tab [type=radio]:checked~label:hover {
-    border: 1px solid @AccentMediumHigh;
-    background-color: @AccentMediumHigh;
-    color: white;
-    z-index: 2;
+.tab [type="radio"]:checked ~ label:hover {
+  border: 1px solid @AccentMediumHigh;
+  background-color: @AccentMediumHigh;
+  color: white;
+  z-index: 2;
 }
 
-.tab [type=radio]:checked~label:active {
-    border: 1px solid #0072c6;
-    background-color: #0072c6;
-    color: white;
-    z-index: 2;
+.tab [type="radio"]:checked ~ label:active {
+  border: 1px solid #0072c6;
+  background-color: #0072c6;
+  color: white;
+  z-index: 2;
 }
 
-.tab [type=radio]:checked~label~.tabcontent {
-    z-index: 1;
-    display: initial;
+.tab [type="radio"]:checked ~ label ~ .tabcontent {
+  z-index: 1;
+  display: initial;
 }
 
-.tab [type=radio]:not(:checked)~label:hover {
-    border: 1px solid #969696;
-    background-color: #969696;
-    color: white;
-    cursor: pointer;
+.tab [type="radio"]:not(:checked) ~ label:hover {
+  border: 1px solid #969696;
+  background-color: #969696;
+  color: white;
+  cursor: pointer;
 }
 
-.tab [type=radio]:not(:checked)~label~.tabcontent {
-    display: none;
+.tab [type="radio"]:not(:checked) ~ label ~ .tabcontent {
+  display: none;
 }
 
 ::-webkit-input-placeholder {
-    color: #969696;
+  color: #969696;
 }
 
 ::-moz-placeholder {
-    color: #969696;
+  color: #969696;
 }
 
 :-ms-input-placeholder {
-    color: #969696;
+  color: #969696;
 }
 
 :-moz-placeholder {
-    color: #969696;
+  color: #969696;
 }
 
 ::-ms-expand {
-    color: #969696;
+  color: #969696;
 }
 
 .form-errors {
-    color: white;
-    padding-left: 12px;
+  color: white;
+  padding-left: 12px;
 }
 
 .atagdetails {
-    padding-left: 55px!important;
+  padding-left: 55px !important;
 }
 
 .path {
-    color: lightgray;
-    font-style: italic;
-    padding-top: 12px;
-    padding-left: 20px;
+  color: lightgray;
+  font-style: italic;
+  padding-top: 12px;
+  padding-left: 20px;
 }
 
 .queryPath {
-    line-height: 16px;
-    padding-left: 33px;
-    padding-bottom: 12px;
+  line-height: 16px;
+  padding-left: 33px;
+  padding-bottom: 12px;
 }
 
 .filterDocCollapsed {
-    padding-left: 20px;
+  padding-left: 20px;
 }
 
 .filterDocCollapsed.active {
-    display: block;
+  display: block;
 }
 
 .filterDocExpanded {
-    padding-left: 20px;
+  padding-left: 20px;
 }
 
 .filterDocExpanded.active {
-    display: block;
+  display: block;
 }
 
 .filterbuttonpad {
-    padding-top: 10px;
+  padding-top: 10px;
 }
 
 .filterbtnstyle {
-    background: @AccentMediumHigh;
-    width: 90px;
-    height: 25px;
-    color: white;
-    border: none;
-    margin-left: 16px !important;
+  background: @AccentMediumHigh;
+  width: 90px;
+  height: 25px;
+  color: white;
+  border: none;
+  margin-left: 16px !important;
 }
 
 .filterbtnstyle:hover {
-    background: @AccentMediumHigh;
-    width: 90px;
-    height: 25px;
-    color: white;
-    border: none;
-    margin-left: 16px;
+  background: @AccentMediumHigh;
+  width: 90px;
+  height: 25px;
+  color: white;
+  border: none;
+  margin-left: 16px;
 }
 
 .filterbtnstyle:active {
-    background: #0072c6;
-    width: 90px;
-    height: 25px;
-    color: white;
-    border: none;
-    margin-left: 16px;
+  background: #0072c6;
+  width: 90px;
+  height: 25px;
+  color: white;
+  border: none;
+  margin-left: 16px;
 }
 
 .filterbtnstyle:focus {
-    background: #0072c6;
-    width: 90px;
-    height: 25px;
-    color: white;
-    border: none;
-    margin-left: 16px;
-    border: 1px solid #0072c6;
+  background: #0072c6;
+  width: 90px;
+  height: 25px;
+  color: white;
+  border: none;
+  margin-left: 16px;
+  border: 1px solid #0072c6;
 }
 
 .filterbtnstyle:not(:enabled) {
-    background: lightgray;
-    width: 90px;
-    height: 25px;
-    color: white;
-    border: none;
+  background: lightgray;
+  width: 90px;
+  height: 25px;
+  color: white;
+  border: none;
 }
 
 .hrline1 {
-    color: #d6d7d8;
-    margin-left: -20px;
+  color: #d6d7d8;
+  margin-left: -20px;
 }
 
 .filtdocheader {
-    font-size: 18px;
+  font-size: 18px;
 }
 
 .editFilter {
-    margin-left: 20px;
+  margin-left: 20px;
 }
 
 .filterdivs {
-    padding-top: 24px;
-    height: 45px;
-    margin-bottom: 20px;
+  padding-top: 24px;
+  height: 45px;
+  margin-bottom: 20px;
 }
 
 .filterclose {
-    padding: 0 10px;
-    cursor: pointer;
+  padding: 0 10px;
+  cursor: pointer;
 }
 
 .queryResultpreviousImg {
-    height: 14px;
-    width: 14px;
-    margin-right: 2px;
+  height: 14px;
+  width: 14px;
+  margin-right: 2px;
 }
 
 .queryResultnextImg {
-    height: 14px;
-    width: 14px;
-    margin-left: 2px;
+  height: 14px;
+  width: 14px;
+  margin-left: 2px;
 }
 
 .rowoverride {
-    margin-left: 7px;
-    margin-top: 20px;
+  margin-left: 7px;
+  margin-top: 20px;
 }
 
 .tab-content-override {
-    padding-left: 5px;
-    padding-top: 20px;
+  padding-left: 5px;
+  padding-top: 20px;
 }
 
 .paddingspan4 {
-    padding-top: 20px;
-    color: white;
-    padding-left: 25px;
-    padding-right: 25px;
+  padding-top: 20px;
+  color: white;
+  padding-left: 25px;
+  padding-right: 25px;
 }
 
 .colResizePointer {
-    cursor: col-resize;
+  cursor: col-resize;
 }
 
-.nav-tabs>li>a {
-    border-radius: 2px 2px 0 0;
-    padding: 8px 0px 4px 0px;
-    color: #393939;
-    width: 130px;
-    text-align: center;
-    margin-right: 0px;
-    position: relative;
+.nav-tabs > li > a {
+  border-radius: 2px 2px 0 0;
+  padding: 8px 0px 4px 0px;
+  color: #393939;
+  width: 130px;
+  text-align: center;
+  margin-right: 0px;
+  position: relative;
 }
 
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li.active>a:hover {
-    border-bottom-color: #FFF;
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li.active > a:hover {
+  border-bottom-color: #fff;
 }
 
 .tabList {
-    float: left;
-    margin-bottom: -15px !important;
+  float: left;
+  margin-bottom: -15px !important;
 }
 
 .tab_Content {
-    width: 130px;
-    border-right: 1px solid #e0e0e0;
-    padding: 0px 22px 0px 17px;
-    margin-left: -1px;
+  width: 130px;
+  border-right: 1px solid #e0e0e0;
+  padding: 0px 22px 0px 17px;
+  margin-left: -1px;
 }
 
 .tab_Content:hover {
-    width: 130px;
-    border-right: 1px solid #e0e0e0;
-    padding: 0px 22px 0px 17px;
-    margin-left: -1px;
+  width: 130px;
+  border-right: 1px solid #e0e0e0;
+  padding: 0px 22px 0px 17px;
+  margin-left: -1px;
 }
 
 .tab_Content:active {
-    width: 130px;
-    border-right: 1px;
-    padding: 0px 22px 0px 17px;
-    margin-left: -1px;
+  width: 130px;
+  border-right: 1px;
+  padding: 0px 22px 0px 17px;
+  margin-left: -1px;
 }
 
 .tabtext-center {
-    max-width: 110px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    padding-left: 2px;
+  max-width: 110px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-left: 2px;
 }
 
 .tabIconSection {
-    width: 30px;
-    float: right;
-    top: -16px;
-    position: relative;
-    padding: 2px 12px 0 13px;
+  width: 30px;
+  float: right;
+  top: -16px;
+  position: relative;
+  padding: 2px 12px 0 13px;
 }
 
-.nav-tabs>li>a:active {
-    background-color: #e0e0e0;
-    border-color: @AccentMediumHigh;
+.nav-tabs > li > a:active {
+  background-color: #e0e0e0;
+  border-color: @AccentMediumHigh;
 }
 
-.nav-tabs>li>a:active .tab_Content {
-    border: transparent;
-    width: 130px;
+.nav-tabs > li > a:active .tab_Content {
+  border: transparent;
+  width: 130px;
 }
 
 .close-Icon {
-    background-image: url(../images/close-black.svg);
-    background-repeat: no-repeat;
-    padding: 0px 0px 0px 11px;
+  background-image: url(../images/close-black.svg);
+  background-repeat: no-repeat;
+  padding: 0px 0px 0px 11px;
 }
 
 .close-Icon:hover {
-    background-image: url(../images/close-black-hover.svg);
-    background-repeat: no-repeat;
-    padding: 0px 0px 0px 11px;
+  background-image: url(../images/close-black-hover.svg);
+  background-repeat: no-repeat;
+  padding: 0px 0px 0px 11px;
 }
 
 .clickableLink {
-    color: @AccentMediumHigh;
-    font-family: 'Segoe UI';
-    font-size: 12px;
-    cursor: pointer;
+  color: @AccentMediumHigh;
+  font-family: "Segoe UI";
+  font-size: 12px;
+  cursor: pointer;
 }
 
 .clickableLink:hover {
-    background-color: #e7f6fc;
+  background-color: #e7f6fc;
 }
 
 .clickableLink:active {
-    background-color: #e6f8fe;
+  background-color: #e6f8fe;
 }
 
 .clickableLink:focus {
-    outline: 1px dashed #000000;
-    outline-offset: 0px;
+  outline: 1px dashed #000000;
+  outline-offset: 0px;
 }
 
 .paneselect {
-    height: 23px;
+  height: 23px;
 }
 
 .headerWithoutPartitionKey {
-    width: 172px;
+  width: 172px;
 }
 
 .headerWithPartitionKey {
-    width: 86px;
+  width: 86px;
 }
 
-input.codeblock{
-    background-color: @BaseMediumLow;
-    color: #252525;
-    border: 1px solid @BaseMediumHigh;
-    box-sizing: border-box;
-    font-size: @mediumFontSize;
-    height: 23px;
-    outline: 0;
-    padding: 2px 8px 4px;
-    width: 60%;
-    min-width: 960px;
-    cursor: text;
+input.codeblock {
+  background-color: @BaseMediumLow;
+  color: #252525;
+  border: 1px solid @BaseMediumHigh;
+  box-sizing: border-box;
+  font-size: @mediumFontSize;
+  height: 23px;
+  outline: 0;
+  padding: 2px 8px 4px;
+  width: 60%;
+  min-width: 960px;
+  cursor: text;
 }
 
-#divQuickStartConnections{
-    padding-bottom: 10px; 
-}
\ No newline at end of file
+#divQuickStartConnections {
+  padding-bottom: 10px;
+}
diff --git a/src/quickstart.html b/src/quickstart.html
index fc89be86f..b082231a8 100644
--- a/src/quickstart.html
+++ b/src/quickstart.html
@@ -64,41 +64,40 @@
           </li>
           <li>
             <a data-toggle="tab" href="#springboot">
-              <img class="qsmenuicons" src="../images/springboot.svg" alt="Spring Boot" /> Springboot
+              <img class="qsmenuicons" src="../images/springboot.svg" alt="Spring Boot" /> Spring Boot
             </a>
           </li>
         </ul>
-        <div class="tab-content tab-content-override">
+
+        <div class="tab-content">
           <div id="net" class="tab-pane fade in active">
-            <div class="netApp">
+            <div class="sampleApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
-                Open and run a sample .NET app
+                Create a new .NET app
                 <p>
-                  We created a sample .NET app connected to your Azure Cosmos DB Emulator instance. Download, extract,
-                  build and run the app.
+                  Follow this
+                  <a href="https://learn.microsoft.com/azure/cosmos-db/nosql/quickstart-dotnet" target="_blank"
+                    >tutorial
+                  </a>
+                  to create a new .NET app connected to Azure Cosmos DB.
                 </p>
-                <a href="quickstart/DocumentDB-Quickstart-DotNet.zip"
-                  ><button class="btncreatecoll">Download</button></a
-                >
               </div>
             </div>
             <div class="learn-more"></div>
           </div>
 
           <div id="java" class="tab-pane fade">
-            <div class="step1">
+            <div class="sampleApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
-                Open and run a sample Java app
+                Create a new Java app
                 <p>
-                  We created a sample Java app connected to your Azure Cosmos DB Emulator instance. Download, extract,
-                  build and run the app.
-                </p>
-                <a href="quickstart/DocumentDB-Quickstart-Java.zip"><button class="btncreatecoll">Download</button></a>
-                <p>
-                  Follow instructions in the readme.md to setup prerequisites needed to run Java web apps, if you
-                  haven’t already.
+                  Follow this
+                  <a href="https://learn.microsoft.com/azure/cosmos-db/nosql/quickstart-java" target="_blank"
+                    >tutorial
+                  </a>
+                  to create a new Java app connected to Azure Cosmos DB.
                 </p>
               </div>
             </div>
@@ -106,20 +105,18 @@
           </div>
 
           <div id="nodejs" class="tab-pane fade">
-            <div class="step1">
+            <div class="sampleApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
-                Open and run a sample Node.js app
+                Create a new Node.js app
                 <p>
-                  We created a sample Node.js app connected to your Azure Cosmos DB Emulator instance. Download,
-                  extract, build and run the app.
-                </p>
-                <a href="quickstart/DocumentDB-Quickstart-NodeJs.zip"
-                  ><button class="btncreatecoll">Download</button></a
-                >
-                <p>
-                  Run <strong>npm install</strong> and <strong>npm start</strong>, and navigate to
-                  <a href="http://localhost:3000" _targe="blank">http://localhost:3000</a>.
+                  Follow this
+                  <a
+                    href="https://learn.microsoft.com/azure/cosmos-db/nosql/quickstart-nodejs?pivots=programming-language-ts"
+                    target="_blank"
+                    >tutorial
+                  </a>
+                  to create a new Node.js app connected to Azure Cosmos DB.
                 </p>
               </div>
             </div>
@@ -127,7 +124,7 @@
           </div>
 
           <div id="python" class="tab-pane fade">
-            <div class="pythonApp">
+            <div class="sampleApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
                 Create a new Python app
@@ -141,9 +138,8 @@
             <div class="learn-more"></div>
           </div>
 
-          <!-- Go -->
           <div id="go" class="tab-pane fade">
-            <div class="pythonApp">
+            <div class="sampleApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
                 Create a new Go app
@@ -158,7 +154,7 @@
           </div>
 
           <div id="springboot" class="tab-pane fade">
-            <div class="pythonApp">
+            <div class="sampleApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
                 Create a new Spring Boot app

From e90e1fc581a34e866e99c013515de78b114b67b2 Mon Sep 17 00:00:00 2001
From: sakshigupta12feb <sakshigupta12feb1@gmail.com>
Date: Wed, 30 Apr 2025 17:48:15 +0530
Subject: [PATCH 03/16] Updated the Migrate data link (#2122)

* updated the Migrate data link

* updated the Migrate data link (removed en-us)

---------

Co-authored-by: Sakshi Gupta <sakshig+microsoft@microsoft.com>
---
 src/Explorer/SplashScreen/SplashScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Explorer/SplashScreen/SplashScreen.tsx b/src/Explorer/SplashScreen/SplashScreen.tsx
index 495bc03ee..2c7f778a4 100644
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -817,7 +817,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
 
   private vcoreMongoNextStepItems: { link: string; title: string; description: string }[] = [
     {
-      link: "https://learn.microsoft.com/en-us/azure/cosmos-db/mongodb/vcore/how-to-migrate-native-tools?tabs=export-import",
+      link: "https://learn.microsoft.com/azure/cosmos-db/mongodb/vcore/migration-options",
       title: "Migrate Data",
       description: "",
     },

From fe73d0a1c63ba92e8c3e76dfcdcd0af60fa4e4df Mon Sep 17 00:00:00 2001
From: Laurent Nguyen <laurent.nguyen@microsoft.com>
Date: Wed, 30 Apr 2025 17:37:54 +0200
Subject: [PATCH 04/16] Fix Fabric Native ReadOnly mode (#2123)

* Add FabricNativeReadOnly mode

* Hide Settings for Fabric native readonly

* Fix strict compil
---
 src/Explorer/Sidebar.tsx                 |  3 ++-
 src/Explorer/SplashScreen/FabricHome.tsx | 19 ++++++++++++++++---
 src/Explorer/Tree/treeNodeUtil.tsx       |  4 ++--
 src/Platform/Fabric/FabricUtil.ts        |  1 +
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Explorer/Sidebar.tsx b/src/Explorer/Sidebar.tsx
index f3db58d8a..ce111dab3 100644
--- a/src/Explorer/Sidebar.tsx
+++ b/src/Explorer/Sidebar.tsx
@@ -27,7 +27,7 @@ import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/T
 import { ResourceTree } from "Explorer/Tree/ResourceTree";
 import { useDatabases } from "Explorer/useDatabases";
 import { KeyboardAction, KeyboardActionGroup, KeyboardActionHandler, useKeyboardActionGroup } from "KeyboardShortcuts";
-import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricMirrored, isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import { getCollectionName, getDatabaseName } from "Utils/APITypeUtils";
 import { Allotment, AllotmentHandle } from "allotment";
@@ -318,6 +318,7 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
 
   const hasGlobalCommands = !(
     isFabricMirrored() ||
+    isFabricNativeReadOnly() ||
     userContext.apiType === "Postgres" ||
     userContext.apiType === "VCoreMongo"
   );
diff --git a/src/Explorer/SplashScreen/FabricHome.tsx b/src/Explorer/SplashScreen/FabricHome.tsx
index c235604d4..7db6ee041 100644
--- a/src/Explorer/SplashScreen/FabricHome.tsx
+++ b/src/Explorer/SplashScreen/FabricHome.tsx
@@ -5,7 +5,7 @@ import { Link, makeStyles, tokens } from "@fluentui/react-components";
 import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
 import { SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
 import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
-import { isFabricNative } from "Platform/Fabric/FabricUtil";
+import { isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
 import * as React from "react";
 import { userContext } from "UserContext";
 import CosmosDbBlackIcon from "../../../images/CosmosDB_black.svg";
@@ -62,6 +62,15 @@ const useStyles = makeStyles({
       margin: "auto",
     },
   },
+  single: {
+    gridColumn: "1 / 4",
+    gridRow: "1 / 3",
+    "& svg": {
+      width: "64px",
+      height: "64px",
+      margin: "auto",
+    },
+  },
   buttonContainer: {
     height: "100%",
     display: "flex",
@@ -150,7 +159,11 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
       },
     ];
 
-    return (
+    return isFabricNativeReadOnly() ? (
+      <div className={styles.buttonsContainer}>
+        <FabricHomeScreenButton className={styles.single} {...buttons[2]} />
+      </div>
+    ) : (
       <div className={styles.buttonsContainer}>
         <FabricHomeScreenButton className={styles.one} {...buttons[0]} />
         <FabricHomeScreenButton className={styles.two} {...buttons[1]} />
@@ -159,7 +172,7 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
     );
   };
 
-  const title = "Build your database";
+  const title = isFabricNativeReadOnly() ? "Use your database" : "Build your database";
   return (
     <>
       <CosmosFluentProvider className={styles.homeContainer}>
diff --git a/src/Explorer/Tree/treeNodeUtil.tsx b/src/Explorer/Tree/treeNodeUtil.tsx
index 838d5c1f0..04eafed3f 100644
--- a/src/Explorer/Tree/treeNodeUtil.tsx
+++ b/src/Explorer/Tree/treeNodeUtil.tsx
@@ -6,7 +6,7 @@ import StoredProcedure from "Explorer/Tree/StoredProcedure";
 import Trigger from "Explorer/Tree/Trigger";
 import UserDefinedFunction from "Explorer/Tree/UserDefinedFunction";
 import { useDatabases } from "Explorer/useDatabases";
-import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricMirrored, isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
 import { getItemName } from "Utils/APITypeUtils";
 import { isServerlessAccount } from "Utils/CapabilityUtils";
 import { useTabs } from "hooks/useTabs";
@@ -292,7 +292,7 @@ const buildCollectionNodeChildren = (
     contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
   });
 
-  if (userContext.apiType !== "Cassandra" || !isServerlessAccount()) {
+  if ((userContext.apiType !== "Cassandra" || !isServerlessAccount()) && !isFabricNativeReadOnly()) {
     let id = "";
     if (collection.isSampleCollection) {
       id = database.isDatabaseShared() ? "sampleSettings" : "sampleScaleSettings";
diff --git a/src/Platform/Fabric/FabricUtil.ts b/src/Platform/Fabric/FabricUtil.ts
index a9a653dd7..c2332e4bc 100644
--- a/src/Platform/Fabric/FabricUtil.ts
+++ b/src/Platform/Fabric/FabricUtil.ts
@@ -136,3 +136,4 @@ export const isFabricMirroredAAD = (): boolean =>
 export const isFabricMirrored = (): boolean => isFabricMirroredKey() || isFabricMirroredAAD();
 export const isFabricNative = (): boolean =>
   isFabric() && userContext.fabricContext?.artifactType === CosmosDbArtifactType.NATIVE;
+export const isFabricNativeReadOnly = (): boolean => isFabricNative() && !!userContext.fabricContext?.isReadOnly;

From bb66deb3a46cdb07677a3fb9d0057c71f5ed7e57 Mon Sep 17 00:00:00 2001
From: sunghyunkang1111 <114709653+sunghyunkang1111@users.noreply.github.com>
Date: Wed, 30 Apr 2025 15:18:11 -0500
Subject: [PATCH 05/16] Added more test cases and fix system partition key load
 issue (#2126)

* Added more test cases and fix system partition key load issue

* Fix unit tests and fix ci

* Updated test snapsho
---
 .github/workflows/ci.yml                      | 18 ++++----
 playwright.config.ts                          | 41 ++++++++++++++++---
 .../Controls/InputDataList/InputDataList.tsx  |  1 +
 .../Tabs/DocumentsTabV2/DocumentsTabV2.tsx    |  9 +++-
 .../DocumentsTabV2.test.tsx.snap              |  1 +
 test/CORSBypass.ts                            | 23 +++++++++++
 test/fx.ts                                    | 16 ++++++--
 test/mongo/document.spec.ts                   | 11 ++++-
 test/sql/document.spec.ts                     | 17 ++++----
 test/sql/testCases.ts                         | 19 ++++++++-
 test/testData.ts                              | 11 +++--
 11 files changed, 136 insertions(+), 31 deletions(-)
 create mode 100644 test/CORSBypass.ts

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56ed46edc..228470f72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,24 +164,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
-        shardTotal: [8]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        shardTotal: [16]
     steps:
       - uses: actions/checkout@v4
-      - name: "Az CLI login"
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       - name: Use Node.js 18.x
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - run: npm ci
       - run: npx playwright install --with-deps
+      - name: "Az CLI login"
+        uses: Azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       - name: Run test shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}}
-        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --workers=3
       - name: Upload blob report to GitHub Actions Artifacts
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
diff --git a/playwright.config.ts b/playwright.config.ts
index 80ba367bf..b1f6a622d 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -37,20 +37,51 @@ export default defineConfig({
     },
     {
       name: "firefox",
-      use: { ...devices["Desktop Firefox"] },
+      use: {
+        ...devices["Desktop Firefox"],
+        launchOptions: {
+          firefoxUserPrefs: {
+            "security.fileuri.strict_origin_policy": false,
+            "network.http.referer.XOriginPolicy": 0,
+            "network.http.referer.trimmingPolicy": 0,
+            "privacy.file_unique_origin": false,
+            "security.csp.enable": false,
+            "network.cors_preflight.allow_client_cert": true,
+            "dom.security.https_first": false,
+            "network.http.cross-origin-embedder-policy": false,
+            "network.http.cross-origin-opener-policy": false,
+            "browser.tabs.remote.useCrossOriginPolicy": false,
+            "browser.tabs.remote.useCORP": false,
+          },
+          args: ["--disable-web-security"],
+        },
+      },
     },
     {
       name: "webkit",
-      use: { ...devices["Desktop Safari"] },
+      use: {
+        ...devices["Desktop Safari"],
+      },
     },
-    /* Test against branded browsers. */
     {
       name: "Google Chrome",
-      use: { ...devices["Desktop Chrome"], channel: "chrome" }, // or 'chrome-beta'
+      use: {
+        ...devices["Desktop Chrome"],
+        channel: "chrome",
+        launchOptions: {
+          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
+        },
+      },
     },
     {
       name: "Microsoft Edge",
-      use: { ...devices["Desktop Edge"], channel: "msedge" }, // or 'msedge-dev'
+      use: {
+        ...devices["Desktop Edge"],
+        channel: "msedge",
+        launchOptions: {
+          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
+        },
+      },
     },
   ],
 
diff --git a/src/Explorer/Controls/InputDataList/InputDataList.tsx b/src/Explorer/Controls/InputDataList/InputDataList.tsx
index cd31db53b..2f483d362 100644
--- a/src/Explorer/Controls/InputDataList/InputDataList.tsx
+++ b/src/Explorer/Controls/InputDataList/InputDataList.tsx
@@ -193,6 +193,7 @@ export const InputDataList: FC<InputDataListProps> = ({
     <>
       <Input
         id="filterInput"
+        data-test={"DocumentsTab/FilterInput"}
         ref={inputRef}
         type="text"
         size="small"
diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
index 4c96064c0..58b976d44 100644
--- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
+++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
@@ -773,8 +773,11 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
     [_collection, _partitionKey],
   );
   const partitionKeyPropertyHeaders: string[] = useMemo(
-    () => (partitionKey?.systemKey ? [] : _collection?.partitionKeyPropertyHeaders || partitionKey?.paths),
-    [_collection?.partitionKeyPropertyHeaders, partitionKey?.paths, partitionKey?.systemKey],
+    () =>
+      isPreferredApiMongoDB && partitionKey?.systemKey
+        ? []
+        : _collection?.partitionKeyPropertyHeaders || partitionKey?.paths,
+    [_collection?.partitionKeyPropertyHeaders, partitionKey?.paths, partitionKey?.systemKey, isPreferredApiMongoDB],
   );
   let partitionKeyProperties = useMemo(() => {
     return partitionKeyPropertyHeaders?.map((partitionKeyPropertyHeader) =>
@@ -2116,6 +2119,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
           />
           <Button
             appearance="primary"
+            data-test={"DocumentsTab/ApplyFilter"}
             size="small"
             onClick={() => {
               if (isExecuting) {
@@ -2188,6 +2192,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
               {tableItems.length > 0 && (
                 <a
                   className={styles.loadMore}
+                  data-test={"DocumentsTab/LoadMore"}
                   role="button"
                   tabIndex={0}
                   onClick={() => loadNextPage(documentsIterator.iterator, false)}
diff --git a/src/Explorer/Tabs/DocumentsTabV2/__snapshots__/DocumentsTabV2.test.tsx.snap b/src/Explorer/Tabs/DocumentsTabV2/__snapshots__/DocumentsTabV2.test.tsx.snap
index 204b59a54..1d914d41d 100644
--- a/src/Explorer/Tabs/DocumentsTabV2/__snapshots__/DocumentsTabV2.test.tsx.snap
+++ b/src/Explorer/Tabs/DocumentsTabV2/__snapshots__/DocumentsTabV2.test.tsx.snap
@@ -51,6 +51,7 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
       <Button
         appearance="primary"
         aria-label="Apply filter"
+        data-test="DocumentsTab/ApplyFilter"
         disabled={false}
         onClick={[Function]}
         size="small"
diff --git a/test/CORSBypass.ts b/test/CORSBypass.ts
new file mode 100644
index 000000000..be52c95fa
--- /dev/null
+++ b/test/CORSBypass.ts
@@ -0,0 +1,23 @@
+import { Page } from "@playwright/test";
+
+export async function setupCORSBypass(page: Page) {
+  await page.route("**/api/mongo/explorer{,/**}", async (route) => {
+    const response = await route.fetch({
+      headers: {
+        ...route.request().headers(),
+      },
+    });
+
+    await route.fulfill({
+      status: response.status(),
+      headers: {
+        ...response.headers(),
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "*",
+        "Access-Control-Allow-Headers": "*",
+        "Access-Control-Allow-Credentials": "*",
+      },
+      body: await response.body(),
+    });
+  });
+}
diff --git a/test/fx.ts b/test/fx.ts
index 30c73e397..6d7263a8a 100644
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -1,4 +1,4 @@
-import { AzureCliCredential } from "@azure/identity";
+import { DefaultAzureCredential } from "@azure/identity";
 import { Frame, Locator, Page, expect } from "@playwright/test";
 import crypto from "crypto";
 
@@ -20,8 +20,8 @@ export function generateUniqueName(baseName, options?: TestNameOptions): string
   return `${prefix}${baseName}${crypto.randomBytes(length).toString("hex")}${suffix}`;
 }
 
-export function getAzureCLICredentials(): AzureCliCredential {
-  return new AzureCliCredential();
+export function getAzureCLICredentials(): DefaultAzureCredential {
+  return new DefaultAzureCredential();
 }
 
 export async function getAzureCLICredentialsToken(): Promise<string> {
@@ -223,6 +223,9 @@ export class DocumentsTab {
   documentsListPane: Locator;
   documentResultsPane: Locator;
   resultsEditor: Editor;
+  loadMoreButton: Locator;
+  filterInput: Locator;
+  filterButton: Locator;
 
   constructor(
     public frame: Frame,
@@ -234,6 +237,13 @@ export class DocumentsTab {
     this.documentsListPane = this.locator.getByTestId("DocumentsTab/DocumentsPane");
     this.documentResultsPane = this.locator.getByTestId("DocumentsTab/ResultsPane");
     this.resultsEditor = new Editor(this.frame, this.documentResultsPane.getByTestId("EditorReact/Host/Loaded"));
+    this.loadMoreButton = this.documentsListPane.getByTestId("DocumentsTab/LoadMore");
+    this.filterInput = this.documentsFilter.getByTestId("DocumentsTab/FilterInput");
+    this.filterButton = this.documentsFilter.getByTestId("DocumentsTab/ApplyFilter");
+  }
+
+  async setFilter(text: string) {
+    await this.filterInput.fill(text);
   }
 }
 
diff --git a/test/mongo/document.spec.ts b/test/mongo/document.spec.ts
index 34d27ee21..b6703c49a 100644
--- a/test/mongo/document.spec.ts
+++ b/test/mongo/document.spec.ts
@@ -1,5 +1,6 @@
 import { expect, test } from "@playwright/test";
 
+import { setupCORSBypass } from "../CORSBypass";
 import { DataExplorer, DocumentsTab, TestAccount } from "../fx";
 import { retry, serializeMongoToJson, setPartitionKeys } from "../testData";
 import { documentTestCases } from "./testCases";
@@ -9,8 +10,9 @@ let documentsTab: DocumentsTab = null!;
 
 for (const { name, databaseId, containerId, documents } of documentTestCases) {
   test.describe(`Test MongoRU Documents with ${name}`, () => {
-    test.skip(true, "Temporarily disabling all tests in this spec file");
+    // test.skip(true, "Temporarily disabling all tests in this spec file");
     test.beforeEach("Open documents tab", async ({ page }) => {
+      await setupCORSBypass(page);
       explorer = await DataExplorer.open(page, TestAccount.MongoReadonly);
 
       const containerNode = await explorer.waitForContainerNode(databaseId, containerId);
@@ -25,6 +27,9 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
       await documentsTab.documentsListPane.waitFor();
       await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });
     });
+    test.afterEach(async ({ page }) => {
+      await page.unrouteAll({ behavior: "ignoreErrors" });
+    });
 
     for (const document of documents) {
       const { documentId: docId, partitionKeys } = document;
@@ -68,8 +73,12 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
             await documentsTab.resultsEditor.setText(JSON.stringify(newDocument));
             const saveButton = await explorer.waitForCommandBarButton("Save", 5000);
             await saveButton.click({ timeout: 5000 });
+            await expect(saveButton).toBeHidden({ timeout: 5000 });
           }, 3);
 
+          await documentsTab.setFilter(`{_id: "${newDocumentId}"}`);
+          await documentsTab.filterButton.click();
+
           const newSpan = documentsTab.documentsListPane.getByText(newDocumentId, { exact: true }).nth(0);
           await newSpan.waitFor();
           await newSpan.click();
diff --git a/test/sql/document.spec.ts b/test/sql/document.spec.ts
index 095b47c6a..95cdd112a 100644
--- a/test/sql/document.spec.ts
+++ b/test/sql/document.spec.ts
@@ -9,7 +9,7 @@ let documentsTab: DocumentsTab = null!;
 
 for (const { name, databaseId, containerId, documents } of documentTestCases) {
   test.describe(`Test SQL Documents with ${name}`, () => {
-    test.skip(true, "Temporarily disabling all tests in this spec file");
+    // test.skip(true, "Temporarily disabling all tests in this spec file");
     test.beforeEach("Open documents tab", async ({ page }) => {
       explorer = await DataExplorer.open(page, TestAccount.SQLReadOnly);
 
@@ -27,7 +27,7 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
     });
 
     for (const document of documents) {
-      const { documentId: docId, partitionKeys } = document;
+      const { documentId: docId, partitionKeys, skipCreateDelete } = document;
       test.describe(`Document ID: ${docId}`, () => {
         test(`should load and view document ${docId}`, async () => {
           const span = documentsTab.documentsListPane.getByText(docId, { exact: true }).nth(0);
@@ -42,7 +42,9 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
           expect(resultText).not.toBeNull();
           expect(resultData?.id).toEqual(docId);
         });
-        test(`should be able to create and delete new document from ${docId}`, async ({ page }) => {
+
+        const testOrSkip = skipCreateDelete ? test.skip : test;
+        testOrSkip(`should be able to create and delete new document from ${docId}`, async ({ page }) => {
           const span = documentsTab.documentsListPane.getByText(docId, { exact: true }).nth(0);
           await span.waitFor();
           await expect(span).toBeVisible();
@@ -51,10 +53,6 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
           let newDocumentId;
           await page.waitForTimeout(5000);
           await retry(async () => {
-            // const discardButton = await explorer.waitForCommandBarButton("Discard", 5000);
-            // if (await discardButton.isEnabled()) {
-            //   await discardButton.click();
-            // }
             const newDocumentButton = await explorer.waitForCommandBarButton("New Item", 5000);
             await expect(newDocumentButton).toBeVisible();
             await expect(newDocumentButton).toBeEnabled();
@@ -72,10 +70,15 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
             await documentsTab.resultsEditor.setText(JSON.stringify(newDocument));
             const saveButton = await explorer.waitForCommandBarButton("Save", 5000);
             await saveButton.click({ timeout: 5000 });
+            await expect(saveButton).toBeHidden({ timeout: 5000 });
           }, 3);
 
+          await documentsTab.setFilter(`WHERE c.id = "${newDocumentId}"`);
+          await documentsTab.filterButton.click();
+
           const newSpan = documentsTab.documentsListPane.getByText(newDocumentId, { exact: true }).nth(0);
           await newSpan.waitFor();
+
           await newSpan.click();
           await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });
 
diff --git a/test/sql/testCases.ts b/test/sql/testCases.ts
index 8c4c3178f..4398c93eb 100644
--- a/test/sql/testCases.ts
+++ b/test/sql/testCases.ts
@@ -5,7 +5,24 @@ export const documentTestCases: DocumentTestCase[] = [
     name: "System Partition Key",
     databaseId: "e2etests-sql-readonly",
     containerId: "systemPartitionKey",
-    documents: [{ documentId: "systempartition", partitionKeys: [] }],
+    documents: [
+      {
+        documentId: "systempartition",
+        partitionKeys: [{ key: "/_partitionKey", value: "partitionKey" }],
+        skipCreateDelete: true,
+      },
+      {
+        documentId: "systempartition_empty",
+        partitionKeys: [{ key: "/_partitionKey", value: "" }],
+        skipCreateDelete: true,
+      },
+      {
+        documentId: "systempartition_null",
+        partitionKeys: [{ key: "/_partitionKey", value: null }],
+        skipCreateDelete: true,
+      },
+      { documentId: "systempartition_missing", partitionKeys: [] },
+    ],
   },
   {
     name: "Single Partition Key",
diff --git a/test/testData.ts b/test/testData.ts
index 3af3c903c..9027a9721 100644
--- a/test/testData.ts
+++ b/test/testData.ts
@@ -1,13 +1,16 @@
+import crypto from "crypto";
+
 import { CosmosDBManagementClient } from "@azure/arm-cosmosdb";
 import { BulkOperationType, Container, CosmosClient, Database, JSONObject } from "@azure/cosmos";
-import crypto from "crypto";
+import { AzureIdentityCredentialAdapter } from "@azure/ms-rest-js";
+
 import {
-  TestAccount,
   generateUniqueName,
   getAccountName,
   getAzureCLICredentials,
   resourceGroupName,
   subscriptionId,
+  TestAccount,
 } from "./fx";
 
 export interface TestItem {
@@ -26,6 +29,7 @@ export interface DocumentTestCase {
 export interface TestDocument {
   documentId: string;
   partitionKeys?: PartitionKey[];
+  skipCreateDelete?: boolean;
 }
 
 export interface PartitionKey {
@@ -74,7 +78,8 @@ export async function createTestSQLContainer(includeTestData?: boolean) {
   const databaseId = generateUniqueName("db");
   const containerId = "testcontainer"; // A unique container name isn't needed because the database is unique
   const credentials = getAzureCLICredentials();
-  const armClient = new CosmosDBManagementClient(credentials, subscriptionId);
+  const adaptedCredentials = new AzureIdentityCredentialAdapter(credentials);
+  const armClient = new CosmosDBManagementClient(adaptedCredentials, subscriptionId);
   const accountName = getAccountName(TestAccount.SQL);
   const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
   const keys = await armClient.databaseAccounts.listKeys(resourceGroupName, accountName);

From 205355bf55fed4d74c93d51bc5717e83bd06642f Mon Sep 17 00:00:00 2001
From: Sourabh Jain <sourabhjain@microsoft.com>
Date: Thu, 1 May 2025 01:49:01 +0530
Subject: [PATCH 06/16] Shell:  Integrate Cloudshell to existing shells (#2098)

* first draft

* refactored code

* ux fix

* add custom header support and fix ui

* minor changes

* hide last command also

* remove logger

* bug fixes

* updated loick file

* fix tests

* moved files

* update readme

* documentation update

* fix compilationerror

* undefined check handle

* format fix

* format fix

* fix lints

* format fix

* fix unrelatred test

* code refator

* fix format

* ut fix

* cgmanifest

* Revert "cgmanifest"

This reverts commit 2e76a6926ee0d3d4e0510f2e04e03446c2ca8c47.

* fix snap

* test fix

* formatting code

* updated xterm

* include username in command

* cloudshell add exit

* fix test

* format fix

* tets fix

* fix multiple open cloudshell calls

* socket time out after 20 min

* remove unused code

* 120 min

* Addressed comments
---
 package-lock.json                             |  15 +
 package.json                                  |   2 +
 src/Common/Constants.ts                       |   1 +
 src/Explorer/ContextMenuButtonFactory.tsx     |  12 +-
 src/Explorer/Explorer.tsx                     |   4 +-
 .../CommandBarComponentButtonFactory.tsx      |   9 +-
 .../CloudShellTerminalComponent.tsx           |  80 +++++
 .../CloudShellTab/CloudShellTerminalCore.tsx  | 290 +++++++++++++++
 .../Data/CloudShellClient.test.tsx            | 337 ++++++++++++++++++
 .../CloudShellTab/Data/CloudShellClient.tsx   | 117 ++++++
 .../Tabs/CloudShellTab/Models/DataModels.tsx  |  91 +++++
 src/Explorer/Tabs/CloudShellTab/README.md     | 282 +++++++++++++++
 .../ShellTypes/AbstractShellHandler.test.tsx  |  96 +++++
 .../ShellTypes/AbstractShellHandler.tsx       |  59 +++
 .../ShellTypes/CassandraShellHandler.test.tsx | 148 ++++++++
 .../ShellTypes/CassandraShellHandler.tsx      |  47 +++
 .../ShellTypes/MongoShellHandler.test.tsx     | 130 +++++++
 .../ShellTypes/MongoShellHandler.tsx          |  48 +++
 .../ShellTypes/PostgresShellHandler.test.tsx  |  64 ++++
 .../ShellTypes/PostgresShellHandler.tsx       |  63 ++++
 .../ShellTypes/ShellTypeFactory.test.tsx      | 113 ++++++
 .../ShellTypes/ShellTypeFactory.tsx           |  36 ++
 .../VCoreMongoShellHandler.test.tsx           |  63 ++++
 .../ShellTypes/VCoreMongoShellHandler.tsx     |  54 +++
 .../Tabs/CloudShellTab/Utils/AttachAddOn.tsx  | 207 +++++++++++
 .../Tabs/CloudShellTab/Utils/CommonUtils.tsx  |  52 +++
 .../Tabs/CloudShellTab/Utils/RegionUtils.tsx  |  48 +++
 .../Utils/TerminalLogFormats.tsx              |  39 ++
 .../BaseTerminalComponentAdapter.tsx          |  62 ++++
 .../CloudShellTerminalComponentAdapter.tsx    |  19 +
 .../NotebookTerminalComponentAdapter.tsx      |  32 ++
 src/Explorer/Tabs/TerminalTab.tsx             | 111 ++----
 src/Platform/Hosted/extractFeatures.ts        |   2 +
 src/Shared/Telemetry/TelemetryConstants.ts    |   3 +
 src/Utils/arm/request.ts                      |  18 +-
 35 files changed, 2664 insertions(+), 90 deletions(-)
 create mode 100644 src/Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/README.md
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx
 create mode 100644 src/Explorer/Tabs/CloudShellTab/Utils/TerminalLogFormats.tsx
 create mode 100644 src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
 create mode 100644 src/Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter.tsx
 create mode 100644 src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx

diff --git a/package-lock.json b/package-lock.json
index 2b1c80df0..e18653826 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,6 +51,8 @@
         "@types/mkdirp": "1.0.1",
         "@types/node-fetch": "2.5.7",
         "@xmldom/xmldom": "0.7.13",
+        "@xterm/addon-fit": "0.10.0",
+        "@xterm/xterm": "5.5.0",
         "allotment": "1.20.2",
         "applicationinsights": "1.8.0",
         "bootstrap": "3.4.1",
@@ -13240,6 +13242,19 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@xterm/addon-fit": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
+      "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.0.0"
+      }
+    },
+    "node_modules/@xterm/xterm": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
+      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "license": "BSD-3-Clause"
diff --git a/package.json b/package.json
index f4b10a66d..b5914047b 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,8 @@
     "@types/mkdirp": "1.0.1",
     "@types/node-fetch": "2.5.7",
     "@xmldom/xmldom": "0.7.13",
+    "@xterm/xterm": "5.5.0",
+    "@xterm/addon-fit": "0.10.0",
     "allotment": "1.20.2",
     "applicationinsights": "1.8.0",
     "bootstrap": "3.4.1",
diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts
index 37243de72..0b0028732 100644
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -257,6 +257,7 @@ export class Areas {
   public static ShareDialog: string = "Share Access Dialog";
   public static Notebook: string = "Notebook";
   public static Copilot: string = "Copilot";
+  public static CloudShell: string = "Cloud Shell";
 }
 
 export class HttpHeaders {
diff --git a/src/Explorer/ContextMenuButtonFactory.tsx b/src/Explorer/ContextMenuButtonFactory.tsx
index 3cb4c7a80..3f6a795ee 100644
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -103,17 +103,23 @@ export const createCollectionContextMenuButton = (
       iconSrc: HostedTerminalIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
+        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
         }
       },
-      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
+      label:
+        useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell
+          ? "Open Mongo Shell"
+          : "New Shell",
     });
   }
 
-  if (useNotebook.getState().isShellEnabled && userContext.apiType === "Cassandra") {
+  if (
+    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
+    userContext.apiType === "Cassandra"
+  ) {
     items.push({
       iconSrc: HostedTerminalIcon,
       onClick: () => {
diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx
index e62bfe5b3..a07a7dad3 100644
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -910,7 +910,9 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (useNotebook.getState().isPhoenixFeatures) {
+    if (userContext.features.enableCloudShell) {
+      this.connectToNotebookTerminal(kind);
+    } else if (useNotebook.getState().isPhoenixFeatures) {
       await this.allocateContainer(PoolIdType.DefaultPoolId);
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;
       if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
diff --git a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
index 49c513a0a..f9aa5e54f 100644
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -126,13 +126,14 @@ export function createContextCommandBarButtons(
   const buttons: CommandButtonComponentProps[] = [];
 
   if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
+    const label =
+      useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell ? "Open Mongo Shell" : "New Shell";
     const newMongoShellBtn: CommandButtonComponentProps = {
       iconSrc: HostedTerminalIcon,
       iconAlt: label,
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
+        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
@@ -146,7 +147,7 @@ export function createContextCommandBarButtons(
   }
 
   if (
-    useNotebook.getState().isShellEnabled &&
+    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
     !selectedNodeState.isDatabaseNodeOrNoneSelected() &&
     userContext.apiType === "Cassandra"
   ) {
@@ -455,7 +456,7 @@ function createOpenTerminalButtonByKind(
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
     onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled) {
+      if (useNotebook.getState().isNotebookEnabled || userContext.features.enableCloudShell) {
         container.openNotebookTerminal(terminalKind);
       }
     },
diff --git a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent.tsx b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent.tsx
new file mode 100644
index 000000000..7ad05e876
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent.tsx
@@ -0,0 +1,80 @@
+import { FitAddon } from "@xterm/addon-fit";
+import { Terminal } from "@xterm/xterm";
+import React, { useEffect, useRef } from "react";
+import "xterm/css/xterm.css";
+import { DatabaseAccount } from "../../../Contracts/DataModels";
+import { TerminalKind } from "../../../Contracts/ViewModels";
+import { startCloudShellTerminal } from "./CloudShellTerminalCore";
+
+export interface CloudShellTerminalComponentProps {
+  databaseAccount: DatabaseAccount;
+  tabId: string;
+  username?: string;
+  shellType?: TerminalKind;
+}
+
+export const CloudShellTerminalComponent: React.FC<CloudShellTerminalComponentProps> = (props) => {
+  const terminalRef = useRef(null); // Reference for terminal container
+  const xtermRef = useRef(null); // Reference for XTerm instance
+  const socketRef = useRef(null); // Reference for WebSocket
+
+  useEffect(() => {
+    // Initialize XTerm instance
+    const terminal = new Terminal({
+      cursorBlink: true,
+      cursorStyle: "bar",
+      fontFamily: "monospace",
+      fontSize: 11,
+      theme: {
+        background: "#1e1e1e",
+        foreground: "#d4d4d4",
+        cursor: "#ffcc00",
+      },
+      scrollback: 1000,
+    });
+
+    const fitAddon = new FitAddon();
+    terminal.loadAddon(fitAddon);
+    // Attach terminal to the DOM
+    if (terminalRef.current) {
+      terminal.open(terminalRef.current);
+      xtermRef.current = terminal;
+    }
+
+    // Defer terminal sizing until after DOM rendering is complete
+    setTimeout(() => {
+      fitAddon.fit();
+    }, 0);
+
+    // Use ResizeObserver instead of window resize
+    const resizeObserver = new ResizeObserver(() => {
+      const container = terminalRef.current;
+      if (container && container.offsetWidth > 0 && container.offsetHeight > 0) {
+        try {
+          fitAddon.fit();
+        } catch (e) {
+          console.warn("Fit failed on resize:", e);
+        }
+      }
+    });
+    resizeObserver.observe(terminalRef.current);
+
+    socketRef.current = startCloudShellTerminal(terminal, props.shellType);
+
+    // Cleanup function to close WebSocket and dispose terminal
+    return () => {
+      if (!socketRef.current) {
+        return;
+      }
+      if (socketRef.current && socketRef.current.readyState && socketRef.current.readyState === WebSocket.OPEN) {
+        socketRef.current.close(); // Close WebSocket connection
+      }
+      if (resizeObserver && terminalRef.current) {
+        resizeObserver.unobserve(terminalRef.current);
+      }
+      terminal.dispose(); // Clean up XTerm instance
+    };
+  }, []);
+
+  return <div ref={terminalRef} style={{ width: "100%", height: "500px" }} />;
+};
diff --git a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
new file mode 100644
index 000000000..da692cc9b
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
@@ -0,0 +1,290 @@
+import { Terminal } from "@xterm/xterm";
+import { Areas } from "../../../Common/Constants";
+import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
+import { TerminalKind } from "../../../Contracts/ViewModels";
+import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "../../../UserContext";
+import {
+  connectTerminal,
+  provisionConsole,
+  putEphemeralUserSettings,
+  registerCloudShellProvider,
+  verifyCloudShellProviderRegistration,
+} from "./Data/CloudShellClient";
+import { CloudShellProviderInfo, ProvisionConsoleResponse } from "./Models/DataModels";
+import { AbstractShellHandler, START_MARKER } from "./ShellTypes/AbstractShellHandler";
+import { getHandler } from "./ShellTypes/ShellTypeFactory";
+import { AttachAddon } from "./Utils/AttachAddOn";
+import { askConfirmation, wait } from "./Utils/CommonUtils";
+import { getNormalizedRegion } from "./Utils/RegionUtils";
+import { formatErrorMessage, formatInfoMessage, formatWarningMessage } from "./Utils/TerminalLogFormats";
+
+// Constants
+const DEFAULT_CLOUDSHELL_REGION = "westus";
+const POLLING_INTERVAL_MS = 2000;
+const MAX_RETRY_COUNT = 10;
+const MAX_PING_COUNT = 120 * 60; // 120 minutes (60 seconds/minute)
+
+let pingCount = 0;
+let keepAliveID: NodeJS.Timeout = null;
+
+/**
+ * Main function to start a CloudShell terminal
+ */
+export const startCloudShellTerminal = async (terminal: Terminal, shellType: TerminalKind): Promise<WebSocket> => {
+  const startKey = TelemetryProcessor.traceStart(Action.CloudShellTerminalSession, {
+    shellType: TerminalKind[shellType],
+    dataExplorerArea: Areas.CloudShell,
+  });
+
+  let resolvedRegion: string;
+  try {
+    await ensureCloudShellProviderRegistered();
+
+    resolvedRegion = determineCloudShellRegion();
+    // Ask for user consent for region
+    const consentGranted = await askConfirmation(
+      terminal,
+      formatWarningMessage(
+        "The shell environment may be operating in a region different from that of the database, which could impact performance or data compliance. Do you wish to proceed?",
+      ),
+    );
+
+    // Track user decision
+    TelemetryProcessor.trace(
+      Action.CloudShellUserConsent,
+      consentGranted ? ActionModifiers.Success : ActionModifiers.Cancel,
+      { dataExplorerArea: Areas.CloudShell },
+    );
+
+    if (!consentGranted) {
+      TelemetryProcessor.traceCancel(
+        Action.CloudShellTerminalSession,
+        {
+          shellType: TerminalKind[shellType],
+          dataExplorerArea: Areas.CloudShell,
+          region: resolvedRegion,
+          isConsent: false,
+        },
+        startKey,
+      );
+      terminal.writeln(
+        formatErrorMessage("Session ended. Please close this tab and initiate a new shell session if needed."),
+      );
+      return null; // Exit if user declined
+    }
+
+    terminal.writeln(formatInfoMessage("Connecting to CloudShell. This may take a moment. Please wait..."));
+
+    const sessionDetails: {
+      socketUri?: string;
+      provisionConsoleResponse?: ProvisionConsoleResponse;
+      targetUri?: string;
+    } = await provisionCloudShellSession(resolvedRegion, terminal);
+
+    if (!sessionDetails.socketUri) {
+      terminal.writeln(formatErrorMessage("Failed to establish a connection. Please try again later."));
+      return null;
+    }
+
+    // Get the shell handler for this type
+    const shellHandler = await getHandler(shellType);
+    // Configure WebSocket connection with shell-specific commands
+    const socket = await establishTerminalConnection(terminal, shellHandler, sessionDetails.socketUri);
+
+    TelemetryProcessor.traceSuccess(
+      Action.CloudShellTerminalSession,
+      {
+        shellType: TerminalKind[shellType],
+        dataExplorerArea: Areas.CloudShell,
+        region: resolvedRegion,
+        socketUri: sessionDetails.socketUri,
+      },
+      startKey,
+    );
+
+    return socket;
+  } catch (err) {
+    TelemetryProcessor.traceFailure(
+      Action.CloudShellTerminalSession,
+      {
+        shellType: TerminalKind[shellType],
+        dataExplorerArea: Areas.CloudShell,
+        region: resolvedRegion,
+        error: getErrorMessage(err),
+        errorStack: getErrorStack(err),
+      },
+      startKey,
+    );
+
+    terminal.writeln(formatErrorMessage(`Failed with error.${getErrorMessage(err)}`));
+
+    return null;
+  }
+};
+
+/**
+ * Ensures that the CloudShell provider is registered for the current subscription
+ */
+export const ensureCloudShellProviderRegistered = async (): Promise<void> => {
+  const response: CloudShellProviderInfo = await verifyCloudShellProviderRegistration(userContext.subscriptionId);
+
+  if (response.registrationState !== "Registered") {
+    await registerCloudShellProvider(userContext.subscriptionId);
+  }
+};
+
+/**
+ * Determines the appropriate CloudShell region
+ */
+export const determineCloudShellRegion = (): string => {
+  return getNormalizedRegion(userContext.databaseAccount?.location, DEFAULT_CLOUDSHELL_REGION);
+};
+
+/**
+ * Provisions a CloudShell session
+ */
+export const provisionCloudShellSession = async (
+  resolvedRegion: string,
+  terminal: Terminal,
+): Promise<{ socketUri?: string; provisionConsoleResponse?: ProvisionConsoleResponse; targetUri?: string }> => {
+  // Apply user settings
+  await putEphemeralUserSettings(userContext.subscriptionId, resolvedRegion);
+
+  // Provision console
+  let provisionConsoleResponse;
+  let attemptCounter = 0;
+
+  do {
+    provisionConsoleResponse = await provisionConsole(resolvedRegion);
+    attemptCounter++;
+
+    if (provisionConsoleResponse.properties.provisioningState === "Failed") {
+      break;
+    }
+
+    if (provisionConsoleResponse.properties.provisioningState !== "Succeeded") {
+      await wait(POLLING_INTERVAL_MS);
+    }
+  } while (provisionConsoleResponse.properties.provisioningState !== "Succeeded" && attemptCounter < MAX_RETRY_COUNT);
+
+  if (provisionConsoleResponse.properties.provisioningState !== "Succeeded") {
+    throw new Error(`Provisioning failed: ${provisionConsoleResponse.properties.provisioningState}`);
+  }
+
+  // Connect terminal
+  const connectTerminalResponse = await connectTerminal(provisionConsoleResponse.properties.uri, {
+    rows: terminal.rows,
+    cols: terminal.cols,
+  });
+
+  const targetUri = `${provisionConsoleResponse.properties.uri}/terminals?cols=${terminal.cols}&rows=${terminal.rows}&version=2019-01-01&shell=bash`;
+  const termId = connectTerminalResponse.id;
+
+  // Determine socket URI
+  let socketUri = connectTerminalResponse.socketUri.replace(":443/", "");
+  const targetUriBody = targetUri.replace("https://", "").split("?")[0];
+
+  // This socket URI transformation logic handles different Azure service endpoint formats.
+  // If the returned socketUri doesn't contain the expected host, we construct it manually.
+  // This ensures compatibility across different Azure regions and deployment configurations.
+  if (socketUri.indexOf(targetUriBody) === -1) {
+    socketUri = `wss://${targetUriBody}/${termId}`;
+  }
+
+  // Special handling for ServiceBus-based endpoints which require a specific URI format
+  // with the hierarchical connection ($hc) path segment for terminal connections
+  if (targetUriBody.includes("servicebus")) {
+    const targetUriBodyArr = targetUriBody.split("/");
+    socketUri = `wss://${targetUriBodyArr[0]}/$hc/${targetUriBodyArr[1]}/terminals/${termId}`;
+  }
+
+  return { socketUri, provisionConsoleResponse, targetUri };
+};
+
+/**
+ * Establishes a terminal connection via WebSocket
+ */
+export const establishTerminalConnection = async (
+  terminal: Terminal,
+  shellHandler: AbstractShellHandler,
+  socketUri: string,
+): Promise<WebSocket> => {
+  let socket = new WebSocket(socketUri);
+
+  // Get shell-specific initial commands
+  const initCommands = shellHandler.getInitialCommands();
+
+  // Configure the socket
+  socket = await configureSocketConnection(socket, socketUri, terminal, initCommands, 0);
+
+  const options = {
+    startMarker: START_MARKER,
+    shellHandler: shellHandler,
+  };
+
+  // Attach the terminal addon
+  const attachAddon = new AttachAddon(socket, options);
+  terminal.loadAddon(attachAddon);
+
+  return socket;
+};
+
+/**
+ * Configures a WebSocket connection for the terminal
+ */
+export const configureSocketConnection = async (
+  socket: WebSocket,
+  uri: string,
+  terminal: Terminal,
+  initCommands: string,
+  socketRetryCount: number,
+): Promise<WebSocket> => {
+  sendTerminalStartupCommands(socket, initCommands);
+
+  socket.onerror = async () => {
+    if (socketRetryCount < MAX_RETRY_COUNT && socket.readyState !== WebSocket.CLOSED) {
+      await configureSocketConnection(socket, uri, terminal, initCommands, socketRetryCount + 1);
+    } else {
+      socket.close();
+    }
+  };
+
+  socket.onclose = () => {
+    if (keepAliveID) {
+      clearTimeout(keepAliveID);
+      pingCount = 0;
+    }
+  };
+
+  return socket;
+};
+
+export const sendTerminalStartupCommands = (socket: WebSocket, initCommands: string): void => {
+  if (socket && socket.readyState === WebSocket.OPEN) {
+    socket.send(initCommands);
+  } else {
+    socket.onopen = () => {
+      socket.send(initCommands);
+
+      // ensures connections don't remain open indefinitely by implementing an automatic timeout after 20 minutes.
+      const keepSocketAlive = (socket: WebSocket) => {
+        if (socket.readyState === WebSocket.OPEN) {
+          if (pingCount >= MAX_PING_COUNT) {
+            socket.close();
+          } else {
+            socket.send("");
+            pingCount++;
+            // The code uses a recursive setTimeout pattern rather than setInterval,
+            // which ensures each new ping only happens after the previous one completes
+            // and naturally stops if the socket closes.
+            keepAliveID = setTimeout(() => keepSocketAlive(socket), 1000);
+          }
+        }
+      };
+
+      keepSocketAlive(socket);
+    };
+  }
+};
diff --git a/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.test.tsx b/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.test.tsx
new file mode 100644
index 000000000..61daecd15
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.test.tsx
@@ -0,0 +1,337 @@
+import { armRequest } from "../../../../Utils/arm/request";
+import { NetworkType, OsType, SessionType, ShellType } from "../Models/DataModels";
+import {
+  connectTerminal,
+  getUserSettings,
+  provisionConsole,
+  putEphemeralUserSettings,
+  registerCloudShellProvider,
+  verifyCloudShellProviderRegistration,
+} from "./CloudShellClient";
+
+// Instead of redeclaring fetch, modify the global context
+/* eslint-disable @typescript-eslint/no-namespace */
+declare global {
+  namespace NodeJS {
+    interface Global {
+      fetch: jest.Mock;
+    }
+  }
+}
+/* eslint-enable @typescript-eslint/no-namespace */
+
+// Define mock endpoint
+const MOCK_ARM_ENDPOINT = "https://mock-management.azure.com";
+
+// Mock dependencies
+jest.mock("uuid", () => ({
+  v4: jest.fn().mockReturnValue("mocked-uuid"),
+}));
+
+jest.mock("../../../../ConfigContext", () => ({
+  configContext: {
+    ARM_ENDPOINT: "https://mock-management.azure.com",
+  },
+}));
+
+jest.mock("../../../../UserContext", () => ({
+  userContext: {
+    authorizationToken: "Bearer mock-token",
+  },
+}));
+
+jest.mock("../../../../Utils/arm/request");
+
+jest.mock("../Utils/CommonUtils", () => ({
+  getLocale: jest.fn().mockReturnValue("en-US"),
+}));
+
+// Properly mock fetch with correct typings
+const mockJsonPromise = jest.fn();
+global.fetch = jest.fn().mockImplementationOnce(() => {
+  return {
+    ok: true,
+    status: 200,
+    json: mockJsonPromise,
+    text: jest.fn().mockResolvedValue(""),
+    headers: new Headers(),
+  } as unknown as Promise<Response>;
+}) as jest.Mock;
+
+describe("CloudShellClient", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockJsonPromise.mockClear();
+  });
+
+  // Reset all mocks after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    if (global.fetch) {
+      delete global.fetch;
+    }
+  });
+
+  describe("getUserSettings", () => {
+    it("should call armRequest with correct parameters and return settings", async () => {
+      const mockSettings = { properties: { preferredLocation: "eastus" } };
+      (armRequest as jest.Mock).mockResolvedValueOnce(mockSettings);
+
+      const result = await getUserSettings();
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
+        method: "GET",
+        apiVersion: "2023-02-01-preview",
+      });
+      expect(result).toEqual(mockSettings);
+    });
+
+    it("should handle errors when settings retrieval fails", async () => {
+      const mockError = new Error("Failed to get user settings");
+      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
+
+      await expect(getUserSettings()).rejects.toThrow("Failed to get user settings");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
+        method: "GET",
+        apiVersion: "2023-02-01-preview",
+      });
+    });
+  });
+
+  describe("putEphemeralUserSettings", () => {
+    it("should call armRequest with default network settings", async () => {
+      const mockResponse = { id: "settings-id" };
+      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
+
+      const result = await putEphemeralUserSettings("sub-id", "eastus");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
+        method: "PUT",
+        apiVersion: "2023-02-01-preview",
+        body: {
+          properties: {
+            preferredOsType: OsType.Linux,
+            preferredShellType: ShellType.Bash,
+            preferredLocation: "eastus",
+            networkType: NetworkType.Default,
+            sessionType: SessionType.Ephemeral,
+            userSubscription: "sub-id",
+            vnetSettings: {},
+          },
+        },
+      });
+      expect(result).toEqual(mockResponse);
+    });
+
+    it("should call armRequest with isolated network settings", async () => {
+      const mockVNetSettings = { subnetId: "test-subnet" };
+      const mockResponse = { id: "settings-id" };
+      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
+
+      await putEphemeralUserSettings("sub-id", "eastus", mockVNetSettings);
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
+        method: "PUT",
+        apiVersion: "2023-02-01-preview",
+        body: {
+          properties: {
+            preferredOsType: OsType.Linux,
+            preferredShellType: ShellType.Bash,
+            preferredLocation: "eastus",
+            networkType: NetworkType.Isolated,
+            sessionType: SessionType.Ephemeral,
+            userSubscription: "sub-id",
+            vnetSettings: mockVNetSettings,
+          },
+        },
+      });
+    });
+
+    it("should handle errors when updating settings fails", async () => {
+      const mockError = new Error("Failed to update user settings");
+      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
+
+      await expect(putEphemeralUserSettings("sub-id", "eastus")).rejects.toThrow("Failed to update user settings");
+
+      expect(armRequest).toHaveBeenCalled();
+    });
+  });
+
+  describe("verifyCloudShellProviderRegistration", () => {
+    it("should call armRequest with correct parameters", async () => {
+      const mockResponse = { registrationState: "Registered" };
+      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
+
+      const result = await verifyCloudShellProviderRegistration("sub-id");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell",
+        method: "GET",
+        apiVersion: "2022-12-01",
+      });
+      expect(result).toEqual(mockResponse);
+    });
+
+    it("should handle errors when verification fails", async () => {
+      const mockError = new Error("Failed to verify provider registration");
+      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
+
+      await expect(verifyCloudShellProviderRegistration("sub-id")).rejects.toThrow(
+        "Failed to verify provider registration",
+      );
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell",
+        method: "GET",
+        apiVersion: "2022-12-01",
+      });
+    });
+  });
+
+  describe("registerCloudShellProvider", () => {
+    it("should call armRequest with correct parameters", async () => {
+      const mockResponse = { operationId: "op-id" };
+      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
+
+      const result = await registerCloudShellProvider("sub-id");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell/register",
+        method: "POST",
+        apiVersion: "2022-12-01",
+      });
+      expect(result).toEqual(mockResponse);
+    });
+
+    it("should handle errors when registration fails", async () => {
+      const mockError = new Error("Failed to register provider");
+      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
+
+      await expect(registerCloudShellProvider("sub-id")).rejects.toThrow("Failed to register provider");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell/register",
+        method: "POST",
+        apiVersion: "2022-12-01",
+      });
+    });
+  });
+
+  describe("provisionConsole", () => {
+    it("should call armRequest with correct parameters", async () => {
+      const mockResponse = { uri: "https://shell.azure.com/console123" };
+      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
+
+      const result = await provisionConsole("eastus");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "providers/Microsoft.Portal/consoles/default",
+        method: "PUT",
+        apiVersion: "2023-02-01-preview",
+        customHeaders: {
+          "x-ms-console-preferred-location": "eastus",
+        },
+        body: {
+          properties: {
+            osType: OsType.Linux,
+          },
+        },
+      });
+      expect(result).toEqual(mockResponse);
+    });
+
+    it("should handle errors when console provisioning fails", async () => {
+      const mockError = new Error("Failed to provision console");
+      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
+
+      await expect(provisionConsole("eastus")).rejects.toThrow("Failed to provision console");
+
+      expect(armRequest).toHaveBeenCalledWith({
+        host: MOCK_ARM_ENDPOINT,
+        path: "providers/Microsoft.Portal/consoles/default",
+        method: "PUT",
+        apiVersion: "2023-02-01-preview",
+        customHeaders: {
+          "x-ms-console-preferred-location": "eastus",
+        },
+        body: {
+          properties: {
+            osType: OsType.Linux,
+          },
+        },
+      });
+    });
+  });
+
+  describe("connectTerminal", () => {
+    it("should call fetch with correct parameters", async () => {
+      const consoleUri = "https://shell.azure.com/console123";
+      const size = { rows: 24, cols: 80 };
+      const mockTerminalResponse = { id: "terminal-id", socketUri: "wss://shell.azure.com/socket" };
+
+      // Setup the mock response
+      mockJsonPromise.mockResolvedValueOnce(mockTerminalResponse);
+
+      const result = await connectTerminal(consoleUri, size);
+
+      expect(global.fetch).toHaveBeenCalledWith(
+        "https://shell.azure.com/console123/terminals?cols=80&rows=24&version=2019-01-01&shell=bash",
+        {
+          method: "POST",
+          headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+            "Content-Length": "2",
+            Authorization: "Bearer mock-token",
+            "x-ms-client-request-id": "mocked-uuid",
+            "Accept-Language": "en-US",
+          },
+          body: "{}",
+        },
+      );
+      expect(mockJsonPromise).toHaveBeenCalled();
+      expect(result).toEqual(mockTerminalResponse);
+    });
+
+    it("should handle errors when terminal connection fails", async () => {
+      const consoleUri = "https://shell.azure.com/console123";
+      const size = { rows: 24, cols: 80 };
+
+      // Mock fetch to return a failed response
+      global.fetch = jest.fn().mockImplementationOnce(() => {
+        return {
+          ok: false,
+          status: 500,
+          statusText: "Internal Server Error",
+          json: jest.fn().mockRejectedValue(new Error("Failed to parse JSON")),
+          text: jest.fn().mockResolvedValue("Server Error"),
+          headers: new Headers(),
+        } as unknown as Promise<Response>;
+      });
+
+      await expect(connectTerminal(consoleUri, size)).rejects.toThrow(
+        "Failed to connect to terminal: 500 Internal Server Error",
+      );
+
+      expect(global.fetch).toHaveBeenCalledWith(
+        "https://shell.azure.com/console123/terminals?cols=80&rows=24&version=2019-01-01&shell=bash",
+        expect.any(Object),
+      );
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.tsx b/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.tsx
new file mode 100644
index 000000000..ee4bd01e0
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.tsx
@@ -0,0 +1,117 @@
+import { v4 as uuidv4 } from "uuid";
+import { configContext } from "../../../../ConfigContext";
+import { userContext } from "../../../../UserContext";
+import { armRequest } from "../../../../Utils/arm/request";
+import {
+  CloudShellProviderInfo,
+  CloudShellSettings,
+  ConnectTerminalResponse,
+  NetworkType,
+  OsType,
+  ProvisionConsoleResponse,
+  SessionType,
+  ShellType,
+} from "../Models/DataModels";
+import { getLocale } from "../Utils/CommonUtils";
+
+export const getUserSettings = async (): Promise<CloudShellSettings> => {
+  return await armRequest<CloudShellSettings>({
+    host: configContext.ARM_ENDPOINT,
+    path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
+    method: "GET",
+    apiVersion: "2023-02-01-preview",
+  });
+};
+
+export const putEphemeralUserSettings = async (
+  userSubscriptionId: string,
+  userRegion: string,
+  vNetSettings?: object,
+) => {
+  const ephemeralSettings: CloudShellSettings = {
+    properties: {
+      preferredOsType: OsType.Linux,
+      preferredShellType: ShellType.Bash,
+      preferredLocation: userRegion,
+      networkType:
+        !vNetSettings || Object.keys(vNetSettings).length === 0
+          ? NetworkType.Default
+          : vNetSettings
+          ? NetworkType.Isolated
+          : NetworkType.Default,
+      sessionType: SessionType.Ephemeral,
+      userSubscription: userSubscriptionId,
+      vnetSettings: vNetSettings ?? {},
+    },
+  };
+
+  return await armRequest({
+    host: configContext.ARM_ENDPOINT,
+    path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
+    method: "PUT",
+    apiVersion: "2023-02-01-preview",
+    body: ephemeralSettings,
+  });
+};
+
+export const verifyCloudShellProviderRegistration = async (subscriptionId: string): Promise<CloudShellProviderInfo> => {
+  return await armRequest({
+    host: configContext.ARM_ENDPOINT,
+    path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell`,
+    method: "GET",
+    apiVersion: "2022-12-01",
+  });
+};
+
+export const registerCloudShellProvider = async (subscriptionId: string) => {
+  return await armRequest({
+    host: configContext.ARM_ENDPOINT,
+    path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell/register`,
+    method: "POST",
+    apiVersion: "2022-12-01",
+  });
+};
+
+export const provisionConsole = async (consoleLocation: string): Promise<ProvisionConsoleResponse> => {
+  const data = {
+    properties: {
+      osType: OsType.Linux,
+    },
+  };
+
+  return await armRequest<ProvisionConsoleResponse>({
+    host: configContext.ARM_ENDPOINT,
+    path: `providers/Microsoft.Portal/consoles/default`,
+    method: "PUT",
+    apiVersion: "2023-02-01-preview",
+    customHeaders: {
+      "x-ms-console-preferred-location": consoleLocation,
+    },
+    body: data,
+  });
+};
+
+export const connectTerminal = async (
+  consoleUri: string,
+  size: { rows: number; cols: number },
+): Promise<ConnectTerminalResponse> => {
+  const targetUri = consoleUri + `/terminals?cols=${size.cols}&rows=${size.rows}&version=2019-01-01&shell=bash`;
+  const resp = await fetch(targetUri, {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/json",
+      "Content-Length": "2",
+      Authorization: userContext.authorizationToken,
+      "x-ms-client-request-id": uuidv4(),
+      "Accept-Language": getLocale(),
+    },
+    body: "{}", // empty body is necessary
+  });
+
+  if (!resp.ok) {
+    throw new Error(`Failed to connect to terminal: ${resp.status} ${resp.statusText}`);
+  }
+
+  return resp.json();
+};
diff --git a/src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx b/src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx
new file mode 100644
index 000000000..c87d8eed4
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx
@@ -0,0 +1,91 @@
+export const enum OsType {
+  Linux = "linux",
+  Windows = "windows",
+}
+
+export const enum ShellType {
+  Bash = "bash",
+  PowerShellCore = "pwsh",
+}
+
+export const enum NetworkType {
+  Default = "Default",
+  Isolated = "Isolated",
+}
+
+/**
+ * Azure CloudShell session types:
+ * - Mounted: Sessions with persistent storage via an Azure File Share mount.
+ *   Files and configurations are preserved between sessions, allowing for
+ *   continuity of work across multiple CloudShell sessions.
+ *
+ * - Ephemeral: Temporary sessions without persistent storage.
+ *   All files and changes are discarded when the session ends.
+ *   These sessions start faster but don't retain user data.
+ *
+ * The session type affects resource allocation, startup time,
+ * and whether user files/configurations persist between sessions.
+ */
+export const enum SessionType {
+  Mounted = "Mounted",
+  Ephemeral = "Ephemeral",
+}
+
+export type CloudShellSettings = {
+  properties: UserSettingProperties;
+};
+
+export type UserSettingProperties = {
+  networkType: string;
+  preferredLocation: string;
+  preferredOsType: OsType;
+  preferredShellType: ShellType;
+  userSubscription: string;
+  sessionType: SessionType;
+  vnetSettings: object;
+};
+
+export type ProvisionConsoleResponse = {
+  properties: {
+    osType: OsType;
+    provisioningState: string;
+    uri: string;
+  };
+};
+
+export type Authorization = {
+  token: string;
+};
+
+export type ConnectTerminalResponse = {
+  id: string;
+  idleTimeout: string;
+  rootDirectory: string;
+  socketUri: string;
+  tokenUpdated: boolean;
+};
+
+export type ProviderAuthorization = {
+  applicationId: string;
+  roleDefinitionId: string;
+};
+
+export type ProviderResourceType = {
+  resourceType: string;
+  locations: string[];
+  apiVersions: string[];
+  defaultApiVersion?: string;
+  capabilities?: string;
+};
+
+export type RegistrationState = "Registered" | "NotRegistered" | "Registering" | "Unregistering";
+export type RegistrationPolicy = "RegistrationRequired" | "RegistrationOptional";
+
+export type CloudShellProviderInfo = {
+  id: string;
+  namespace: string;
+  authorizations?: ProviderAuthorization[];
+  resourceTypes: ProviderResourceType[];
+  registrationState: RegistrationState;
+  registrationPolicy: RegistrationPolicy;
+};
diff --git a/src/Explorer/Tabs/CloudShellTab/README.md b/src/Explorer/Tabs/CloudShellTab/README.md
new file mode 100644
index 000000000..8c5881124
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/README.md
@@ -0,0 +1,282 @@
+# Migrate Mongo(RU/vCore)/Postgres/Cassandra shell to CloudShell Design
+
+## CloudShell Overview
+Cloud Shell provides an integrated terminal experience directly within Cosmos Explorer, allowing users to interact with different database engines using their native command-line interfaces.
+
+## Component Architecture
+
+```mermaid
+classDiagram
+    
+    class FeatureRegistration {
+        <<Registers a new flag for switching shell to CloudShell>>
+        +enableCloudShell: boolean
+    }
+    
+    class ShellTypeHandlerFactory {
+        <<Initialize corresponding handler based on the type of shell>>
+        +getHandler(terminalKind: TerminalKind): ShellTypeHandler
+        +getKey(): string
+    }
+    
+    class AbstractShellHandler {
+        <<interface>>
+        +getShellName(): string
+        +getSetUpCommands(): string[]
+        +getConnectionCommand(): string
+        +getEndpoint(): string
+        +getTerminalSuppressedData(): string[]
+        +getInitialCommands(): string
+    }
+    
+    class CloudShellTerminalComponent {
+        <<React Component to Render CloudShell>>
+        -terminalKind: TerminalKind
+        -shellHandler: AbstractShellHandler
+        +render(): ReactElement
+    }
+    
+    class CloudShellTerminalCore {
+        <<Initialize CloudShell>>
+        +startCloudShellTerminal()
+    }
+    
+    class CloudShellClient {
+        <Initialize CloudShell APIs>
+        +getUserSettings(): Promise
+        +putEphemeralUserSettings(): void
+        +verifyCloudShellProviderRegistration: void
+        +registerCloudShellProvider(): void
+        +provisionConsole(): ProvisionConsoleResponse
+        +connectTerminal(): ConnectTerminalResponse
+        +authorizeSession(): Authorization
+    }
+    
+    class CloudShellTerminalComponentAdapter {
+        +getDatabaseAccount: DataModels.DatabaseAccount,
+        +getTabId: string,
+        +getUsername: string,
+        +isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
+        +kind: ViewModels.TerminalKind,
+    }
+    
+    class TerminalTab {
+        -cloudShellTerminalComponentAdapter: CloudShellTerminalComponentAdapter
+    }
+    
+    class ContextMenuButtonFactory {
+        +getCloudShellButton(): ReactElement
+        +isCloudShellEnabled(): boolean
+    }
+    
+    UserContext --> FeatureRegistration : contains
+    FeatureRegistration ..> ContextMenuButtonFactory : controls UI visibility
+    FeatureRegistration ..> CloudShellTerminalComponentAdapter : enables tab creation
+    FeatureRegistration ..> CloudShellClient : permits API calls
+    
+    TerminalTab --> CloudShellTerminalComponentAdapter : manages
+    ContextMenuButtonFactory --> TerminalTab : creates
+    TerminalTab --> CloudShellTerminalComponent : renders
+    CloudShellTerminalComponent --> CloudShellTerminalCore : contains
+    CloudShellTerminalComponent --> ShellTypeHandlerFactory : uses
+    CloudShellTerminalCore --> CloudShellClient : communicates with
+    CloudShellTerminalCore --> AbstractShellHandler : uses configuration from
+    
+    ShellTypeHandlerFactory --> AbstractShellHandler : creates
+    
+    class MongoShellHandler {
+        -key: string
+        +getShellName(): string
+        +getSetUpCommands(): string[]
+        +getConnectionCommand(): string
+        +getEndpoint(): string
+        +getTerminalSuppressedData(): string[]
+        +getInitialCommands(): string
+    
+    class VCoreMongoShellHandler {
+        +getShellName(): string
+        +getSetUpCommands(): string[]
+        +getConnectionCommand(): string
+        +getEndpoint(): string
+        +getTerminalSuppressedData(): string[]
+        +getInitialCommands(): string
+    }
+    
+    class CassandraShellHandler {
+        -key: string
+        +getShellName(): string
+        +getSetUpCommands(): string[]
+        +getConnectionCommand(): string
+        +getEndpoint(): string
+        +getTerminalSuppressedData(): string[]
+        +getInitialCommands(): string
+    }
+    
+    class PostgresShellHandler {
+        +getShellName(): string
+        +getSetUpCommands(): string[]
+        +getConnectionCommand(): string
+        +getEndpoint(): string
+        +getTerminalSuppressedData(): string[]
+        +getInitialCommands(): string
+    }
+    
+    AbstractShellHandler <|.. MongoShellHandler
+    AbstractShellHandler <|.. VCoreMongoShellHandler
+    AbstractShellHandler <|.. CassandraShellHandler
+    AbstractShellHandler <|.. PostgresShellHandler
+```
+
+## Changes
+
+The CloudShell functionality is controlled by the feature flag `userContext.features.enableCloudShell`. When this flag is **enabled** (set to true), the following occurs in the application:
+
+1. **UI Components Become Available:** There is "Open Mongo Shell" or similar button appears on data explorer or quick start window.
+
+2. **Service Capabilities Are Activated:**
+   - Backend API calls to CloudShell services are permitted
+   - Terminal connection endpoints become accessible
+
+3. **Database-Specific Features Are Unlocked:**
+   - Terminal experiences tailored to each database type become available
+   - Shell handlers are instantiated based on the database type
+
+4. **Telemetry Collection Begins:**
+   - When CloudShell Starts
+   - User Consent to access  shell out of the region
+   - When shell is connected
+   - When there is an error during CloudShell initialization
+
+The feature can be enabled by putting `feature.enableCloudShell=true` in url.
+When disabled, all CloudShell functionality is hidden and inaccessible, ensuring a consistent user experience regardless of the feature's state. These shell would be talking to tools federation.
+
+## Supported Shell Types
+
+| Terminal Kind | Handler Class | Description |
+|---------------|--------------|-------------|
+| Mongo | MongoShellHandler | Handles MongoDB RU shell connections |
+| VCoreMongo | VCoreMongoShellHandler | Handles for VCore MongoDB shell connections |
+| Cassandra | CassandraShellHandler | Handles Cassandra shell connections |
+| Postgres | PostgresShellHandler | Handles PostgreSQL shell connections |
+
+## Implementation Details
+
+The CloudShell implementation uses the Factory pattern to create appropriate shell handlers based on the database type. Each handler implements the common interface but provides specialized behavior for connecting to different database engines.
+
+### Key Components
+
+1. **ShellTypeHandlerFactory**: Creates the appropriate handler based on terminal kind
+   - Retrieves authentication keys from Azure Resource Manager
+   - Instantiates specialized handlers with configuration
+
+2. **ShellTypeHandler Interface i.e. AbstractShellHandler**: Defines the contract for all shell handlers
+   - `getConnectionCommand()`: Returns shell command to connect to database
+   - `getSetUpCommands()`: Returns list of scripts required to set up the environment
+   - `getEndpoint()`: Returns database connection end point
+   - `getTerminalSuppressedData()`: Returns a string which needs to be suppressed
+
+3. **Specialized Handlers**: Implement specific connection logic for each database type
+   - Handle authentication differences
+   - Provide appropriate shell arguments
+   - Format connection strings correctly
+
+4. **CloudShellTerminalComponent**: React component that renders the terminal interface
+   - Receives the terminal type as a property
+   - Uses ShellTypeHandlerFactory to get the appropriate handler
+   - Renders the CloudShellTerminalCore with the handler's configuration
+   - Manages component lifecycle and state
+
+5. **CloudShellTerminalCore**: Core terminal implementation
+   - Handles low-level terminal operations
+   - Uses the configuration from ShellTypeHandler to initialize the terminal
+   - Manages input/output streams between the user interface and the shell process
+   - Handles terminal events (resize, data, etc.)
+   - Implements terminal UI and styling
+
+6. **CloudShellClient**: Client for interacting with CloudShell backend services
+   - Initializes the terminal session with backend services
+   - Manages communication between the terminal UI and the backend shell process
+   - Handles authentication and security for the terminal session
+
+7. **ContextMenuButtonFactory**: Creates CloudShell UI entry points
+   - Checks if CloudShell is enabled via `userContext.features.enableCloudShell`
+   - Generates appropriate terminal buttons based on database type
+   - Handles conditional rendering of CloudShell options
+
+8. **TerminalTab**: Container component for terminal experiences
+   - Renders appropriate terminal type based on the selected database
+   - Manages terminal tab state and lifecycle
+   - Provides the integration point between the terminal and the rest of the Cosmos Explorer UI
+
+## Telemetry Collection
+
+CloudShell components utilize `TelemetryProcessor.trace` to collect usage data and diagnostics information that help improve the service and troubleshoot issues.
+
+### Telemetry Events
+   - When CloudShell Starts
+   - User Consent to access  shell out of the region
+   - When shell is connected
+   - When there is an error during CloudShell initialization
+
+| Action Name | Description | Collected Data |
+|------------|------------|----------------|
+| CloudShellTerminalSession/Start | Triggered when user starts a CloudShell session | Shell Type, dataExplorerArea as <i>CloudShell</i>|
+| CloudShellUserConsent/(Success/Failure) | Records user consent to get cloudshell in other region |  |
+| CloudShellTerminalSession/Success | Records if Terminal creation is successful | Shell Type, Shell Region |
+| CloudShellTerminalSession/Failure | Records of terminal creation is failed | Shell Type, Shell region (if available), error message  |
+
+### Real-time Use Cases
+
+1. **Performance Monitoring**:
+   - Track shell initialization times across different regions and database types
+
+2. **Error Detection and Resolution**:
+   - Detect increased error rates in real-time
+   - Identify patterns in failures
+   - Correlate errors with specific client configurations
+
+3. **Feature Adoption Analysis**:
+   - Measure adoption rates of different terminal types
+
+4. **User Experience Optimization**:
+   - Analyze session duration to understand engagement
+   - Identify abandoned sessions and potential pain points
+   - Measure the impact of new features on usage patterns
+   - Track command completion rates and error recovery
+
+## Limitations and Regional Availability
+
+### Network Isolation
+
+Network isolation (such as private endpoints, service endpoints, and VNet integration) is not currently supported for CloudShell connections. All connections to database instances through CloudShell require the database to be accessible through public endpoints.
+
+Key limitations:
+- Cannot connect to databases with public network access disabled
+- No support for private link resources
+- No integration with Azure Virtual Networks
+- IP-based firewall rules must include CloudShell service IPs
+
+### Data Residency
+
+Data residency requirements may not be fully satisfied when using CloudShell due to limited regional availability. CloudShell services are currently available in the following regions:
+
+| Geography | Regions |
+|-----------|---------|
+| Americas | East US, West US 2, South Central US, West Central US |
+| Europe | West Europe, North Europe |
+| Asia Pacific | Southeast Asia, Japan East, Australia East |
+| Middle East | UAE North |
+
+**Note:** For up-to-date supported regions, refer to the region configuration in:
+`src/Explorer/CloudShell/Configuration/RegionConfig.ts`
+
+### Implications for Compliance
+
+Organizations with strict data residency or network isolation requirements should be aware of these limitations:
+
+1. Data may transit through regions different from the database region
+2. Terminal session data is processed in CloudShell regions, not necessarily the database region
+3. Commands and queries are executed through CloudShell services, not directly against the database
+4. Connection strings contain database endpoints and are processed by CloudShell services
+
+These limitations are important considerations for workloads with specific compliance or regulatory requirements.
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx
new file mode 100644
index 000000000..fb89bd435
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx
@@ -0,0 +1,96 @@
+import { AbstractShellHandler, DISABLE_HISTORY, START_MARKER, EXIT_COMMAND } from "./AbstractShellHandler";
+
+// Mock implementation for testing
+class MockShellHandler extends AbstractShellHandler {
+  getShellName(): string {
+    return "MockShell";
+  }
+
+  getSetUpCommands(): string[] {
+    return ["setup-command-1", "setup-command-2"];
+  }
+
+  getConnectionCommand(): string {
+    return "mock-connection-command";
+  }
+
+  getEndpoint(): string {
+    return "mock-endpoint";
+  }
+
+  getTerminalSuppressedData(): string {
+    return "suppressed-data";
+  }
+}
+
+describe("AbstractShellHandler", () => {
+  let shellHandler: MockShellHandler;
+
+  // Reset all mocks and spies before each test
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    shellHandler = new MockShellHandler();
+  });
+
+  // Reset everything after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  // Cleanup after each test
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("getInitialCommands", () => {
+    it("should combine commands in the correct order", () => {
+      // Spy on abstract methods to ensure they're called
+      const getSetUpCommandsSpy = jest.spyOn(shellHandler, "getSetUpCommands");
+      const getConnectionCommandSpy = jest.spyOn(shellHandler, "getConnectionCommand");
+
+      const result = shellHandler.getInitialCommands();
+
+      // Verify abstract methods were called
+      expect(getSetUpCommandsSpy).toHaveBeenCalled();
+      expect(getConnectionCommandSpy).toHaveBeenCalled();
+
+      // Verify output format and content
+      const expectedOutput = [
+        START_MARKER,
+        DISABLE_HISTORY,
+        "setup-command-1",
+        "setup-command-2",
+        `{ mock-connection-command; } || true;${EXIT_COMMAND}`,
+      ]
+        .join("\n")
+        .concat("\n");
+
+      expect(result).toBe(expectedOutput);
+    });
+  });
+
+  describe("abstract methods implementation", () => {
+    it("should return the correct shell name", () => {
+      expect(shellHandler.getShellName()).toBe("MockShell");
+    });
+
+    it("should return the setup commands", () => {
+      expect(shellHandler.getSetUpCommands()).toEqual(["setup-command-1", "setup-command-2"]);
+    });
+
+    it("should return the connection command", () => {
+      expect(shellHandler.getConnectionCommand()).toBe("mock-connection-command");
+    });
+
+    it("should return the endpoint", () => {
+      expect(shellHandler.getEndpoint()).toBe("mock-endpoint");
+    });
+
+    it("should return the terminal suppressed data", () => {
+      expect(shellHandler.getTerminalSuppressedData()).toBe("suppressed-data");
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
new file mode 100644
index 000000000..f72dda8f6
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
@@ -0,0 +1,59 @@
+/**
+ * Command that serves as a marker to indicate the start of shell initialization.
+ * Outputs to /dev/null to prevent displaying in the terminal.
+ */
+export const START_MARKER = `echo "START INITIALIZATION" > /dev/null`;
+
+/**
+ * Command to disable command history recording in the shell.
+ * Prevents initialization commands from appearing in history.
+ */
+export const DISABLE_HISTORY = `set +o history`;
+/**
+ * Command that displays an error message and exits the shell session.
+ * Used when shell initialization or connection fails.
+ */
+export const EXIT_COMMAND = ` printf "\\033[1;31mSession ended. Please close this tab and initiate a new shell session if needed.\\033[0m\\n" && exit`;
+
+/**
+ * Abstract class that defines the interface for shell-specific handlers
+ * in the CloudShell terminal implementation. Each supported shell type
+ * (Mongo, PG, etc.) should extend this class and implement
+ * the required methods.
+ */
+export abstract class AbstractShellHandler {
+  abstract getShellName(): string;
+  abstract getSetUpCommands(): string[];
+  abstract getConnectionCommand(): string;
+  abstract getTerminalSuppressedData(): string;
+
+  /**
+   * Constructs the complete initialization command sequence for the shell.
+   *
+   * This method:
+   * 1. Starts with the initialization marker
+   * 2. Disables command history
+   * 3. Adds shell-specific setup commands
+   * 4. Adds the connection command with error handling
+   * 5. Adds a fallback exit command if connection fails
+   *
+   * The connection command is wrapped in a construct that prevents
+   * errors from terminating the entire session immediately, allowing
+   * the friendly exit message to be displayed.
+   *
+   * @returns {string} Complete initialization command sequence with newlines
+   */
+  public getInitialCommands(): string {
+    const setupCommands = this.getSetUpCommands();
+    const connectionCommand = this.getConnectionCommand();
+
+    const allCommands = [
+      START_MARKER,
+      DISABLE_HISTORY,
+      ...setupCommands,
+      `{ ${connectionCommand}; } || true;${EXIT_COMMAND}`,
+    ];
+
+    return allCommands.join("\n").concat("\n");
+  }
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
new file mode 100644
index 000000000..ea5310a27
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
@@ -0,0 +1,148 @@
+import * as CommonUtils from "../Utils/CommonUtils";
+import { CassandraShellHandler } from "./CassandraShellHandler";
+
+// Define interfaces for the database account structure
+interface DatabaseAccountProperties {
+  cassandraEndpoint?: string;
+}
+
+interface DatabaseAccount {
+  name?: string;
+  properties?: DatabaseAccountProperties;
+}
+
+// Define mock state that can be modified by tests
+const mockState = {
+  databaseAccount: {
+    name: "test-account",
+    properties: {
+      cassandraEndpoint: "https://test-endpoint.cassandra.cosmos.azure.com:443/",
+    },
+  } as DatabaseAccount,
+};
+
+// Mock dependencies using factory functions
+jest.mock("../../../../UserContext", () => ({
+  get userContext() {
+    return {
+      get databaseAccount() {
+        return mockState.databaseAccount;
+      },
+    };
+  },
+}));
+
+// Reset all modules before running tests
+beforeAll(() => {
+  jest.resetModules();
+});
+
+jest.mock("../Utils/CommonUtils", () => ({
+  getHostFromUrl: jest.fn().mockReturnValue("test-endpoint.cassandra.cosmos.azure.com"),
+}));
+
+describe("CassandraShellHandler", () => {
+  const testKey = "test-key";
+  let handler: CassandraShellHandler;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    handler = new CassandraShellHandler(testKey);
+
+    // Reset mock state before each test
+    mockState.databaseAccount = {
+      name: "test-account",
+      properties: {
+        cassandraEndpoint: "https://test-endpoint.cassandra.cosmos.azure.com:443/",
+      },
+    };
+  });
+
+  // Clean up after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  describe("Positive test cases", () => {
+    test("should return 'Cassandra' as shell name", () => {
+      expect(handler.getShellName()).toBe("Cassandra");
+    });
+
+    test("should return an array of setup commands", () => {
+      const commands = handler.getSetUpCommands();
+
+      expect(Array.isArray(commands)).toBe(true);
+      expect(commands.length).toBe(5);
+      expect(commands).toContain("source ~/.bashrc");
+      expect(
+        commands.some((cmd) =>
+          cmd.includes("if ! command -v cqlsh &> /dev/null; then echo '⚠️ cqlsh not found. Installing...'; fi"),
+        ),
+      ).toBe(true);
+      expect(commands.some((cmd) => cmd.includes("pip3 install --user cqlsh==6.2.0"))).toBe(true);
+      expect(commands.some((cmd) => cmd.includes("export SSL_VERSION=TLSv1_2"))).toBe(true);
+      expect(commands.some((cmd) => cmd.includes("export SSL_VALIDATE=false"))).toBe(true);
+    });
+
+    test("should return correct connection command", () => {
+      const expectedCommand = "cqlsh test-endpoint.cassandra.cosmos.azure.com 10350 -u test-account -p test-key --ssl";
+
+      expect(handler.getConnectionCommand()).toBe(expectedCommand);
+      expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-endpoint.cassandra.cosmos.azure.com:443/");
+    });
+
+    test("should return the correct terminal suppressed data", () => {
+      expect(handler.getTerminalSuppressedData()).toBe("");
+    });
+
+    test("should include the correct package version in setup commands", () => {
+      const commands = handler.getSetUpCommands();
+      const hasCorrectPackageVersion = commands.some((cmd) => cmd.includes("cqlsh==6.2.0"));
+
+      expect(hasCorrectPackageVersion).toBe(true);
+    });
+  });
+
+  describe("Negative test cases", () => {
+    test("should handle empty host from URL", () => {
+      (CommonUtils.getHostFromUrl as jest.Mock).mockReturnValueOnce("");
+
+      const command = handler.getConnectionCommand();
+
+      expect(command).toBe("cqlsh  10350 -u test-account -p test-key --ssl");
+    });
+
+    test("should handle empty key", () => {
+      const emptyKeyHandler = new CassandraShellHandler("");
+
+      expect(emptyKeyHandler.getConnectionCommand()).toBe(
+        "cqlsh test-endpoint.cassandra.cosmos.azure.com 10350 -u test-account -p  --ssl",
+      );
+    });
+
+    test("should handle undefined account name", () => {
+      mockState.databaseAccount = {
+        properties: { cassandraEndpoint: "https://test-endpoint.cassandra.cosmos.azure.com:443/" },
+      };
+
+      expect(handler.getConnectionCommand()).toBe("echo 'Database name not found.'");
+    });
+
+    test("should handle undefined database account", () => {
+      mockState.databaseAccount = undefined;
+
+      expect(handler.getConnectionCommand()).toBe("echo 'Database name not found.'");
+    });
+
+    test("should handle missing cassandra endpoint", () => {
+      mockState.databaseAccount = {
+        name: "test-account",
+        properties: {},
+      };
+
+      expect(handler.getConnectionCommand()).toBe("echo 'Cassandra endpoint not found.'");
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx
new file mode 100644
index 000000000..edd878bb4
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx
@@ -0,0 +1,47 @@
+import { userContext } from "../../../../UserContext";
+import { getHostFromUrl } from "../Utils/CommonUtils";
+import { AbstractShellHandler } from "./AbstractShellHandler";
+
+const PACKAGE_VERSION: string = "6.2.0";
+
+export class CassandraShellHandler extends AbstractShellHandler {
+  private _key: string;
+  private _endpoint: string | undefined;
+
+  constructor(private key: string) {
+    super();
+    this._key = key;
+    this._endpoint = userContext?.databaseAccount?.properties?.cassandraEndpoint;
+  }
+
+  public getShellName(): string {
+    return "Cassandra";
+  }
+
+  public getSetUpCommands(): string[] {
+    return [
+      "if ! command -v cqlsh &> /dev/null; then echo '⚠️ cqlsh not found. Installing...'; fi",
+      `if ! command -v cqlsh &> /dev/null; then pip3 install --user cqlsh==${PACKAGE_VERSION} ; fi`,
+      "echo 'export SSL_VERSION=TLSv1_2' >> ~/.bashrc",
+      "echo 'export SSL_VALIDATE=false' >> ~/.bashrc",
+      "source ~/.bashrc",
+    ];
+  }
+
+  public getConnectionCommand(): string {
+    if (!this._endpoint) {
+      return `echo '${this.getShellName()} endpoint not found.'`;
+    }
+
+    const dbName = userContext?.databaseAccount?.name;
+    if (!dbName) {
+      return "echo 'Database name not found.'";
+    }
+
+    return `cqlsh ${getHostFromUrl(this._endpoint)} 10350 -u ${dbName} -p ${this._key} --ssl`;
+  }
+
+  public getTerminalSuppressedData(): string {
+    return "";
+  }
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
new file mode 100644
index 000000000..b320a9b68
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
@@ -0,0 +1,130 @@
+import { userContext } from "../../../../UserContext";
+import * as CommonUtils from "../Utils/CommonUtils";
+import { MongoShellHandler } from "./MongoShellHandler";
+
+// Define interfaces for type safety
+interface DatabaseAccountProperties {
+  mongoEndpoint?: string;
+}
+
+interface DatabaseAccount {
+  id?: string;
+  name: string;
+  location?: string;
+  type?: string;
+  kind?: string;
+  properties: DatabaseAccountProperties;
+}
+
+interface UserContextType {
+  databaseAccount: DatabaseAccount;
+}
+
+// Mock dependencies
+jest.mock("../../../../UserContext", () => ({
+  userContext: {
+    databaseAccount: {
+      name: "test-account",
+      properties: {
+        mongoEndpoint: "https://test-mongo.documents.azure.com:443/",
+      },
+    },
+  },
+}));
+
+jest.mock("../Utils/CommonUtils", () => ({
+  getHostFromUrl: jest.fn().mockReturnValue("test-mongo.documents.azure.com"),
+}));
+
+describe("MongoShellHandler", () => {
+  const testKey = "test-key";
+  let mongoShellHandler: MongoShellHandler;
+
+  beforeEach(() => {
+    mongoShellHandler = new MongoShellHandler(testKey);
+    jest.clearAllMocks();
+  });
+
+  // Clean up after each test
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Clean up after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  describe("getShellName", () => {
+    it("should return MongoDB", () => {
+      expect(mongoShellHandler.getShellName()).toBe("MongoDB");
+    });
+  });
+
+  describe("getSetUpCommands", () => {
+    it("should return an array of setup commands", () => {
+      const commands = mongoShellHandler.getSetUpCommands();
+
+      expect(Array.isArray(commands)).toBe(true);
+      expect(commands.length).toBe(6);
+      expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
+    });
+  });
+
+  describe("getConnectionCommand", () => {
+    it("should return the correct connection command", () => {
+      // Save original databaseAccount
+      const originalDatabaseAccount = userContext.databaseAccount;
+
+      // Directly assign the modified databaseAccount
+      (userContext as UserContextType).databaseAccount = {
+        id: "test-id",
+        name: "test-account",
+        location: "test-location",
+        type: "test-type",
+        kind: "test-kind",
+        properties: { mongoEndpoint: "https://test-mongo.documents.azure.com:443/" },
+      };
+
+      const command = mongoShellHandler.getConnectionCommand();
+
+      expect(command).toBe(
+        "mongosh --host test-mongo.documents.azure.com --port 10255 --username test-account --password test-key --tls --tlsAllowInvalidCertificates",
+      );
+      expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-mongo.documents.azure.com:443/");
+
+      // Restore original
+      (userContext as UserContextType).databaseAccount = originalDatabaseAccount;
+    });
+
+    it("should handle missing database account name", () => {
+      // Save original databaseAccount
+      const originalDatabaseAccount = userContext.databaseAccount;
+
+      // Directly assign the modified databaseAccount
+      (userContext as UserContextType).databaseAccount = {
+        id: "test-id",
+        name: "", // Empty name to simulate missing name
+        location: "test-location",
+        type: "test-type",
+        kind: "test-kind",
+        properties: { mongoEndpoint: "https://test.com" },
+      };
+
+      const command = mongoShellHandler.getConnectionCommand();
+
+      expect(command).toBe("echo 'Database name not found.'");
+
+      // Restore original
+      (userContext as UserContextType).databaseAccount = originalDatabaseAccount;
+    });
+  });
+
+  describe("getTerminalSuppressedData", () => {
+    it("should return the correct warning message", () => {
+      expect(mongoShellHandler.getTerminalSuppressedData()).toBe("Warning: Non-Genuine MongoDB Detected");
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
new file mode 100644
index 000000000..fce6be513
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
@@ -0,0 +1,48 @@
+import { userContext } from "../../../../UserContext";
+import { getHostFromUrl } from "../Utils/CommonUtils";
+import { AbstractShellHandler } from "./AbstractShellHandler";
+
+const PACKAGE_VERSION: string = "2.5.0";
+
+export class MongoShellHandler extends AbstractShellHandler {
+  private _key: string;
+  private _endpoint: string | undefined;
+  constructor(private key: string) {
+    super();
+    this._key = key;
+    this._endpoint = userContext?.databaseAccount?.properties?.mongoEndpoint;
+  }
+
+  public getShellName(): string {
+    return "MongoDB";
+  }
+
+  public getSetUpCommands(): string[] {
+    return [
+      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
+      `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      `if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-${PACKAGE_VERSION}-linux-x64/* ~/mongosh/; fi`,
+      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
+      "source ~/.bashrc",
+    ];
+  }
+
+  public getConnectionCommand(): string {
+    if (!this._endpoint) {
+      return `echo '${this.getShellName()} endpoint not found.'`;
+    }
+
+    const dbName = userContext?.databaseAccount?.name;
+    if (!dbName) {
+      return "echo 'Database name not found.'";
+    }
+    return `mongosh --host ${getHostFromUrl(this._endpoint)} --port 10255 --username ${dbName} --password ${
+      this._key
+    } --tls --tlsAllowInvalidCertificates`;
+  }
+
+  public getTerminalSuppressedData(): string {
+    return "Warning: Non-Genuine MongoDB Detected";
+  }
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx
new file mode 100644
index 000000000..ee4defaa0
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx
@@ -0,0 +1,64 @@
+import { PostgresShellHandler } from "./PostgresShellHandler";
+
+// Mock dependencies
+jest.mock("../../../../UserContext", () => ({
+  userContext: {
+    databaseAccount: {
+      properties: {
+        postgresqlEndpoint: "test-postgres.postgres.database.azure.com",
+      },
+    },
+    postgresConnectionStrParams: {
+      adminLogin: "test-admin",
+    },
+  },
+}));
+
+describe("PostgresShellHandler", () => {
+  let postgresShellHandler: PostgresShellHandler;
+
+  beforeEach(() => {
+    postgresShellHandler = new PostgresShellHandler();
+    jest.clearAllMocks();
+  });
+
+  // Clean up after each test
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Clean up after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  // Positive test cases
+  describe("Positive Tests", () => {
+    it("should return correct shell name", () => {
+      expect(postgresShellHandler.getShellName()).toBe("PostgreSQL");
+    });
+
+    it("should return array of setup commands with correct package version", () => {
+      const commands = postgresShellHandler.getSetUpCommands();
+
+      expect(Array.isArray(commands)).toBe(true);
+      expect(commands.length).toBe(9);
+      expect(commands[1]).toContain("postgresql-15.2.tar.bz2");
+      expect(commands[0]).toContain("psql not found");
+    });
+
+    it("should generate proper connection command with endpoint", () => {
+      const connectionCommand = postgresShellHandler.getConnectionCommand();
+
+      expect(connectionCommand).toContain('-h "test-postgres.postgres.database.azure.com"');
+      expect(connectionCommand).toContain("-p 5432");
+      expect(connectionCommand).toContain("--set=sslmode=require");
+    });
+
+    it("should return empty string for terminal suppressed data", () => {
+      expect(postgresShellHandler.getTerminalSuppressedData()).toBe("");
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
new file mode 100644
index 000000000..d2b235eca
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
@@ -0,0 +1,63 @@
+import { userContext } from "../../../../UserContext";
+import { AbstractShellHandler } from "./AbstractShellHandler";
+
+const PACKAGE_VERSION: string = "15.2";
+
+export class PostgresShellHandler extends AbstractShellHandler {
+  private _endpoint: string | undefined;
+
+  constructor() {
+    super();
+    this._endpoint = userContext?.databaseAccount?.properties?.postgresqlEndpoint;
+  }
+
+  public getShellName(): string {
+    return "PostgreSQL";
+  }
+
+  /**
+   * PostgreSQL setup commands for CloudShell:
+   *
+   * 1. Check if psql client is already installed
+   * 2. Download PostgreSQL source package if needed
+   * 3. Extract the PostgreSQL package
+   * 4. Create installation directory
+   * 5. Download and extract readline dependency
+   * 6. Configure readline with appropriate installation path
+   * 7. Add PostgreSQL binaries to system PATH
+   * 8. Apply PATH changes
+   *
+   * All installation steps run conditionally only if
+   * psql is not already available in the environment.
+   */
+  public getSetUpCommands(): string[] {
+    return [
+      "if ! command -v psql &> /dev/null; then echo '⚠️ psql not found. Installing...'; fi",
+      `if ! command -v psql &> /dev/null; then curl -LO https://ftp.postgresql.org/pub/source/v${PACKAGE_VERSION}/postgresql-${PACKAGE_VERSION}.tar.bz2; fi`,
+      `if ! command -v psql &> /dev/null; then tar -xvjf postgresql-${PACKAGE_VERSION}.tar.bz2; fi`,
+      "if ! command -v psql &> /dev/null; then mkdir -p ~/pgsql; fi",
+      "if ! command -v psql &> /dev/null; then curl -LO https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz; fi",
+      "if ! command -v psql &> /dev/null; then tar -xvzf readline-8.1.tar.gz; fi",
+      "if ! command -v psql &> /dev/null; then cd readline-8.1 && ./configure --prefix=$HOME/pgsql; fi",
+      "if ! command -v psql &> /dev/null; then echo 'export PATH=$HOME/pgsql/bin:$PATH' >> ~/.bashrc; fi",
+      "source ~/.bashrc",
+    ];
+  }
+
+  public getConnectionCommand(): string {
+    if (!this._endpoint) {
+      return `echo '${this.getShellName()} endpoint not found.'`;
+    }
+
+    // Database name is hardcoded as "citus" because Azure Cosmos DB for PostgreSQL
+    // uses Citus as its distributed database extension with this default database name.
+    // All Azure Cosmos DB PostgreSQL deployments follow this convention.
+    // Ref. https://learn.microsoft.com/en-us/azure/cosmos-db/postgresql/reference-limits#database-creation
+    const loginName = userContext.postgresConnectionStrParams.adminLogin;
+    return `psql -h "${this._endpoint}" -p 5432 -d "citus" -U "${loginName}" --set=sslmode=require`;
+  }
+
+  public getTerminalSuppressedData(): string {
+    return "";
+  }
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.test.tsx
new file mode 100644
index 000000000..327d40b3e
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.test.tsx
@@ -0,0 +1,113 @@
+import { TerminalKind } from "../../../../Contracts/ViewModels";
+import { userContext } from "../../../../UserContext";
+import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
+import { CassandraShellHandler } from "./CassandraShellHandler";
+import { MongoShellHandler } from "./MongoShellHandler";
+import { PostgresShellHandler } from "./PostgresShellHandler";
+import { getHandler, getKey } from "./ShellTypeFactory";
+import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
+
+// Mock dependencies
+jest.mock("../../../../UserContext", () => ({
+  userContext: {
+    databaseAccount: { name: "testDbName" },
+    subscriptionId: "testSubId",
+    resourceGroup: "testResourceGroup",
+  },
+}));
+
+jest.mock("../../../../Utils/arm/generatedClients/cosmos/databaseAccounts", () => ({
+  listKeys: jest.fn(),
+}));
+
+describe("ShellTypeHandlerFactory", () => {
+  const mockKey = "testKey";
+
+  beforeEach(() => {
+    (listKeys as jest.Mock).mockResolvedValue({ primaryMasterKey: mockKey });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Clean up after each test
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Clean up after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  // Negative test cases
+  describe("Negative test cases", () => {
+    it("should throw an error for unsupported terminal kind", async () => {
+      await expect(getHandler("UnsupportedKind" as unknown as TerminalKind)).rejects.toThrow(
+        "Unsupported shell type: UnsupportedKind",
+      );
+    });
+
+    it("should return empty string when database name is missing", async () => {
+      // Temporarily modify the mock
+      const originalName = userContext.databaseAccount.name;
+      type DatabaseAccountType = { name: string };
+      (userContext.databaseAccount as DatabaseAccountType).name = "";
+
+      const key = await getKey();
+      expect(key).toBe("");
+      expect(listKeys).not.toHaveBeenCalled();
+
+      // Restore the mock
+      (userContext.databaseAccount as DatabaseAccountType).name = originalName;
+    });
+
+    it("should return empty string when listKeys returns null", async () => {
+      (listKeys as jest.Mock).mockResolvedValue(null);
+
+      const key = await getKey();
+      expect(key).toBe("");
+    });
+
+    it("should return empty string when primaryMasterKey is missing", async () => {
+      (listKeys as jest.Mock).mockResolvedValue({
+        /* no primaryMasterKey */
+      });
+
+      const key = await getKey();
+      expect(key).toBe("");
+    });
+  });
+
+  // Positive test cases
+  describe("Positive test cases", () => {
+    it("should return PostgresShellHandler for Postgres terminal kind", async () => {
+      const handler = await getHandler(TerminalKind.Postgres);
+      expect(handler).toBeInstanceOf(PostgresShellHandler);
+    });
+
+    it("should return MongoShellHandler with key for Mongo terminal kind", async () => {
+      const handler = await getHandler(TerminalKind.Mongo);
+      expect(handler).toBeInstanceOf(MongoShellHandler);
+    });
+
+    it("should return VCoreMongoShellHandler for VCoreMongo terminal kind", async () => {
+      const handler = await getHandler(TerminalKind.VCoreMongo);
+      expect(handler).toBeInstanceOf(VCoreMongoShellHandler);
+    });
+
+    it("should return CassandraShellHandler with key for Cassandra terminal kind", async () => {
+      const handler = await getHandler(TerminalKind.Cassandra);
+      expect(handler).toBeInstanceOf(CassandraShellHandler);
+    });
+
+    it("should get key successfully when database name exists", async () => {
+      const key = await getKey();
+      expect(key).toBe(mockKey);
+      expect(listKeys).toHaveBeenCalledWith("testSubId", "testResourceGroup", "testDbName");
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.tsx
new file mode 100644
index 000000000..30ecdcaf3
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.tsx
@@ -0,0 +1,36 @@
+import { TerminalKind } from "../../../../Contracts/ViewModels";
+import { userContext } from "../../../../UserContext";
+import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
+import { AbstractShellHandler } from "./AbstractShellHandler";
+import { CassandraShellHandler } from "./CassandraShellHandler";
+import { MongoShellHandler } from "./MongoShellHandler";
+import { PostgresShellHandler } from "./PostgresShellHandler";
+import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
+
+/**
+ * Gets the appropriate handler for the given shell type
+ */
+export async function getHandler(shellType: TerminalKind): Promise<AbstractShellHandler> {
+  switch (shellType) {
+    case TerminalKind.Postgres:
+      return new PostgresShellHandler();
+    case TerminalKind.Mongo:
+      return new MongoShellHandler(await getKey());
+    case TerminalKind.VCoreMongo:
+      return new VCoreMongoShellHandler();
+    case TerminalKind.Cassandra:
+      return new CassandraShellHandler(await getKey());
+    default:
+      throw new Error(`Unsupported shell type: ${shellType}`);
+  }
+}
+
+export async function getKey(): Promise<string> {
+  const dbName = userContext.databaseAccount.name;
+  if (!dbName) {
+    return "";
+  }
+
+  const keys = await listKeys(userContext.subscriptionId, userContext.resourceGroup, dbName);
+  return keys?.primaryMasterKey || "";
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
new file mode 100644
index 000000000..7c0baed84
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
@@ -0,0 +1,63 @@
+import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
+
+// Mock dependencies
+jest.mock("../../../../UserContext", () => ({
+  userContext: {
+    databaseAccount: {
+      properties: {
+        vcoreMongoEndpoint: "test-vcore-mongo.mongo.cosmos.azure.com",
+      },
+    },
+    vcoreMongoConnectionParams: {
+      adminLogin: "username",
+    },
+  },
+}));
+
+describe("VCoreMongoShellHandler", () => {
+  let vcoreMongoShellHandler: VCoreMongoShellHandler;
+
+  beforeEach(() => {
+    vcoreMongoShellHandler = new VCoreMongoShellHandler();
+    jest.clearAllMocks();
+  });
+
+  // Clean up after each test
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Clean up after all tests
+  afterAll(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  // Positive test cases
+  describe("Positive Tests", () => {
+    it("should return correct shell name", () => {
+      expect(vcoreMongoShellHandler.getShellName()).toBe("MongoDB VCore");
+    });
+
+    it("should return array of setup commands with correct package version", () => {
+      const commands = vcoreMongoShellHandler.getSetUpCommands();
+
+      expect(Array.isArray(commands)).toBe(true);
+      expect(commands.length).toBe(6);
+      expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
+      expect(commands[0]).toContain("mongosh not found");
+    });
+
+    it("should generate proper connection command with endpoint", () => {
+      const connectionCommand = vcoreMongoShellHandler.getConnectionCommand();
+
+      expect(connectionCommand).toContain("mongodb+srv://username:@test-vcore-mongo.mongo.cosmos.azure.com");
+      expect(connectionCommand).toContain("authMechanism=SCRAM-SHA-256");
+    });
+
+    it("should return the correct terminal suppressed data", () => {
+      expect(vcoreMongoShellHandler.getTerminalSuppressedData()).toBe("Warning: Non-Genuine MongoDB Detected");
+    });
+  });
+});
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
new file mode 100644
index 000000000..8a3a38610
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
@@ -0,0 +1,54 @@
+import { userContext } from "../../../../UserContext";
+import { AbstractShellHandler } from "./AbstractShellHandler";
+
+const PACKAGE_VERSION: string = "2.5.0";
+
+export class VCoreMongoShellHandler extends AbstractShellHandler {
+  private _endpoint: string | undefined;
+
+  constructor() {
+    super();
+    this._endpoint = userContext?.databaseAccount?.properties?.vcoreMongoEndpoint;
+  }
+
+  public getShellName(): string {
+    return "MongoDB VCore";
+  }
+
+  /**
+   * Setup commands for MongoDB VCore shell:
+   *
+   * 1. Check if mongosh is already installed
+   * 2. Download mongosh package if not installed
+   * 3. Extract the package to access mongosh binaries
+   * 4. Move extracted files to ~/mongosh directory
+   * 5. Add mongosh binary path to system PATH
+   * 6. Apply PATH changes by sourcing .bashrc
+   *
+   * Each command runs conditionally only if mongosh
+   * is not already present in the environment.
+   */
+  public getSetUpCommands(): string[] {
+    return [
+      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
+      `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      `if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-${PACKAGE_VERSION}-linux-x64/* ~/mongosh/; fi`,
+      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
+      "source ~/.bashrc",
+    ];
+  }
+
+  public getConnectionCommand(): string {
+    if (!this._endpoint) {
+      return `echo '${this.getShellName()} endpoint not found.'`;
+    }
+
+    const userName = userContext.vcoreMongoConnectionParams.adminLogin;
+    return `mongosh "mongodb+srv://${userName}:@${this._endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000"`;
+  }
+
+  public getTerminalSuppressedData(): string {
+    return "Warning: Non-Genuine MongoDB Detected";
+  }
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx b/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
new file mode 100644
index 000000000..9fc011c28
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
@@ -0,0 +1,207 @@
+import { AbstractShellHandler } from "Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler";
+import { IDisposable, ITerminalAddon, Terminal } from "@xterm/xterm";
+
+interface IAttachOptions {
+  bidirectional?: boolean;
+  startMarker?: string;
+  shellHandler?: AbstractShellHandler;
+}
+
+/**
+ * Terminal addon that attaches a terminal to a WebSocket for bidirectional
+ * communication with Azure CloudShell.
+ *
+ * Features:
+ * - Manages bidirectional data flow between terminal and CloudShell WebSocket
+ * - Processes special status messages within the data stream
+ * - Controls terminal output display during shell initialization
+ * - Supports shell-specific customizations via AbstractShellHandler
+ *
+ * @implements {ITerminalAddon}
+ */
+export class AttachAddon implements ITerminalAddon {
+  private _socket: WebSocket;
+  private _bidirectional: boolean;
+  private _disposables: IDisposable[] = [];
+  private _socketData: string;
+
+  private _allowTerminalWrite: boolean = true;
+
+  private _startMarker: string;
+  private _shellHandler: AbstractShellHandler;
+
+  constructor(socket: WebSocket, options?: IAttachOptions) {
+    this._socket = socket;
+    // always set binary type to arraybuffer, we do not handle blobs
+    this._socket.binaryType = "arraybuffer";
+    this._bidirectional = !(options && options.bidirectional === false);
+    this._startMarker = options?.startMarker;
+    this._shellHandler = options?.shellHandler;
+    this._socketData = "";
+    this._allowTerminalWrite = true;
+  }
+
+  /**
+   * Activates the addon with the provided terminal
+   *
+   * Sets up event listeners for terminal input and WebSocket messages.
+   * Links the terminal input to the WebSocket and vice versa.
+   *
+   * @param {Terminal} terminal - The XTerm terminal instance
+   */
+  public activate(terminal: Terminal): void {
+    this.addMessageListener(terminal);
+    if (this._bidirectional) {
+      this._disposables.push(terminal.onData((data) => this._sendData(data)));
+      this._disposables.push(terminal.onBinary((data) => this._sendBinary(data)));
+    }
+
+    this._disposables.push(addSocketListener(this._socket, "close", () => this.dispose()));
+    this._disposables.push(addSocketListener(this._socket, "error", () => this.dispose()));
+  }
+
+  /**
+   * Adds a message listener to process data from the WebSocket
+   *
+   * Handles:
+   * - Status message extraction (between ie_us and ie_ue markers)
+   * - Partial message accumulation
+   * - Shell initialization messages
+   * - Suppression of unwanted shell output
+   *
+   * @param {Terminal} terminal - The XTerm terminal instance
+   */
+  public addMessageListener(terminal: Terminal): void {
+    this._disposables.push(
+      addSocketListener(this._socket, "message", (ev) => {
+        let data: ArrayBuffer | string = ev.data;
+        const startStatusJson = "ie_us";
+        const endStatusJson = "ie_ue";
+
+        if (typeof data === "object") {
+          const enc = new TextDecoder("utf-8");
+          data = enc.decode(ev.data as ArrayBuffer);
+        }
+
+        // for example of json object look in TerminalHelper in the socket.onMessage
+        if (data.includes(startStatusJson) && data.includes(endStatusJson)) {
+          // process as one line
+          const statusData = data.split(startStatusJson)[1].split(endStatusJson)[0];
+          data = data.replace(statusData, "");
+          data = data.replace(startStatusJson, "");
+          data = data.replace(endStatusJson, "");
+        } else if (data.includes(startStatusJson)) {
+          // check for start
+          const partialStatusData = data.split(startStatusJson)[1];
+          this._socketData += partialStatusData;
+          data = data.replace(partialStatusData, "");
+          data = data.replace(startStatusJson, "");
+        } else if (data.includes(endStatusJson)) {
+          // check for end and process the command
+          const partialStatusData = data.split(endStatusJson)[0];
+          this._socketData += partialStatusData;
+          data = data.replace(partialStatusData, "");
+          data = data.replace(endStatusJson, "");
+          this._socketData = "";
+        } else if (this._socketData.length > 0) {
+          // check if the line is all data then just concatenate
+          this._socketData += data;
+          data = "";
+        }
+
+        if (this._allowTerminalWrite && data.includes(this._startMarker)) {
+          this._allowTerminalWrite = false;
+          terminal.write(`Preparing ${this._shellHandler.getShellName()} environment...\r\n`);
+        }
+
+        if (this._allowTerminalWrite) {
+          const suppressedData = this._shellHandler?.getTerminalSuppressedData();
+          const hasSuppressedData = suppressedData && suppressedData.length > 0;
+
+          if (!hasSuppressedData || !data.includes(suppressedData)) {
+            terminal.write(data);
+          }
+        }
+
+        if (data.includes(this._shellHandler.getConnectionCommand())) {
+          this._allowTerminalWrite = true;
+        }
+      }),
+    );
+  }
+
+  public dispose(): void {
+    for (const d of this._disposables) {
+      d.dispose();
+    }
+  }
+
+  /**
+   * Sends string data from the terminal to the WebSocket
+   *
+   * @param {string} data - The data to send
+   */
+  private _sendData(data: string): void {
+    if (!this._checkOpenSocket()) {
+      return;
+    }
+    this._socket.send(data);
+  }
+
+  /**
+   * Sends binary data from the terminal to the WebSocket
+   *
+   * @param {string} data - The string data to convert to binary and send
+   */
+  private _sendBinary(data: string): void {
+    if (!this._checkOpenSocket()) {
+      return;
+    }
+    const buffer = new Uint8Array(data.length);
+    for (let i = 0; i < data.length; ++i) {
+      buffer[i] = data.charCodeAt(i) & 255;
+    }
+    this._socket.send(buffer);
+  }
+
+  private _checkOpenSocket(): boolean {
+    switch (this._socket.readyState) {
+      case WebSocket.OPEN:
+        return true;
+      case WebSocket.CONNECTING:
+        throw new Error("Attach addon was loaded before socket was open");
+      case WebSocket.CLOSING:
+        return false;
+      case WebSocket.CLOSED:
+        throw new Error("Attach addon socket is closed");
+      default:
+        throw new Error("Unexpected socket state");
+    }
+  }
+}
+
+/**
+ * Adds an event listener to a WebSocket and returns a disposable object
+ * for cleanup
+ *
+ * @param {WebSocket} socket - The WebSocket instance
+ * @param {K} type - The event type to listen for
+ * @param {Function} handler - The event handler function
+ * @returns {IDisposable} An object with a dispose method to remove the listener
+ */
+function addSocketListener<K extends keyof WebSocketEventMap>(
+  socket: WebSocket,
+  type: K,
+  handler: (this: WebSocket, ev: WebSocketEventMap[K]) => void,
+): IDisposable {
+  socket.addEventListener(type, handler);
+  return {
+    dispose: () => {
+      if (!handler) {
+        // Already disposed
+        return;
+      }
+      socket.removeEventListener(type, handler);
+    },
+  };
+}
diff --git a/src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx b/src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx
new file mode 100644
index 000000000..42bdfff2e
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx
@@ -0,0 +1,52 @@
+import { Terminal } from "@xterm/xterm";
+import { TerminalKind } from "../../../../Contracts/ViewModels";
+
+/**
+ * Utility function to wait for a specified duration
+ */
+export const wait = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
+
+/**
+ * Extract host from a URL
+ */
+export const getHostFromUrl = (url: string): string => {
+  try {
+    const urlObj = new URL(url);
+    return urlObj.hostname;
+  } catch (error) {
+    console.error("Invalid URL:", error);
+    return "";
+  }
+};
+
+export const askConfirmation = async (terminal: Terminal, question: string): Promise<boolean> => {
+  terminal.writeln(`\n${question} (Y/N)`);
+  terminal.focus();
+  return new Promise<boolean>((resolve) => {
+    const keyListener = terminal.onKey(({ key }: { key: string }) => {
+      keyListener.dispose();
+      terminal.writeln(key);
+      return resolve(key.toLowerCase() === "y");
+    });
+  });
+};
+
+/**
+ * Gets the current locale for API requests
+ */
+export const getLocale = (): string => {
+  const langLocale = navigator.language;
+  return langLocale && langLocale.length > 2 ? langLocale : "en-us";
+};
+
+export const getShellNameForDisplay = (terminalKind: TerminalKind): string => {
+  switch (terminalKind) {
+    case TerminalKind.Postgres:
+      return "PostgreSQL";
+    case TerminalKind.Mongo:
+    case TerminalKind.VCoreMongo:
+      return "MongoDB";
+    default:
+      return "";
+  }
+};
diff --git a/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx b/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx
new file mode 100644
index 000000000..b36ed9e4e
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx
@@ -0,0 +1,48 @@
+// Check this list for regional availability https://azure.microsoft.com/en-us/explore/global-infrastructure/products-by-region/table
+const validCloudShellRegions = new Set([
+  "westus",
+  "southcentralus",
+  "eastus",
+  "northeurope",
+  "westeurope",
+  "centralindia",
+  "southeastasia",
+  "westcentralus",
+]);
+
+/**
+ * Normalizes a region name to ensure compatibility with Azure CloudShell.
+ *
+ * Azure CloudShell is only available in specific regions. This function:
+ * 1. Maps certain regions to their CloudShell-supported equivalents (e.g., centralus → westcentralus)
+ * 2. Validates if the region is supported by CloudShell
+ * 3. Falls back to the default region if the provided region is unsupported
+ *
+ * This ensures users can connect to CloudShell even when their database is in a region
+ * where CloudShell isn't directly available, by routing to the nearest supported region.
+ *
+ * @param region - The source region (typically from the user's database account location)
+ * @param defaultCloudshellRegion - Fallback region to use if the provided region is not supported
+ * @returns A valid CloudShell region name that's as close as possible to the requested region
+ *
+ * @example
+ * // Returns "westcentralus" (mapped region)
+ * getNormalizedRegion("centralus", "westus")
+ *
+ * @example
+ * // Returns "westus" (default region) since "antarctica" isn't supported
+ * getNormalizedRegion("antarctica", "westus")
+ */
+export const getNormalizedRegion = (region: string, defaultCloudshellRegion: string) => {
+  if (!region) {
+    return defaultCloudshellRegion;
+  }
+
+  const regionMap: Record<string, string> = {
+    centralus: "westcentralus",
+    eastus2: "eastus",
+  };
+
+  const normalizedRegion = regionMap[region.toLowerCase()] || region;
+  return validCloudShellRegions.has(normalizedRegion.toLowerCase()) ? normalizedRegion : defaultCloudshellRegion;
+};
diff --git a/src/Explorer/Tabs/CloudShellTab/Utils/TerminalLogFormats.tsx b/src/Explorer/Tabs/CloudShellTab/Utils/TerminalLogFormats.tsx
new file mode 100644
index 000000000..be3341880
--- /dev/null
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/TerminalLogFormats.tsx
@@ -0,0 +1,39 @@
+// This file contains utility functions and constants for formatting terminal messages in a cloud shell environment.
+// It includes ANSI escape codes for colors and functions to format messages for different log levels (info, success, warning, error).
+export const TERMINAL_COLORS = {
+  RESET: "\x1b[0m",
+  BRIGHT: "\x1b[1m",
+  DIM: "\x1b[2m",
+  BLACK: "\x1b[30m",
+  RED: "\x1b[31m",
+  GREEN: "\x1b[32m",
+  YELLOW: "\x1b[33m",
+  BLUE: "\x1b[34m",
+  MAGENTA: "\x1b[35m",
+  CYAN: "\x1b[36m",
+  WHITE: "\x1b[37m",
+  BG_BLACK: "\x1b[40m",
+  BG_RED: "\x1b[41m",
+  BG_GREEN: "\x1b[42m",
+  BG_YELLOW: "\x1b[43m",
+  BG_BLUE: "\x1b[44m",
+  BG_MAGENTA: "\x1b[45m",
+  BG_CYAN: "\x1b[46m",
+  BG_WHITE: "\x1b[47m",
+};
+
+export const START_MARKER = `echo "START INITIALIZATION" > /dev/null`;
+export const END_MARKER = `echo "END INITIALIZATION" > /dev/null`;
+
+// Terminal message formatting functions
+export const formatInfoMessage = (message: string): string =>
+  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.CYAN}${message}${TERMINAL_COLORS.RESET}`;
+
+export const formatSuccessMessage = (message: string): string =>
+  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.GREEN}${message}${TERMINAL_COLORS.RESET}`;
+
+export const formatWarningMessage = (message: string): string =>
+  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.YELLOW}${message}${TERMINAL_COLORS.RESET}`;
+
+export const formatErrorMessage = (message: string): string =>
+  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.RED}${message}${TERMINAL_COLORS.RESET}`;
diff --git a/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx b/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
new file mode 100644
index 000000000..1664326d9
--- /dev/null
+++ b/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
@@ -0,0 +1,62 @@
+import { Spinner, SpinnerSize } from "@fluentui/react";
+import { MessageTypes } from "Contracts/ExplorerContracts";
+import { QuickstartFirewallNotification } from "Explorer/Quickstart/QuickstartFirewallNotification";
+import { getShellNameForDisplay } from "Explorer/Tabs/CloudShellTab/Utils/CommonUtils";
+import * as React from "react";
+import FirewallRuleScreenshot from "../../../../images/firewallRule.png";
+import VcoreFirewallRuleScreenshot from "../../../../images/vcoreMongoFirewallRule.png";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import * as DataModels from "../../../Contracts/DataModels";
+import * as ViewModels from "../../../Contracts/ViewModels";
+
+/**
+ * Base terminal component adapter
+ */
+export abstract class BaseTerminalComponentAdapter implements ReactAdapter {
+  // parameters: true: show, false: hide
+  public parameters: ko.Computed<boolean>;
+
+  constructor(
+    protected getDatabaseAccount: () => DataModels.DatabaseAccount,
+    protected getTabId: () => string,
+    protected getUsername: () => string,
+    protected isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
+    protected kind: ViewModels.TerminalKind,
+  ) {}
+
+  public renderComponent(): JSX.Element {
+    if (!this.isAllPublicIPAddressesEnabled()) {
+      return (
+        <QuickstartFirewallNotification
+          messageType={this.getMessageType()}
+          screenshot={
+            this.kind === ViewModels.TerminalKind.Mongo || this.kind === ViewModels.TerminalKind.VCoreMongo
+              ? VcoreFirewallRuleScreenshot
+              : FirewallRuleScreenshot
+          }
+          shellName={getShellNameForDisplay(this.kind)}
+        />
+      );
+    }
+
+    return this.parameters() ? (
+      this.renderTerminalComponent()
+    ) : (
+      <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
+    );
+  }
+
+  private getMessageType(): MessageTypes {
+    switch (this.kind) {
+      case ViewModels.TerminalKind.Postgres:
+        return MessageTypes.OpenPostgresNetworkingBlade;
+      case ViewModels.TerminalKind.Mongo:
+      case ViewModels.TerminalKind.VCoreMongo:
+        return MessageTypes.OpenVCoreMongoNetworkingBlade;
+      default:
+        return MessageTypes.OpenPostgresNetworkingBlade;
+    }
+  }
+
+  protected abstract renderTerminalComponent(): JSX.Element;
+}
diff --git a/src/Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter.tsx b/src/Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter.tsx
new file mode 100644
index 000000000..8a5c7c379
--- /dev/null
+++ b/src/Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter.tsx
@@ -0,0 +1,19 @@
+import { CloudShellTerminalComponent } from "Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent";
+import * as React from "react";
+import { BaseTerminalComponentAdapter } from "./BaseTerminalComponentAdapter";
+
+/**
+ * CloudShell terminal tab
+ */
+export class CloudShellTerminalComponentAdapter extends BaseTerminalComponentAdapter {
+  protected renderTerminalComponent(): JSX.Element {
+    return (
+      <CloudShellTerminalComponent
+        databaseAccount={this.getDatabaseAccount()}
+        tabId={this.getTabId()}
+        shellType={this.kind}
+        username={this.getUsername()}
+      />
+    );
+  }
+}
diff --git a/src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx b/src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx
new file mode 100644
index 000000000..fb304a3c9
--- /dev/null
+++ b/src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx
@@ -0,0 +1,32 @@
+import { NotebookTerminalComponent } from "Explorer/Controls/Notebook/NotebookTerminalComponent";
+import * as React from "react";
+import * as DataModels from "../../../Contracts/DataModels";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { BaseTerminalComponentAdapter } from "./BaseTerminalComponentAdapter";
+
+/**
+ * Notebook terminal tab
+ */
+export class NotebookTerminalComponentAdapter extends BaseTerminalComponentAdapter {
+  constructor(
+    private getNotebookServerInfo: () => DataModels.NotebookWorkspaceConnectionInfo,
+    getDatabaseAccount: () => DataModels.DatabaseAccount,
+    getTabId: () => string,
+    getUsername: () => string,
+    isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
+    kind: ViewModels.TerminalKind,
+  ) {
+    super(getDatabaseAccount, getTabId, getUsername, isAllPublicIPAddressesEnabled, kind);
+  }
+
+  protected renderTerminalComponent(): JSX.Element {
+    return (
+      <NotebookTerminalComponent
+        notebookServerInfo={this.getNotebookServerInfo()}
+        databaseAccount={this.getDatabaseAccount()}
+        tabId={this.getTabId()}
+        username={this.getUsername()}
+      />
+    );
+  }
+}
diff --git a/src/Explorer/Tabs/TerminalTab.tsx b/src/Explorer/Tabs/TerminalTab.tsx
index de722b76c..91bbc9373 100644
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -1,19 +1,14 @@
-import { Spinner, SpinnerSize } from "@fluentui/react";
-import { MessageTypes } from "Contracts/ExplorerContracts";
-import { QuickstartFirewallNotification } from "Explorer/Quickstart/QuickstartFirewallNotification";
 import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
+import { CloudShellTerminalComponentAdapter } from "Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter";
 import * as ko from "knockout";
-import * as React from "react";
-import FirewallRuleScreenshot from "../../../images/firewallRule.png";
-import VcoreFirewallRuleScreenshot from "../../../images/vcoreMongoFirewallRule.png";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { userContext } from "../../UserContext";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
-import { NotebookTerminalComponent } from "../Controls/Notebook/NotebookTerminalComponent";
 import Explorer from "../Explorer";
 import { useNotebook } from "../Notebook/useNotebook";
+import { NotebookTerminalComponentAdapter } from "./ShellAdapters/NotebookTerminalComponentAdapter";
 import TabsBase from "./TabsBase";
 
 export interface TerminalTabOptions extends ViewModels.TabOptions {
@@ -23,90 +18,52 @@ export interface TerminalTabOptions extends ViewModels.TabOptions {
   username?: string;
 }
 
-/**
- * Notebook terminal tab
- */
-class NotebookTerminalComponentAdapter implements ReactAdapter {
-  // parameters: true: show, false: hide
-  public parameters: ko.Computed<boolean>;
-  constructor(
-    private getNotebookServerInfo: () => DataModels.NotebookWorkspaceConnectionInfo,
-    private getDatabaseAccount: () => DataModels.DatabaseAccount,
-    private getTabId: () => string,
-    private getUsername: () => string,
-    private isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
-    private kind: ViewModels.TerminalKind,
-  ) {}
-
-  public renderComponent(): JSX.Element {
-    if (!this.isAllPublicIPAddressesEnabled()) {
-      return (
-        <QuickstartFirewallNotification
-          messageType={MessageTypes.OpenPostgresNetworkingBlade}
-          screenshot={
-            this.kind === ViewModels.TerminalKind.Mongo || this.kind === ViewModels.TerminalKind.VCoreMongo
-              ? VcoreFirewallRuleScreenshot
-              : FirewallRuleScreenshot
-          }
-          shellName={this.getShellNameForDisplay(this.kind)}
-        />
-      );
-    }
-
-    return this.parameters() ? (
-      <NotebookTerminalComponent
-        notebookServerInfo={this.getNotebookServerInfo()}
-        databaseAccount={this.getDatabaseAccount()}
-        tabId={this.getTabId()}
-        username={this.getUsername()}
-      />
-    ) : (
-      <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
-    );
-  }
-
-  private getShellNameForDisplay(terminalKind: ViewModels.TerminalKind): string {
-    switch (terminalKind) {
-      case ViewModels.TerminalKind.Postgres:
-        return "PostgreSQL";
-      case ViewModels.TerminalKind.Mongo:
-      case ViewModels.TerminalKind.VCoreMongo:
-        return "MongoDB";
-      default:
-        return "";
-    }
-  }
-}
-
 export default class TerminalTab extends TabsBase {
   public readonly html = '<div style="height: 100%" data-bind="react:notebookTerminalComponentAdapter"></div>  ';
   private container: Explorer;
-  private notebookTerminalComponentAdapter: NotebookTerminalComponentAdapter;
+  private notebookTerminalComponentAdapter: ReactAdapter;
   private isAllPublicIPAddressesEnabled: ko.Observable<boolean>;
 
   constructor(options: TerminalTabOptions) {
     super(options);
     this.container = options.container;
     this.isAllPublicIPAddressesEnabled = ko.observable(true);
-    this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
-      () => this.getNotebookServerInfo(options),
+
+    const commonArgs: [
+      () => DataModels.DatabaseAccount,
+      () => string,
+      () => string,
+      ko.Observable<boolean>,
+      ViewModels.TerminalKind,
+    ] = [
       () => userContext?.databaseAccount,
       () => this.tabId,
       () => this.getUsername(),
       this.isAllPublicIPAddressesEnabled,
       options.kind,
-    );
-    this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
-      if (
-        this.isTemplateReady() &&
-        useNotebook.getState().isNotebookEnabled &&
-        useNotebook.getState().notebookServerInfo?.notebookServerEndpoint &&
-        this.isAllPublicIPAddressesEnabled()
-      ) {
-        return true;
-      }
-      return false;
-    });
+    ];
+
+    if (userContext.features.enableCloudShell) {
+      this.notebookTerminalComponentAdapter = new CloudShellTerminalComponentAdapter(...commonArgs);
+
+      this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
+        return this.isTemplateReady() && this.isAllPublicIPAddressesEnabled();
+      });
+    } else {
+      this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
+        () => this.getNotebookServerInfo(options),
+        ...commonArgs,
+      );
+
+      this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
+        return (
+          this.isTemplateReady() &&
+          useNotebook.getState().isNotebookEnabled &&
+          useNotebook.getState().notebookServerInfo?.notebookServerEndpoint &&
+          this.isAllPublicIPAddressesEnabled()
+        );
+      });
+    }
 
     if (options.kind === ViewModels.TerminalKind.Postgres) {
       checkFirewallRules(
diff --git a/src/Platform/Hosted/extractFeatures.ts b/src/Platform/Hosted/extractFeatures.ts
index 175c4bcff..1e3129518 100644
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -39,6 +39,7 @@ export type Features = {
   readonly copilotChatFixedMonacoEditorHeight: boolean;
   readonly enablePriorityBasedExecution: boolean;
   readonly disableConnectionStringLogin: boolean;
+  readonly enableCloudShell: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -110,6 +111,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
     enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
     disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
+    enableCloudShell: "true" === get("enablecloudshell"),
   };
 }
 
diff --git a/src/Shared/Telemetry/TelemetryConstants.ts b/src/Shared/Telemetry/TelemetryConstants.ts
index d61a2cf8f..c20a49f93 100644
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -89,6 +89,7 @@ export enum Action {
   PhoenixDBAccountAllowed,
   DeleteCellFromMenu,
   OpenTerminal,
+  OpenCloudShellTerminal,
   CreateMongoCollectionWithWildcardIndex,
   ClickCommandBarButton,
   RefreshResourceTreeMyNotebooks,
@@ -146,6 +147,8 @@ export enum Action {
   SavePersistedTabState,
   DeletePersistedTabState,
   UploadDocuments, // Used in Fabric. Please do not rename.
+  CloudShellUserConsent,
+  CloudShellTerminalSession,
 }
 
 export const ActionModifiers = {
diff --git a/src/Utils/arm/request.ts b/src/Utils/arm/request.ts
index 399900ca3..5e3ebb004 100644
--- a/src/Utils/arm/request.ts
+++ b/src/Utils/arm/request.ts
@@ -47,6 +47,7 @@ interface Options {
   body?: unknown;
   queryParams?: ARMQueryParams;
   contentType?: string;
+  customHeaders?: Record<string, string>;
 }
 
 export async function armRequestWithoutPolling<T>({
@@ -57,6 +58,7 @@ export async function armRequestWithoutPolling<T>({
   body: requestBody,
   queryParams,
   contentType,
+  customHeaders,
 }: Options): Promise<{ result: T; operationStatusUrl: string }> {
   const url = new URL(path, host);
   url.searchParams.append("api-version", configContext.armAPIVersion || apiVersion);
@@ -65,18 +67,22 @@ export async function armRequestWithoutPolling<T>({
     queryParams.metricNames && url.searchParams.append("metricnames", queryParams.metricNames);
   }
 
-  if (!userContext.authorizationToken) {
+  if (!userContext?.authorizationToken && !customHeaders?.["Authorization"]) {
     throw new Error("No authority token provided");
   }
 
+  const headers: Record<string, string> = {
+    Authorization: userContext.authorizationToken || customHeaders?.["Authorization"] || "",
+    [HttpHeaders.contentType]: contentType || "application/json",
+    ...(customHeaders || {}),
+  };
+
   const response = await window.fetch(url.href, {
     method,
-    headers: {
-      Authorization: userContext.authorizationToken,
-      [HttpHeaders.contentType]: contentType || "application/json",
-    },
+    headers,
     body: requestBody ? JSON.stringify(requestBody) : undefined,
   });
+
   if (!response.ok) {
     let error: ARMError;
     try {
@@ -109,6 +115,7 @@ export async function armRequest<T>({
   body: requestBody,
   queryParams,
   contentType,
+  customHeaders,
 }: Options): Promise<T> {
   const armRequestResult = await armRequestWithoutPolling<T>({
     host,
@@ -118,6 +125,7 @@ export async function armRequest<T>({
     body: requestBody,
     queryParams,
     contentType,
+    customHeaders,
   });
   const operationStatusUrl = armRequestResult.operationStatusUrl;
   if (operationStatusUrl) {

From 10cda214013fcea51ad030f6b8d0d5a563fdb0b7 Mon Sep 17 00:00:00 2001
From: asier-isayas <asier.isayas@gmail.com>
Date: Fri, 2 May 2025 11:05:40 -0400
Subject: [PATCH 07/16] Add Vector Index Shard Key option on container creation
 (#2097)

* Add vector index shard key

* npm run format

* rename shard key to vector index shard key

* add tooltip for quantization byte size

* change text for GSI and container in VectorEmbedding Policy

---------

Co-authored-by: Asier Isayas <aisayas@microsoft.com>
---
 src/Contracts/DataModels.ts                   |  2 +-
 .../Controls/Settings/SettingsComponent.tsx   |  1 +
 .../ContainerPolicyComponent.tsx              |  1 +
 .../VectorEmbeddingPoliciesComponent.tsx      | 66 ++++++++-----------
 .../AddGlobalSecondaryIndexPanel.tsx          |  1 +
 .../Components/VectorSearchComponent.tsx      |  3 +
 6 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/Contracts/DataModels.ts b/src/Contracts/DataModels.ts
index 58e412b76..7bf489fd6 100644
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -210,7 +210,7 @@ export interface IndexingPolicy {
 export interface VectorIndex {
   path: string;
   type: "flat" | "diskANN" | "quantizedFlat";
-  diskANNShardKey?: string;
+  vectorIndexShardKey?: string[];
   indexingSearchListSize?: number;
   quantizationByteSize?: number;
 }
diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx
index 684858c56..65000e7ee 100644
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -1215,6 +1215,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       isFullTextSearchEnabled: this.isFullTextSearchEnabled,
       shouldDiscardContainerPolicies: this.state.shouldDiscardContainerPolicies,
       resetShouldDiscardContainerPolicyChange: this.resetShouldDiscardContainerPolicies,
+      isGlobalSecondaryIndex: this.isGlobalSecondaryIndex,
     };
 
     const indexingPolicyComponentProps: IndexingPolicyComponentProps = {
diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx
index f4db62ec6..1257d4a65 100644
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx
@@ -22,6 +22,7 @@ export interface ContainerPolicyComponentProps {
   isFullTextSearchEnabled: boolean;
   shouldDiscardContainerPolicies: boolean;
   resetShouldDiscardContainerPolicyChange: () => void;
+  isGlobalSecondaryIndex?: boolean;
 }
 
 export const ContainerPolicyComponent: React.FC<ContainerPolicyComponentProps> = ({
diff --git a/src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx b/src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx
index 03d1ab1e6..ba0c5b62b 100644
--- a/src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx
+++ b/src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx
@@ -9,6 +9,7 @@ import {
   Stack,
   TextField,
 } from "@fluentui/react";
+import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { VectorEmbedding, VectorIndex } from "Contracts/DataModels";
 import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import {
@@ -29,6 +30,7 @@ export interface IVectorEmbeddingPoliciesComponentProps {
   discardChanges?: boolean;
   onChangesDiscarded?: () => void;
   disabled?: boolean;
+  isGlobalSecondaryIndex?: boolean;
 }
 
 export interface VectorEmbeddingPolicyData {
@@ -39,8 +41,7 @@ export interface VectorEmbeddingPolicyData {
   indexType: VectorIndex["type"] | "none";
   pathError: string;
   dimensionsError: string;
-  diskANNShardKey?: string;
-  diskANNShardKeyError?: string;
+  vectorIndexShardKey?: string[];
   indexingSearchListSize?: number;
   indexingSearchListSizeError?: string;
   quantizationByteSize?: number;
@@ -87,6 +88,7 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
   discardChanges,
   onChangesDiscarded,
   disabled,
+  isGlobalSecondaryIndex,
 }): JSX.Element => {
   const onVectorEmbeddingPathError = (path: string, index?: number): string => {
     let error = "";
@@ -132,12 +134,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
     return error;
   };
 
-  //TODO: no restrictions yet due to this field being removed for now.
-  // Uncomment and replace with validation code when field is reinstated
-  // const onDiskANNShardKeyError = (shardKey: string): string => {
-  //   return "";
-  // };
-
   const initializeData = (vectorEmbeddings: VectorEmbedding[], vectorIndexes: VectorIndex[]) => {
     const mergedData: VectorEmbeddingPolicyData[] = [];
     vectorEmbeddings.forEach((embedding) => {
@@ -147,6 +143,7 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
         indexType: matchingIndex?.type || "none",
         indexingSearchListSize: matchingIndex?.indexingSearchListSize || undefined,
         quantizationByteSize: matchingIndex?.quantizationByteSize || undefined,
+        vectorIndexShardKey: matchingIndex?.vectorIndexShardKey || undefined,
         pathError: onVectorEmbeddingPathError(embedding.path),
         dimensionsError: onVectorEmbeddingDimensionError(embedding.dimensions, matchingIndex?.type || "none"),
       });
@@ -186,6 +183,7 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
             type: policy.indexType,
             indexingSearchListSize: policy.indexingSearchListSize,
             quantizationByteSize: policy.quantizationByteSize,
+            vectorIndexShardKey: policy.vectorIndexShardKey,
           }) as VectorIndex,
       );
     const validationPassed = vectorEmbeddingPolicyData.every(
@@ -247,20 +245,16 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
     setVectorEmbeddingPolicyData(vectorEmbeddings);
   };
 
-  // TODO: uncomment after Ignite
-  // DiskANNShardKey was removed for Ignite due to backend problems. Leaving this here as it will be reinstated immediately after Ignite
-  // const onDiskANNShardKeyChange = (index: number, event: React.ChangeEvent<HTMLInputElement>) => {
-  //   const value = event.target.value.trim();
-  //   const vectorEmbeddings = [...vectorEmbeddingPolicyData];
-  //   if (!vectorEmbeddings[index]?.diskANNShardKey && !value.startsWith("/")) {
-  //     vectorEmbeddings[index].diskANNShardKey = "/" + value;
-  //   } else {
-  //     vectorEmbeddings[index].diskANNShardKey = value;
-  //   }
-  //   const error = onDiskANNShardKeyError(value);
-  //   vectorEmbeddings[index].diskANNShardKeyError = error;
-  //   setVectorEmbeddingPolicyData(vectorEmbeddings);
-  // }
+  const onShardKeyChange = (index: number, event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.target.value.trim();
+    const vectorEmbeddings = [...vectorEmbeddingPolicyData];
+    if (!vectorEmbeddings[index]?.vectorIndexShardKey?.[0] && !value.startsWith("/")) {
+      vectorEmbeddings[index].vectorIndexShardKey = ["/" + value];
+    } else {
+      vectorEmbeddings[index].vectorIndexShardKey = [value];
+    }
+    setVectorEmbeddingPolicyData(vectorEmbeddings);
+  };
 
   const onVectorEmbeddingPolicyChange = (
     index: number,
@@ -292,6 +286,11 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
     setVectorEmbeddingPolicyData(vectorEmbeddings);
   };
 
+  const getQuantizationByteSizeTooltipContent = (): string => {
+    const containerName: string = isGlobalSecondaryIndex ? "global secondary index" : "container";
+    return `This is dynamically set by the ${containerName} if left blank, or it can be set to a fixed number`;
+  };
+
   return (
     <Stack tokens={{ childrenGap: 4 }}>
       {vectorEmbeddingPolicyData &&
@@ -402,6 +401,7 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
                         styles={labelStyles}
                       >
                         Quantization byte size
+                        <InfoTooltip>{getQuantizationByteSizeTooltipContent()}</InfoTooltip>
                       </Label>
                       <TextField
                         disabled={
@@ -431,26 +431,18 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
                         }
                       />
                     </Stack>
-                    {/*TODO: uncomment after Ignite */}
-                    {/* DiskANNShardKey was removed for Ignite due to backend problems. Leaving this here as it will be reinstated immediately after Ignite
-                    <Stack
-                      style={{ marginLeft: "10px" }}
-                    >
-                      <Label
-                        disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"}
-                        styles={labelStyles}
-                      >DiskANN shard key</Label>
+                    <Stack style={{ marginLeft: "10px" }}>
+                      <Label disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"} styles={labelStyles}>
+                        Vector index shard key
+                      </Label>
                       <TextField
                         disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"}
-                        id={`vector-policy-diskANNShardKey-${index + 1}`}
+                        id={`vector-policy-vectorIndexShardKey-${index + 1}`}
                         styles={textFieldStyles}
-                        value={String(vectorEmbeddingPolicy.diskANNShardKey || "")}
-                        onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                          onDiskANNShardKeyChange(index, event)
-                        }
+                        value={String(vectorEmbeddingPolicy.vectorIndexShardKey?.[0] ?? "")}
+                        onChange={(event: React.ChangeEvent<HTMLInputElement>) => onShardKeyChange(index, event)}
                       />
                     </Stack>
-                    */}
                   </Stack>
                 )}
               </Stack>
diff --git a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
index ba49299fb..f3d3a3341 100644
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
@@ -388,6 +388,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
                 setVectorIndexingPolicy,
                 vectorPolicyValidated,
                 setVectorPolicyValidated,
+                isGlobalSecondaryIndex: true,
               }}
             />
           )}
diff --git a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
index 440d51ea4..8b5ad9a28 100644
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
@@ -14,6 +14,7 @@ export interface VectorSearchComponentProps {
   vectorIndexingPolicy: VectorIndex[];
   setVectorIndexingPolicy: React.Dispatch<React.SetStateAction<VectorIndex[]>>;
   setVectorPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
+  isGlobalSecondaryIndex?: boolean;
 }
 
 export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.Element => {
@@ -23,6 +24,7 @@ export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.El
     vectorIndexingPolicy,
     setVectorIndexingPolicy,
     setVectorPolicyValidated,
+    isGlobalSecondaryIndex,
   } = props;
 
   return (
@@ -49,6 +51,7 @@ export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.El
                 setVectorIndexingPolicy(vectorIndexingPolicy);
                 setVectorPolicyValidated(vectorPolicyValidated);
               }}
+              isGlobalSecondaryIndex={isGlobalSecondaryIndex}
             />
           </Stack>
         </Stack>

From f9b0abdd142276ef8e564d27d960af35f1654541 Mon Sep 17 00:00:00 2001
From: Dmitry Shilov <sceletron@gmail.com>
Date: Mon, 5 May 2025 15:50:43 +0200
Subject: [PATCH 08/16] fix: Add overflow property and set minimum heights for
 flex and sidebar containers (#2124)

* fix: Add overflow property and set minimum heights for flex and sidebar containers

* fix: Update overflow and minimum height properties for tab panes and containers
---
 less/documentDBFabric.less | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/less/documentDBFabric.less b/less/documentDBFabric.less
index 900535700..832679abd 100644
--- a/less/documentDBFabric.less
+++ b/less/documentDBFabric.less
@@ -211,3 +211,12 @@ a:focus {
 .fileImportImg img {
   filter: brightness(0) saturate(100%);
 }
+
+.tabPanesContainer {
+  overflow: auto !important;
+}
+
+.tabs-container {
+  min-height: 500px;
+  min-width: 500px;
+}

From ea6f3d15797df1c74d97c53d8973aafc597ddf2d Mon Sep 17 00:00:00 2001
From: Sourabh Jain <sourabhjain@microsoft.com>
Date: Mon, 5 May 2025 21:17:36 +0530
Subject: [PATCH 09/16] Cloudshell: Few Enhancement (#2128)

* few enhancement

* fix time
---
 .../CloudShellTab/CloudShellTerminalCore.tsx  | 51 +++++++++----------
 .../ShellTypes/AbstractShellHandler.tsx       | 26 ++++++++++
 .../ShellTypes/MongoShellHandler.test.tsx     |  2 +-
 .../ShellTypes/MongoShellHandler.tsx          | 11 +---
 .../VCoreMongoShellHandler.test.tsx           |  2 +-
 .../ShellTypes/VCoreMongoShellHandler.tsx     | 24 +--------
 .../Tabs/CloudShellTab/Utils/AttachAddOn.tsx  | 26 ++++++++--
 7 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
index da692cc9b..8dff70d08 100644
--- a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
@@ -55,20 +55,16 @@ export const startCloudShellTerminal = async (terminal: Terminal, shellType: Ter
     TelemetryProcessor.trace(
       Action.CloudShellUserConsent,
       consentGranted ? ActionModifiers.Success : ActionModifiers.Cancel,
-      { dataExplorerArea: Areas.CloudShell },
+      {
+        dataExplorerArea: Areas.CloudShell,
+        shellType: TerminalKind[shellType],
+        isConsent: consentGranted,
+        region: resolvedRegion,
+      },
+      startKey,
     );
 
     if (!consentGranted) {
-      TelemetryProcessor.traceCancel(
-        Action.CloudShellTerminalSession,
-        {
-          shellType: TerminalKind[shellType],
-          dataExplorerArea: Areas.CloudShell,
-          region: resolvedRegion,
-          isConsent: false,
-        },
-        startKey,
-      );
       terminal.writeln(
         formatErrorMessage("Session ended. Please close this tab and initiate a new shell session if needed."),
       );
@@ -262,28 +258,27 @@ export const configureSocketConnection = async (
 };
 
 export const sendTerminalStartupCommands = (socket: WebSocket, initCommands: string): void => {
+  // ensures connections don't remain open indefinitely by implementing an automatic timeout after 120 minutes.
+  const keepSocketAlive = (socket: WebSocket) => {
+    if (socket.readyState === WebSocket.OPEN) {
+      if (pingCount >= MAX_PING_COUNT) {
+        socket.close();
+      } else {
+        pingCount++;
+        // The code uses a recursive setTimeout pattern rather than setInterval,
+        // which ensures each new ping only happens after the previous one completes
+        // and naturally stops if the socket closes.
+        keepAliveID = setTimeout(() => keepSocketAlive(socket), 1000);
+      }
+    }
+  };
+
   if (socket && socket.readyState === WebSocket.OPEN) {
     socket.send(initCommands);
+    keepSocketAlive(socket);
   } else {
     socket.onopen = () => {
       socket.send(initCommands);
-
-      // ensures connections don't remain open indefinitely by implementing an automatic timeout after 20 minutes.
-      const keepSocketAlive = (socket: WebSocket) => {
-        if (socket.readyState === WebSocket.OPEN) {
-          if (pingCount >= MAX_PING_COUNT) {
-            socket.close();
-          } else {
-            socket.send("");
-            pingCount++;
-            // The code uses a recursive setTimeout pattern rather than setInterval,
-            // which ensures each new ping only happens after the previous one completes
-            // and naturally stops if the socket closes.
-            keepAliveID = setTimeout(() => keepSocketAlive(socket), 1000);
-          }
-        }
-      };
-
       keepSocketAlive(socket);
     };
   }
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
index f72dda8f6..7d09000ae 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
@@ -56,4 +56,30 @@ export abstract class AbstractShellHandler {
 
     return allCommands.join("\n").concat("\n");
   }
+
+  /**
+   * Setup commands for MongoDB shell:
+   *
+   * 1. Check if mongosh is already installed
+   * 2. Download mongosh package if not installed
+   * 3. Extract the package to access mongosh binaries
+   * 4. Move extracted files to ~/mongosh directory
+   * 5. Add mongosh binary path to system PATH
+   * 6. Apply PATH changes by sourcing .bashrc
+   *
+   * Each command runs conditionally only if mongosh
+   * is not already present in the environment.
+   */
+  protected mongoShellSetupCommands(): string[] {
+    const PACKAGE_VERSION: string = "2.5.0";
+    return [
+      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
+      `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      `if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh/bin && mv mongosh-${PACKAGE_VERSION}-linux-x64/bin/mongosh ~/mongosh/bin/  && chmod +x ~/mongosh/bin/mongosh; fi`,
+      `if ! command -v mongosh &> /dev/null; then rm -rf mongosh-${PACKAGE_VERSION}-linux-x64 mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
+      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
+      "source ~/.bashrc",
+    ];
+  }
 }
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
index b320a9b68..ba6168f96 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
@@ -68,7 +68,7 @@ describe("MongoShellHandler", () => {
       const commands = mongoShellHandler.getSetUpCommands();
 
       expect(Array.isArray(commands)).toBe(true);
-      expect(commands.length).toBe(6);
+      expect(commands.length).toBe(7);
       expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
     });
   });
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
index fce6be513..9da24717c 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
@@ -2,8 +2,6 @@ import { userContext } from "../../../../UserContext";
 import { getHostFromUrl } from "../Utils/CommonUtils";
 import { AbstractShellHandler } from "./AbstractShellHandler";
 
-const PACKAGE_VERSION: string = "2.5.0";
-
 export class MongoShellHandler extends AbstractShellHandler {
   private _key: string;
   private _endpoint: string | undefined;
@@ -18,14 +16,7 @@ export class MongoShellHandler extends AbstractShellHandler {
   }
 
   public getSetUpCommands(): string[] {
-    return [
-      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-      `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      `if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-${PACKAGE_VERSION}-linux-x64/* ~/mongosh/; fi`,
-      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-      "source ~/.bashrc",
-    ];
+    return this.mongoShellSetupCommands();
   }
 
   public getConnectionCommand(): string {
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
index 7c0baed84..a5d4e1336 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
@@ -44,7 +44,7 @@ describe("VCoreMongoShellHandler", () => {
       const commands = vcoreMongoShellHandler.getSetUpCommands();
 
       expect(Array.isArray(commands)).toBe(true);
-      expect(commands.length).toBe(6);
+      expect(commands.length).toBe(7);
       expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
       expect(commands[0]).toContain("mongosh not found");
     });
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
index 8a3a38610..3c6c859a8 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
@@ -1,8 +1,6 @@
 import { userContext } from "../../../../UserContext";
 import { AbstractShellHandler } from "./AbstractShellHandler";
 
-const PACKAGE_VERSION: string = "2.5.0";
-
 export class VCoreMongoShellHandler extends AbstractShellHandler {
   private _endpoint: string | undefined;
 
@@ -15,28 +13,8 @@ export class VCoreMongoShellHandler extends AbstractShellHandler {
     return "MongoDB VCore";
   }
 
-  /**
-   * Setup commands for MongoDB VCore shell:
-   *
-   * 1. Check if mongosh is already installed
-   * 2. Download mongosh package if not installed
-   * 3. Extract the package to access mongosh binaries
-   * 4. Move extracted files to ~/mongosh directory
-   * 5. Add mongosh binary path to system PATH
-   * 6. Apply PATH changes by sourcing .bashrc
-   *
-   * Each command runs conditionally only if mongosh
-   * is not already present in the environment.
-   */
   public getSetUpCommands(): string[] {
-    return [
-      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-      `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      `if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-${PACKAGE_VERSION}-linux-x64/* ~/mongosh/; fi`,
-      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-      "source ~/.bashrc",
-    ];
+    return this.mongoShellSetupCommands();
   }
 
   public getConnectionCommand(): string {
diff --git a/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx b/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
index 9fc011c28..75a19c1aa 100644
--- a/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
@@ -1,5 +1,6 @@
-import { AbstractShellHandler } from "Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler";
 import { IDisposable, ITerminalAddon, Terminal } from "@xterm/xterm";
+import { AbstractShellHandler } from "../ShellTypes/AbstractShellHandler";
+import { formatErrorMessage } from "./TerminalLogFormats";
 
 interface IAttachOptions {
   bidirectional?: boolean;
@@ -56,8 +57,27 @@ export class AttachAddon implements ITerminalAddon {
       this._disposables.push(terminal.onBinary((data) => this._sendBinary(data)));
     }
 
-    this._disposables.push(addSocketListener(this._socket, "close", () => this.dispose()));
-    this._disposables.push(addSocketListener(this._socket, "error", () => this.dispose()));
+    this._disposables.push(addSocketListener(this._socket, "close", () => this._handleSocketClose(terminal)));
+    this._disposables.push(addSocketListener(this._socket, "error", () => this._handleSocketClose(terminal)));
+  }
+
+  /**
+   * Handles socket close events by terminating processes and showing a message
+   */
+  private _handleSocketClose(terminal: Terminal): void {
+    if (terminal) {
+      terminal.writeln(
+        formatErrorMessage("Session ended. Please close this tab and initiate a new shell session if needed."),
+      );
+
+      // Send exit command to terminal
+      if (this._bidirectional) {
+        terminal.write(formatErrorMessage("exit\r\n"));
+      }
+    }
+
+    // Clean up resources
+    this.dispose();
   }
 
   /**

From 2fa95a281e5c7cf266a9ab2360ef4b3e200be4e8 Mon Sep 17 00:00:00 2001
From: Laurent Nguyen <laurent.nguyen@microsoft.com>
Date: Wed, 7 May 2025 11:52:41 +0200
Subject: [PATCH 10/16] Disable "Learn more" link for now in Fabric Home
 (#2129)

---
 src/Explorer/SplashScreen/FabricHome.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Explorer/SplashScreen/FabricHome.tsx b/src/Explorer/SplashScreen/FabricHome.tsx
index 7db6ee041..7b6cae00c 100644
--- a/src/Explorer/SplashScreen/FabricHome.tsx
+++ b/src/Explorer/SplashScreen/FabricHome.tsx
@@ -1,7 +1,7 @@
 /**
  * Accordion top class
  */
-import { Link, makeStyles, tokens } from "@fluentui/react-components";
+import { makeStyles, tokens } from "@fluentui/react-components";
 import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
 import { SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
 import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
@@ -9,7 +9,6 @@ import { isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUt
 import * as React from "react";
 import { userContext } from "UserContext";
 import CosmosDbBlackIcon from "../../../images/CosmosDB_black.svg";
-import LinkIcon from "../../../images/Link_blue.svg";
 import Explorer from "../Explorer";
 
 export interface SplashScreenProps {
@@ -186,12 +185,12 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
           {title}
         </div>
         {getSplashScreenButtons()}
-        <div className={styles.footer}>
+        {/* <div className={styles.footer}>
           Need help?{" "}
           <Link href="https://aka.ms/cosmosdbfabricdocs" target="_blank">
             Learn more <img src={LinkIcon} alt="Learn more" />
           </Link>
-        </div>
+        </div> */}
       </CosmosFluentProvider>
     </>
   );

From 2dbec019afba6ce701a1fe3bb15d4d88a09f09fb Mon Sep 17 00:00:00 2001
From: Sourabh Jain <sourabhjain@microsoft.com>
Date: Thu, 8 May 2025 06:41:35 +0530
Subject: [PATCH 11/16] CloudShell: Changed User Consent Message and Add
 appName in commands (#2130)

* message change

* updated commands
---
 .../CloudShellTab/CloudShellTerminalCore.tsx  | 34 ++++++++++++++++---
 .../ShellTypes/AbstractShellHandler.tsx       |  6 ++++
 .../ShellTypes/CassandraShellHandler.test.tsx |  2 +-
 .../ShellTypes/MongoShellHandler.test.tsx     |  2 +-
 .../ShellTypes/MongoShellHandler.tsx          | 14 ++++++--
 .../ShellTypes/PostgresShellHandler.tsx       |  2 +-
 .../ShellTypes/VCoreMongoShellHandler.tsx     |  2 +-
 7 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
index 8dff70d08..996afc351 100644
--- a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
@@ -43,13 +43,37 @@ export const startCloudShellTerminal = async (terminal: Terminal, shellType: Ter
     await ensureCloudShellProviderRegistered();
 
     resolvedRegion = determineCloudShellRegion();
-    // Ask for user consent for region
-    const consentGranted = await askConfirmation(
-      terminal,
-      formatWarningMessage(
-        "The shell environment may be operating in a region different from that of the database, which could impact performance or data compliance. Do you wish to proceed?",
+
+    resolvedRegion = determineCloudShellRegion();
+
+    terminal.writeln(formatWarningMessage("⚠️  IMPORTANT: Azure Cloud Shell Region Notice ⚠️"));
+    terminal.writeln(
+      formatInfoMessage(
+        "The Cloud Shell environment will operate in a region that may differ from your database's region.",
       ),
     );
+    terminal.writeln(formatInfoMessage("This has two potential implications:"));
+    terminal.writeln(formatInfoMessage("1. Performance Impact:"));
+    terminal.writeln(
+      formatInfoMessage("   Commands may experience higher latency due to geographic distance between regions."),
+    );
+    terminal.writeln(formatInfoMessage("2. Data Compliance Considerations:"));
+    terminal.writeln(
+      formatInfoMessage(
+        "   Data processed through this shell could temporarily reside in a different geographic region,",
+      ),
+    );
+    terminal.writeln(
+      formatInfoMessage("   which may affect compliance with data residency requirements or regulations specific"),
+    );
+    terminal.writeln(formatInfoMessage("   to your organization."));
+    terminal.writeln("");
+
+    terminal.writeln("\x1b[94mFor more information on Azure Cosmos DB data governance and compliance, please visit:");
+    terminal.writeln("\x1b[94mhttps://learn.microsoft.com/en-us/azure/cosmos-db/data-residency\x1b[0m");
+
+    // Ask for user consent for region
+    const consentGranted = await askConfirmation(terminal, formatWarningMessage("Do you wish to proceed?"));
 
     // Track user decision
     TelemetryProcessor.trace(
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
index 7d09000ae..c6ba7b8f0 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
@@ -22,6 +22,12 @@ export const EXIT_COMMAND = ` printf "\\033[1;31mSession ended. Please close thi
  * the required methods.
  */
 export abstract class AbstractShellHandler {
+  /**
+   * The name of the application using this shell handler.
+   * This is used for telemetry and logging purposes.
+   */
+  protected APP_NAME = "CosmosExplorerTerminal";
+
   abstract getShellName(): string;
   abstract getSetUpCommands(): string[];
   abstract getConnectionCommand(): string;
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
index ea5310a27..9bf4b3aa7 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
@@ -87,7 +87,7 @@ describe("CassandraShellHandler", () => {
     });
 
     test("should return correct connection command", () => {
-      const expectedCommand = "cqlsh test-endpoint.cassandra.cosmos.azure.com 10350 -u test-account -p test-key --ssl";
+      const expectedCommand = `cqlsh test-endpoint.cassandra.cosmos.azure.com 10350 -u test-account -p test-key --ssl`;
 
       expect(handler.getConnectionCommand()).toBe(expectedCommand);
       expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-endpoint.cassandra.cosmos.azure.com:443/");
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
index ba6168f96..25395322f 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
@@ -91,7 +91,7 @@ describe("MongoShellHandler", () => {
       const command = mongoShellHandler.getConnectionCommand();
 
       expect(command).toBe(
-        "mongosh --host test-mongo.documents.azure.com --port 10255 --username test-account --password test-key --tls --tlsAllowInvalidCertificates",
+        "mongosh mongodb://test-mongo.documents.azure.com:10255?appName=CosmosExplorerTerminal --username test-account --password test-key --tls --tlsAllowInvalidCertificates",
       );
       expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-mongo.documents.azure.com:443/");
 
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
index 9da24717c..d15c42017 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
@@ -28,9 +28,17 @@ export class MongoShellHandler extends AbstractShellHandler {
     if (!dbName) {
       return "echo 'Database name not found.'";
     }
-    return `mongosh --host ${getHostFromUrl(this._endpoint)} --port 10255 --username ${dbName} --password ${
-      this._key
-    } --tls --tlsAllowInvalidCertificates`;
+    return (
+      "mongosh mongodb://" +
+      getHostFromUrl(this._endpoint) +
+      ":10255?appName=" +
+      this.APP_NAME +
+      " --username " +
+      dbName +
+      " --password " +
+      this._key +
+      " --tls --tlsAllowInvalidCertificates"
+    );
   }
 
   public getTerminalSuppressedData(): string {
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
index d2b235eca..c22d9d972 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
@@ -54,7 +54,7 @@ export class PostgresShellHandler extends AbstractShellHandler {
     // All Azure Cosmos DB PostgreSQL deployments follow this convention.
     // Ref. https://learn.microsoft.com/en-us/azure/cosmos-db/postgresql/reference-limits#database-creation
     const loginName = userContext.postgresConnectionStrParams.adminLogin;
-    return `psql -h "${this._endpoint}" -p 5432 -d "citus" -U "${loginName}" --set=sslmode=require`;
+    return `psql -h "${this._endpoint}" -p 5432 -d "citus" -U "${loginName}" --set=sslmode=require --set=application_name=${this.APP_NAME}`;
   }
 
   public getTerminalSuppressedData(): string {
diff --git a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
index 3c6c859a8..85641c5ff 100644
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
@@ -23,7 +23,7 @@ export class VCoreMongoShellHandler extends AbstractShellHandler {
     }
 
     const userName = userContext.vcoreMongoConnectionParams.adminLogin;
-    return `mongosh "mongodb+srv://${userName}:@${this._endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000"`;
+    return `mongosh "mongodb+srv://${userName}:@${this._endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000&appName=${this.APP_NAME}"`;
   }
 
   public getTerminalSuppressedData(): string {

From 985c744198887a026a680a8dd8527dfe31a0e6f0 Mon Sep 17 00:00:00 2001
From: sunghyunkang1111 <114709653+sunghyunkang1111@users.noreply.github.com>
Date: Thu, 8 May 2025 09:14:09 -0500
Subject: [PATCH 12/16] get the user defined system key value for updating
 (#2134)

* get the user defined system key value for updating

* Added the systemkey check for non-defined system key
---
 src/Utils/QueryUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Utils/QueryUtils.ts b/src/Utils/QueryUtils.ts
index 07822a422..643dd526b 100644
--- a/src/Utils/QueryUtils.ts
+++ b/src/Utils/QueryUtils.ts
@@ -124,7 +124,7 @@ export const extractPartitionKeyValues = (
   documentContent: any,
   partitionKeyDefinition: PartitionKeyDefinition,
 ): PartitionKey[] => {
-  if (!partitionKeyDefinition.paths || partitionKeyDefinition.paths.length === 0 || partitionKeyDefinition.systemKey) {
+  if (!partitionKeyDefinition.paths || partitionKeyDefinition.paths.length === 0) {
     return undefined;
   }
 
@@ -136,7 +136,7 @@ export const extractPartitionKeyValues = (
 
     if (value !== undefined) {
       partitionKeyValues.push(value);
-    } else {
+    } else if (!partitionKeyDefinition.systemKey) {
       partitionKeyValues.push({});
     }
   });

From 0f896f556b1c677c99e403d4cec301d917f5d87c Mon Sep 17 00:00:00 2001
From: Dmitry Shilov <dshilov@microsoft.com>
Date: Fri, 9 May 2025 12:11:26 +0200
Subject: [PATCH 13/16] feat: Enhance UploadItemsPane with error handling and
 status icons for file uploads (#2133)

---
 .../StringInputPane.test.tsx.snap             |  16 +--
 .../Panes/UploadItemsPane/UploadItemsPane.tsx | 125 +++++++++++++++---
 src/Explorer/Tree/Collection.ts               |   3 +
 3 files changed, 115 insertions(+), 29 deletions(-)

diff --git a/src/Explorer/Panes/StringInputPane/__snapshots__/StringInputPane.test.tsx.snap b/src/Explorer/Panes/StringInputPane/__snapshots__/StringInputPane.test.tsx.snap
index fe25942d4..038c6d5a4 100644
--- a/src/Explorer/Panes/StringInputPane/__snapshots__/StringInputPane.test.tsx.snap
+++ b/src/Explorer/Panes/StringInputPane/__snapshots__/StringInputPane.test.tsx.snap
@@ -356,7 +356,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
             value=""
           >
             <div
-              className="ms-TextField is-required root-110"
+              className="ms-TextField is-required root-116"
             >
               <div
                 className="ms-TextField-wrapper"
@@ -647,7 +647,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                     }
                   >
                     <label
-                      className="ms-Label root-121"
+                      className="ms-Label root-127"
                       htmlFor="TextField0"
                       id="TextFieldLabel2"
                     >
@@ -656,13 +656,13 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                   </LabelBase>
                 </StyledLabelBase>
                 <div
-                  className="ms-TextField-fieldGroup fieldGroup-111"
+                  className="ms-TextField-fieldGroup fieldGroup-117"
                 >
                   <input
                     aria-invalid={false}
                     aria-labelledby="TextFieldLabel2"
                     autoFocus={true}
-                    className="ms-TextField-field field-112"
+                    className="ms-TextField-field field-118"
                     id="TextField0"
                     name="collectionIdConfirmation"
                     onBlur={[Function]}
@@ -2464,7 +2464,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                       >
                         <button
                           aria-label="Create"
-                          className="ms-Button ms-Button--primary root-122"
+                          className="ms-Button ms-Button--primary root-128"
                           data-is-focusable={true}
                           data-test="Panel/OkButton"
                           id="sidePanelOkButton"
@@ -2477,14 +2477,14 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                           type="submit"
                         >
                           <span
-                            className="ms-Button-flexContainer flexContainer-123"
+                            className="ms-Button-flexContainer flexContainer-129"
                             data-automationid="splitbuttonprimary"
                           >
                             <span
-                              className="ms-Button-textContainer textContainer-124"
+                              className="ms-Button-textContainer textContainer-130"
                             >
                               <span
-                                className="ms-Button-label label-126"
+                                className="ms-Button-label label-132"
                                 id="id__5"
                                 key="id__5"
                               >
diff --git a/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx b/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx
index 0686812e1..6915104f9 100644
--- a/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx
+++ b/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx
@@ -2,9 +2,13 @@ import {
   DetailsList,
   DetailsListLayoutMode,
   DirectionalHint,
+  FontIcon,
   IColumn,
   SelectionMode,
   TooltipHost,
+  getTheme,
+  mergeStyles,
+  mergeStyleSets,
 } from "@fluentui/react";
 import { Upload } from "Common/Upload/Upload";
 import { UploadDetailsRecord } from "Contracts/ViewModels";
@@ -14,6 +18,36 @@ import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 
+const theme = getTheme();
+const iconClass = mergeStyles({
+  verticalAlign: "middle",
+  maxHeight: "16px",
+  maxWidth: "16px",
+});
+
+const classNames = mergeStyleSets({
+  fileIconHeaderIcon: {
+    padding: 0,
+    fontSize: "16px",
+  },
+  fileIconCell: {
+    textAlign: "center",
+    selectors: {
+      "&:before": {
+        content: ".",
+        display: "inline-block",
+        verticalAlign: "middle",
+        height: "100%",
+        width: "0px",
+        visibility: "hidden",
+      },
+    },
+  },
+  error: [{ color: theme.semanticColors.errorIcon }, iconClass],
+  accept: [{ color: theme.semanticColors.successIcon }, iconClass],
+  warning: [{ color: theme.semanticColors.warningIcon }, iconClass],
+});
+
 export const UploadItemsPane: FunctionComponent = () => {
   const [files, setFiles] = useState<FileList>();
   const [uploadFileData, setUploadFileData] = useState<UploadDetailsRecord[]>([]);
@@ -60,44 +94,94 @@ export const UploadItemsPane: FunctionComponent = () => {
   };
 
   const columns: IColumn[] = [
+    {
+      key: "icons",
+      name: "",
+      fieldName: "",
+      className: classNames.fileIconCell,
+      iconClassName: classNames.fileIconHeaderIcon,
+      isIconOnly: true,
+      minWidth: 16,
+      maxWidth: 16,
+      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
+        if (item.numFailed) {
+          const errorList = (
+            <ul
+              aria-label={"error list"}
+              style={{
+                margin: "5px 0",
+                paddingLeft: "20px",
+                listStyleType: "disc", // Explicitly set to use bullets (dots)
+              }}
+            >
+              {item.errors.map((error, i) => (
+                <li key={i} style={{ display: "list-item" }}>
+                  {error}
+                </li>
+              ))}
+            </ul>
+          );
+
+          return (
+            <TooltipHost
+              content={errorList}
+              id={`tooltip-${index}-${column.key}`}
+              directionalHint={DirectionalHint.bottomAutoEdge}
+            >
+              <FontIcon iconName="Error" className={classNames.error} aria-label="error" />
+            </TooltipHost>
+          );
+        } else if (item.numThrottled) {
+          return <FontIcon iconName="Warning" className={classNames.warning} aria-label="warning" />;
+        } else {
+          return <FontIcon iconName="Accept" className={classNames.accept} aria-label="accept" />;
+        }
+      },
+    },
     {
       key: "fileName",
       name: "FILE NAME",
       fieldName: "fileName",
-      minWidth: 140,
+      minWidth: 120,
       maxWidth: 140,
+      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
+        const fieldContent = item.fileName;
+        return (
+          <TooltipHost
+            content={fieldContent}
+            id={`tooltip-${index}-${column.key}`}
+            directionalHint={DirectionalHint.bottomAutoEdge}
+          >
+            {fieldContent}
+          </TooltipHost>
+        );
+      },
     },
     {
       key: "status",
       name: "STATUS",
       fieldName: "numSucceeded",
-      minWidth: 140,
+      minWidth: 120,
       maxWidth: 140,
       isRowHeader: true,
       isResizable: true,
       data: "string",
       isPadded: true,
+      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
+        const fieldContent = `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
+        return (
+          <TooltipHost
+            content={fieldContent}
+            id={`tooltip-${index}-${column.key}`}
+            directionalHint={DirectionalHint.bottomAutoEdge}
+          >
+            {fieldContent}
+          </TooltipHost>
+        );
+      },
     },
   ];
 
-  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;
-      default:
-        fieldContent = item.fileName;
-    }
-    return (
-      <TooltipHost content={fieldContent} id={tooltipId} directionalHint={DirectionalHint.rightCenter}>
-        {fieldContent}
-      </TooltipHost>
-    );
-  };
-
   return (
     <RightPaneForm {...props}>
       <div className="paneMainContent">
@@ -115,7 +199,6 @@ export const UploadItemsPane: FunctionComponent = () => {
             <DetailsList
               items={uploadFileData}
               columns={columns}
-              onRenderItemColumn={_renderItemColumn}
               selectionMode={SelectionMode.none}
               layoutMode={DetailsListLayoutMode.justified}
               isHeaderVisible={true}
diff --git a/src/Explorer/Tree/Collection.ts b/src/Explorer/Tree/Collection.ts
index d44c99ac3..8b1d892ee 100644
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -1122,6 +1122,9 @@ export default class Collection implements ViewModels.Collection {
             stats.numSucceeded++;
           } else if (response.statusCode === 429) {
             documentsToAttempt.push(attemptedDocuments[index]);
+          } else if (response.statusCode === 409) {
+            stats.numFailed++;
+            stats.errors.push(`Document with id ${attemptedDocuments[index].id} already exists.`);
           } else {
             stats.numFailed++;
             stats.errors.push(JSON.stringify(response.resourceBody));

From 7d57a90d507d33bddcde3a2c57cf026d3cccd519 Mon Sep 17 00:00:00 2001
From: Dmitry Shilov <dshilov@microsoft.com>
Date: Fri, 9 May 2025 12:12:32 +0200
Subject: [PATCH 14/16] fix: Correct documentId method call in error logging
 for deletion failures (#2132)

---
 src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
index 58b976d44..431a1110f 100644
--- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
+++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
@@ -729,7 +729,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
             } else if (result.statusCode >= 400) {
               newFailed.push(result.documentId);
               logConsoleError(
-                `Failed to delete document ${result.documentId.id} with status code ${result.statusCode}`,
+                `Failed to delete document ${result.documentId.id()} with status code ${result.statusCode}`,
               );
             }
           });

From e98c9a83b8d32951e8234b8267d3f3edea2ee518 Mon Sep 17 00:00:00 2001
From: Dmitry Shilov <dshilov@microsoft.com>
Date: Fri, 9 May 2025 12:13:17 +0200
Subject: [PATCH 15/16] fix: Add collapsible feature to Accordion in
 SettingsPane (#2125)

---
 src/Explorer/Panes/SettingsPane/SettingsPane.tsx                | 2 +-
 .../Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
index ca92b59ed..ddaf086b7 100644
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -608,7 +608,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     <RightPaneForm {...genericPaneProps}>
       <div className={`paneMainContent ${styles.container}`}>
         {!isFabricNative() && (
-          <Accordion className={`customAccordion ${styles.firstItem}`}>
+          <Accordion className={`customAccordion ${styles.firstItem}`} collapsible>
             {shouldShowQueryPageOptions && (
               <AccordionItem value="1">
                 <AccordionHeader>
diff --git a/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap b/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap
index 577b6de5b..41a75a38f 100644
--- a/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`Settings Pane should render Default properly 1`] = `
   >
     <Accordion
       className="customAccordion ___1uf6361_0000000 fz7g6wx"
+      collapsible={true}
     >
       <AccordionItem
         value="1"
@@ -573,6 +574,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
   >
     <Accordion
       className="customAccordion ___1uf6361_0000000 fz7g6wx"
+      collapsible={true}
     >
       <AccordionItem
         value="7"

From 86e8bf3c8020e221c3db53852d5cd279d12d88cb Mon Sep 17 00:00:00 2001
From: JustinKol <144163838+JustinKol@users.noreply.github.com>
Date: Fri, 9 May 2025 12:37:56 -0400
Subject: [PATCH 16/16] Show unique keys in Settings for SQL api (#2136)

* master pull

* Added unique keys in Settings for SQL api

* Revert settings.json

* Reverting other PR changes that haven't merged

* Adding space back in

* Added unit tests
---
 .../SubSettingsComponent.test.tsx             |  35 +++++
 .../SubSettingsComponent.tsx                  |  28 ++++
 .../SubSettingsComponent.test.tsx.snap        | 140 ++++++++++++++++++
 src/Explorer/Controls/Settings/TestUtils.tsx  |  10 +-
 .../SettingsComponent.test.tsx.snap           |  48 +++++-
 5 files changed, 256 insertions(+), 5 deletions(-)

diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
index 4658a969a..f9c710cb3 100644
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
@@ -143,4 +143,39 @@ describe("SubSettingsComponent", () => {
     expect(subSettingsComponentInstance.getTtlValue(TtlType.On)).toEqual(TtlOn);
     expect(subSettingsComponentInstance.getTtlValue(TtlType.Off)).toEqual(TtlOff);
   });
+
+  it("uniqueKey is visible", () => {
+    updateUserContext({
+      databaseAccount: {
+        properties: {
+          capabilities: [{ name: "EnableSQL" }],
+        },
+      } as DatabaseAccount,
+    });
+    const subSettingsComponent = new SubSettingsComponent(baseProps);
+    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(true);
+  });
+
+  it("uniqueKey not visible due to no keys", () => {
+    const props = {
+      ...baseProps,
+      ...(baseProps.collection.rawDataModel.uniqueKeyPolicy.uniqueKeys = []),
+    };
+    const subSettingsComponent = new SubSettingsComponent(props);
+    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(false);
+  });
+
+  it("uniqueKey not visible for API", () => {
+    const newContainer = new Explorer();
+    updateUserContext({
+      databaseAccount: {
+        properties: {
+          capabilities: [{ name: "EnableMongo" }],
+        },
+      } as DatabaseAccount,
+    });
+    const props = { ...baseProps, container: newContainer };
+    const subSettingsComponent = new SubSettingsComponent(props);
+    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(false);
+  });
 });
diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
index 75dd1a017..09b9bcba5 100644
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
@@ -63,12 +63,16 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
   private geospatialVisible: boolean;
   private partitionKeyValue: string;
   private partitionKeyName: string;
+  private uniqueKeyName: string;
+  private uniqueKeyValue: string;
 
   constructor(props: SubSettingsComponentProps) {
     super(props);
     this.geospatialVisible = userContext.apiType === "SQL";
     this.partitionKeyName = userContext.apiType === "Mongo" ? "Shard key" : "Partition key";
     this.partitionKeyValue = this.getPartitionKeyValue();
+    this.uniqueKeyName = "Unique keys";
+    this.uniqueKeyValue = this.getUniqueKeyValue();
   }
 
   componentDidMount(): void {
@@ -351,6 +355,28 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
   public isLargePartitionKeyEnabled = (): boolean => this.props.collection.partitionKey?.version >= 2;
   public isHierarchicalPartitionedContainer = (): boolean => this.props.collection.partitionKey?.kind === "MultiHash";
 
+  public getUniqueKeyVisible = (): boolean => {
+    return this.props.collection.rawDataModel.uniqueKeyPolicy?.uniqueKeys.length > 0 && userContext.apiType === "SQL";
+  };
+
+  private getUniqueKeyValue = (): string => {
+    const paths = this.props.collection.rawDataModel.uniqueKeyPolicy?.uniqueKeys?.[0]?.paths;
+    return paths?.join(", ") || "";
+  };
+
+  private getUniqueKeyComponent = (): JSX.Element => (
+    <Stack {...titleAndInputStackProps}>
+      {this.getUniqueKeyVisible() && (
+        <TextField
+          label={this.uniqueKeyName}
+          disabled
+          styles={getTextFieldStyles(undefined, undefined)}
+          defaultValue={this.uniqueKeyValue}
+        />
+      )}
+    </Stack>
+  );
+
   public render(): JSX.Element {
     return (
       <Stack {...subComponentStackProps}>
@@ -363,6 +389,8 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
         {this.props.changeFeedPolicyVisible && this.getChangeFeedComponent()}
 
         {this.getPartitionKeyComponent()}
+
+        {this.getUniqueKeyComponent()}
       </Stack>
     );
   }
diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap b/src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap
index db6960740..9d5471ccc 100644
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap
@@ -231,6 +231,34 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 5,
+      }
+    }
+  >
+    <StyledTextFieldBase
+      defaultValue="/id"
+      disabled={true}
+      label="Unique keys"
+      styles={
+        {
+          "fieldGroup": {
+            "borderColor": "",
+            "height": 25,
+            "selectors": {
+              ":disabled": {
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+              },
+            },
+            "width": 300,
+          },
+        }
+      }
+    />
+  </Stack>
 </Stack>
 `;
 
@@ -520,6 +548,34 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 5,
+      }
+    }
+  >
+    <StyledTextFieldBase
+      defaultValue="/id"
+      disabled={true}
+      label="Unique keys"
+      styles={
+        {
+          "fieldGroup": {
+            "borderColor": "",
+            "height": 25,
+            "selectors": {
+              ":disabled": {
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+              },
+            },
+            "width": 300,
+          },
+        }
+      }
+    />
+  </Stack>
 </Stack>
 `;
 
@@ -769,6 +825,34 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 5,
+      }
+    }
+  >
+    <StyledTextFieldBase
+      defaultValue="/id"
+      disabled={true}
+      label="Unique keys"
+      styles={
+        {
+          "fieldGroup": {
+            "borderColor": "",
+            "height": 25,
+            "selectors": {
+              ":disabled": {
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+              },
+            },
+            "width": 300,
+          },
+        }
+      }
+    />
+  </Stack>
 </Stack>
 `;
 
@@ -1083,6 +1167,34 @@ exports[`SubSettingsComponent renders 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 5,
+      }
+    }
+  >
+    <StyledTextFieldBase
+      defaultValue="/id"
+      disabled={true}
+      label="Unique keys"
+      styles={
+        {
+          "fieldGroup": {
+            "borderColor": "",
+            "height": 25,
+            "selectors": {
+              ":disabled": {
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+              },
+            },
+            "width": 300,
+          },
+        }
+      }
+    />
+  </Stack>
 </Stack>
 `;
 
@@ -1371,5 +1483,33 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 5,
+      }
+    }
+  >
+    <StyledTextFieldBase
+      defaultValue="/id"
+      disabled={true}
+      label="Unique keys"
+      styles={
+        {
+          "fieldGroup": {
+            "borderColor": "",
+            "height": 25,
+            "selectors": {
+              ":disabled": {
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+              },
+            },
+            "width": 300,
+          },
+        }
+      }
+    />
+  </Stack>
 </Stack>
 `;
diff --git a/src/Explorer/Controls/Settings/TestUtils.tsx b/src/Explorer/Controls/Settings/TestUtils.tsx
index 71d939584..96dfbddb3 100644
--- a/src/Explorer/Controls/Settings/TestUtils.tsx
+++ b/src/Explorer/Controls/Settings/TestUtils.tsx
@@ -17,7 +17,15 @@ export const collection = {
     includedPaths: [],
     excludedPaths: [],
   }),
-  uniqueKeyPolicy: {} as DataModels.UniqueKeyPolicy,
+  rawDataModel: {
+    uniqueKeyPolicy: {
+      uniqueKeys: [
+        {
+          paths: ["/id"],
+        },
+      ],
+    },
+  },
   usageSizeInKB: ko.observable(100),
   offer: ko.observable<DataModels.Offer>({
     autoscaleMaxThroughput: undefined,
diff --git a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap
index 7a54134db..5e9b0d7ce 100644
--- a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap
@@ -71,8 +71,18 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
+              "rawDataModel": {
+                "uniqueKeyPolicy": {
+                  "uniqueKeys": [
+                    {
+                      "paths": [
+                        "/id",
+                      ],
+                    },
+                  ],
+                },
+              },
               "readSettings": [Function],
-              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -153,8 +163,18 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
+              "rawDataModel": {
+                "uniqueKeyPolicy": {
+                  "uniqueKeys": [
+                    {
+                      "paths": [
+                        "/id",
+                      ],
+                    },
+                  ],
+                },
+              },
               "readSettings": [Function],
-              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -274,8 +294,18 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
+              "rawDataModel": {
+                "uniqueKeyPolicy": {
+                  "uniqueKeys": [
+                    {
+                      "paths": [
+                        "/id",
+                      ],
+                    },
+                  ],
+                },
+              },
               "readSettings": [Function],
-              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -404,8 +434,18 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
+              "rawDataModel": {
+                "uniqueKeyPolicy": {
+                  "uniqueKeys": [
+                    {
+                      "paths": [
+                        "/id",
+                      ],
+                    },
+                  ],
+                },
+              },
               "readSettings": [Function],
-              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }