Hard code to always open old mongo shell

less/TableStyles/queryBuilder.less

@@ -6,7 +6,7 @@
     display: table;
     display: none;
     width: 100%;
-  border-top: 1px solid #dddddd;
+    border-top: 1px solid #DDDDDD;
     /*[{environment-commandbar-toolbar-separator}]*/
     background-color: #ffffff;
     /*[{plugin-background-color}]*/
@@ -34,7 +34,7 @@
 }
 
 .query-builder {
-  width: 100%;
+    width:100%;
     padding-right: @DefaultSpace;
     border-bottom: 1px solid @BaseMedium;
     margin-bottom: @DefaultSpace;
@@ -45,7 +45,7 @@
     /*[{plugin-background-color}]*/
     min-width: 600px;
     height: 30px;
-  border-bottom: 1px solid #dddddd;
+    border-bottom: 1px solid #DDDDDD;
     /*[1px solid {environment-commandbar-toolbar-separator}]*/
 }
 
@@ -70,14 +70,14 @@
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:hover {
-  background-color: #cccedb;
+    background-color: #CCCEDB;
     /*[{common-controls-button-hover-background}]*/
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button.active {
-  background-color: #e6e7ed;
+    background-color: #E6E7ED;
     /*[{common-controls-inner-tab-active-background}]*/
-  outline: none;
+    outline: none
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:disabled,
@@ -96,10 +96,10 @@
     .flex-direction();
 }
 
-.tablesQueryTab {
+.tablesQueryTab{
     padding-left: @MediumSpace;
     width: 100%;
-  margin-bottom: @LargeSpace;
+    margin-bottom:@LargeSpace;
 }
 
 .entity-error-Img {
@@ -120,7 +120,7 @@
 .query-editor-text {
     width: 100%;
     margin: 2px;
-  border: solid 1px #a9acb3;
+    border: solid 1px #A9ACB3;
     /*[{plugin-textbox-disabled-color}]*/
     resize: none;
     margin-top: -39px;
@@ -169,7 +169,7 @@
     margin-left: 2px;
 }
 
-.advanced-options-panel {
+.advanced-options-panel{
     margin-bottom: @DefaultSpace;
 }
 
@@ -201,9 +201,9 @@ input::-webkit-inner-spin-button {
 .advanced-options-panel .advanced-options .top .top-input {
     width: 100px;
     word-spacing: normal;
-  color: #1e1e1e;
+    color: #1E1E1E;
     /*[{common-controls-button-foreground}]*/
-  border: 1px solid #cccedb;
+    border: 1px solid #CCCEDB;
     /*[1px solid {plugin-textbox-border-color}]*/
     height: 20px;
     margin-left: 8px;
@@ -257,9 +257,9 @@ input::-webkit-inner-spin-button {
     vertical-align: middle;
 }
 
-.action-column > button,
+.action-column>button,
-.group-control-header > button,
+.group-control-header>button,
-.group-indicator-column > button {
+.group-indicator-column>button {
     min-width: 20px;
     width: 20px;
     padding: 0px;
@@ -268,7 +268,7 @@ input::-webkit-inner-spin-button {
     cursor: pointer;
 }
 
-.group-control-header > button:disabled {
+.group-control-header>button:disabled {
     min-width: 20px;
     width: 20px;
     padding: 0px;
@@ -299,9 +299,9 @@ input::-webkit-inner-spin-button {
 }
 
 .scroll-box {
-  border-bottom: 1px transparent #ddd;
+    border-bottom: 1px transparent #DDD;
     /*[1px solid {plugin-table-border-color}]*/
-  border-top: 1px transparent #ddd;
+    border-top: 1px transparent #DDD;
     /*[1px solid {plugin-table-border-color}]*/
     max-height: 20vh;
     width: 100%;
@@ -366,7 +366,7 @@ input::-webkit-inner-spin-button {
 
 .group-indicator-table {
     border-spacing: 0px;
-  min-height: 24px;
+    min-height: 24px
 }
 
 .group-indicator-column {
@@ -396,6 +396,7 @@ input::-webkit-inner-spin-button {
     background-color: #ffffff;
 }
 
+
 /*.type-header {
     padding-right: 4px;
 }
@@ -409,9 +410,9 @@ input::-webkit-inner-spin-button {
 }*/
 
 .clause-table-field[readonly] {
-  background-color: #eeeef2;
+    background-color: #EEEEF2;
     /*[{plugin-table-header-background-color}]*/
-  border: 1px solid #cccedb;
+    border: 1px solid #CCCEDB;
     /*[{plugin-table-border-color}]*/
 }
 
@@ -461,11 +462,11 @@ input::-webkit-inner-spin-button {
 
 .query-panel .divider.horizontal {
     height: 10px;
-  width: 100%;
+    width: 100%
 }
 
 .inline-div {
-  display: inline;
+    display: inline
 }
 
 .querybuilder-addpropertyImg,
@@ -484,7 +485,7 @@ input::-webkit-inner-spin-button {
 }
 
 .entity-Add-Cancel {
-  // padding: @DefaultSpace @SmallSpace @SmallSpace;
+    padding: @DefaultSpace @SmallSpace @SmallSpace;
     cursor: pointer;
 }
 
@@ -497,7 +498,7 @@ input::-webkit-inner-spin-button {
 }
 
 .query-builder-isDisabled {
-  border: 1px solid #cccedb;
+    border: 1px solid #CCCEDB;
     color: #ccc;
 }
 
@@ -514,6 +515,7 @@ input::-webkit-inner-spin-button {
     margin-bottom: 5px;
 }
 
+
 /*
 @media only screen and (max-width: 1200px) {
     .clause-table {

src/Common/TableEntity.tsx

@@ -73,17 +73,6 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
 
   const sectionStackTokens: IStackTokens = { childrenGap: 12 };
 
-  const handleKeyPress = (event: React.KeyboardEvent<HTMLElement>) => {
-    if (event.key === "Enter" || event.key === "Space") {
-      onEditEntity();
-    }
-  };
-  const handleKeyPressdelete = (event: React.KeyboardEvent<HTMLElement>) => {
-    if (event.key === "Enter" || event.key === "Space") {
-      onDeleteEntity();
-    }
-  };
-
   const getEntityValueType = (): string => {
     const { Int, Smallint, Tinyint } = CassandraType;
     const { Double, Int32, Int64 } = TableType;
@@ -137,28 +126,12 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
         />
         {!isEntityValueDisable && (
           <TooltipHost content="Edit property" id="editTooltip">
-            <Image
+            <Image {...imageProps} src={EditIcon} alt="editEntity" id="editEntity" onClick={onEditEntity} />
-              {...imageProps}
-              src={EditIcon}
-              alt="editEntity"
-              id="editEntity"
-              onClick={onEditEntity}
-              tabIndex={0}
-              onKeyPress={handleKeyPress}
-            />
           </TooltipHost>
         )}
         {isDeleteOptionVisible && userContext.apiType !== "Cassandra" && (
           <TooltipHost content="Delete property" id="deleteTooltip">
-            <Image
+            <Image {...imageProps} src={DeleteIcon} alt="delete entity" id="deleteEntity" onClick={onDeleteEntity} />
-              {...imageProps}
-              src={DeleteIcon}
-              alt="delete entity"
-              id="deleteEntity"
-              onClick={onDeleteEntity}
-              tabIndex={0}
-              onKeyPress={handleKeyPressdelete}
-            />
           </TooltipHost>
         )}
       </Stack>

src/Common/dataAccess/deleteDocument.ts

@@ -4,7 +4,6 @@ import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationCons
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
-import { getPartitionKeyValue } from "./getPartitionKeyValue";
 
 export const deleteDocument = async (collection: CollectionBase, documentId: DocumentId): Promise<void> => {
   const entityName: string = getEntityName();
@@ -14,7 +13,7 @@ export const deleteDocument = async (collection: CollectionBase, documentId: Doc
     await client()
       .database(collection.databaseId)
       .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
+      .item(documentId.id(), documentId.partitionKeyValue?.length === 0 ? undefined : documentId.partitionKeyValue)
       .delete();
     logConsoleInfo(`Successfully deleted ${entityName} ${documentId.id()}`);
   } catch (error) {

src/Common/dataAccess/getPartitionKeyValue.ts

@@ -1,12 +0,0 @@
-import { userContext } from "UserContext";
-import DocumentId from "../../Explorer/Tree/DocumentId";
-
-export const getPartitionKeyValue = (documentId: DocumentId) => {
-  if (userContext.apiType === "Tables" && documentId.partitionKeyValue?.length === 0) {
-    return "";
-  }
-  if (documentId.partitionKeyValue?.length === 0) {
-    return undefined;
-  }
-  return documentId.partitionKeyValue;
-};

src/Common/dataAccess/readDocument.ts

@@ -6,7 +6,6 @@ import { HttpHeaders } from "../Constants";
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
-import { getPartitionKeyValue } from "./getPartitionKeyValue";
 
 export const readDocument = async (collection: CollectionBase, documentId: DocumentId): Promise<Item> => {
   const entityName = getEntityName();
@@ -22,7 +21,8 @@ export const readDocument = async (collection: CollectionBase, documentId: Docum
     const response = await client()
       .database(collection.databaseId)
       .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
+      // use undefined if the partitionKeyValue is empty
+      .item(documentId.id(), documentId.partitionKeyValue?.length === 0 ? undefined : documentId.partitionKeyValue)
       .read(options);
 
     return response?.resource;

src/Common/dataAccess/updateDocument.ts

@@ -6,7 +6,6 @@ import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationCons
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
-import { getPartitionKeyValue } from "./getPartitionKeyValue";
 
 export const updateDocument = async (
   collection: CollectionBase,
@@ -26,7 +25,7 @@ export const updateDocument = async (
     const response = await client()
       .database(collection.databaseId)
       .container(collection.id())
-      .item(documentId.id(), getPartitionKeyValue(documentId))
+      .item(documentId.id(), documentId.partitionKeyValue?.length === 0 ? undefined : documentId.partitionKeyValue)
       .replace(newDocument, options);
 
     logConsoleInfo(`Successfully updated ${entityName} ${documentId.id()}`);

src/Explorer/ContextMenuButtonFactory.tsx

@@ -85,11 +85,7 @@ export const createCollectionContextMenuButton = (
       iconSrc: HostedTerminalIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-        } else {
         selectedCollection && selectedCollection.onNewMongoShellClick();
-        }
       },
       label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
     });

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -166,11 +166,7 @@ export function createContextCommandBarButtons(
       iconAlt: label,
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-        } else {
         selectedCollection && selectedCollection.onNewMongoShellClick();
-        }
       },
       commandButtonLabel: label,
       ariaLabel: label,

src/Explorer/Panes/Tables/AddTableEntityPanel.tsx

@@ -242,11 +242,6 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
     submitButtonText: getButtonLabel(userContext.apiType),
     onSubmit,
   };
-  const handlekeypressaddentity = (event: React.KeyboardEvent<HTMLElement>) => {
-    if (event.key === "Enter" || event.key === "Space") {
-      addNewEntity();
-    }
-  };
 
   return (
     <RightPaneForm {...props}>
@@ -289,13 +284,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
           );
         })}
         {userContext.apiType !== "Cassandra" && (
-          <Stack
+          <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
-            horizontal
-            onClick={addNewEntity}
-            className="addButtonEntiy"
-            tabIndex={0}
-            onKeyPress={handlekeypressaddentity}
-          >
             <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
             <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
           </Stack>

src/Explorer/Panes/Tables/__snapshots__/AddTableEntityPanel.test.tsx.snap

@@ -29,14 +29,10 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
           className="addButtonEntiy"
           horizontal={true}
           onClick={[Function]}
-          onKeyPress={[Function]}
-          tabIndex={0}
         >
           <div
             className="ms-Stack addButtonEntiy css-53"
             onClick={[Function]}
-            onKeyPress={[Function]}
-            tabIndex={0}
           >
             <StyledImageBase
               alt="Add Entity"

src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts

@@ -516,7 +516,7 @@ export default class QueryBuilderViewModel {
   };
 
   public onAddNewClauseKeyDown = (event: KeyboardEvent): boolean => {
-    if (event.key === "Enter" || event.key === "Space") {
+    if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
       this.addClauseIndex(this.clauseArray().length - 1);
       event.stopPropagation();
       return false;

src/Explorer/Tabs/QueryTablesTab.html

@@ -70,19 +70,24 @@
             <tbody data-bind="template: { name: 'queryClause-template', foreach: clauseArray, as: 'clause' }"></tbody>
           </table>
         </div>
-        <button
+        <div
-          data-bind="click: addNewClause, event: { keydown: onAddNewClauseKeyDown }"
+          class="addClause"
-          style="border: none; background: none"
+          role="button"
+          data-bind="click: addNewClause, event: { keydown: onAddNewClauseKeyDown }, attr: { title: addNewClauseLine }"
+          tabindex="0"
         >
-          <div class="addClause" data-bind=" ">
           <div class="addClause-heading">
             <span class="clause-table addClause-title">
-                <img class="addclauseProperty-Img" style="margin-bottom: 5px" src="/Add-property.svg" />
+              <img
+                class="addclauseProperty-Img"
+                style="margin-bottom: 5px"
+                src="/Add-property.svg"
+                alt="Add new clause"
+              />
               <span style="margin-left: 5px" data-bind="text: addNewClauseLine"></span>
             </span>
           </div>
         </div>
-        </button>
       </div>
     </div>
     <!-- Tables Query Tab Query Helper - End-->
@@ -163,20 +168,22 @@
 <script type="text/html" id="queryClause-template">
   <tr class="clause-table-row">
     <td class="clause-table-cell action-column">
-      <button
+      <span
+        class="entity-Add-Cancel"
+        role="button"
+        tabindex="0"
         data-bind="click: $parent.addClauseIndex.bind($data, $index()), event: { keydown: $parent.onAddClauseKeyDown.bind($data, $index()) }, attr:{title: $parent.insertNewFilterLine}"
       >
-        <span class="entity-Add-Cancel" role="button">
         <img class="querybuilder-addpropertyImg" src="/Add-property.svg" alt="Add clause" />
       </span>
-      </button>
+      <span
-      <button
+        class="entity-Add-Cancel"
+        role="button"
+        tabindex="0"
         data-bind="hasFocus: isDeleteButtonFocused, click: $parent.deleteClause.bind($data, $index()), event: { keydown: $parent.onDeleteClauseKeyDown.bind($data, $index()) }, attr:{title: $parent.removeThisFilterLine}"
       >
-        <span class="entity-Add-Cancel" role="button">
         <img class="querybuilder-cancelImg" src="/Entity_cancel.svg" alt="Delete clause" />
       </span>
-      </button>
     </td>
     <td class="clause-table-cell group-control-column">
       <input type="checkbox" aria-label="And/Or" data-bind="checked: checkedForGrouping" />

src/Explorer/Tabs/Tabs.tsx

@@ -32,7 +32,7 @@ export const Tabs = ({ explorer }: TabsProps): JSX.Element => {
         <MessageBar
           messageBarType={MessageBarType.warning}
           actions={
-            <MessageBarButton onClick={() => sendMessage({ type: MessageTypes.OpenPostgresNetworkingBlade })}>
+            <MessageBarButton onClick={() => sendMessage({ type: MessageTypes.OpenCosmosDBNetworkingBlade })}>
               Change network settings
             </MessageBarButton>
           }