Remove Enable Azure synapse link for Cassandra

Add feature flags to test Legacy Mongo Shell

src/Common/EntityValue.tsx

@@ -55,6 +55,7 @@ export const EntityValue: FunctionComponent<TableEntityProps> = ({
       label={entityValueLabel && entityValueLabel}
       className="addEntityTextField"
       id="entityValueId"
+      autoFocus
       disabled={isEntityValueDisable}
       type={entityValueType}
       placeholder={entityValuePlaceholder}

src/Common/TableEntity.tsx

@@ -7,7 +7,7 @@ import {
   IStackTokens,
   Stack,
   TextField,
-  TooltipHost
+  TooltipHost,
 } from "@fluentui/react";
 import React, { FunctionComponent } from "react";
 import DeleteIcon from "../../images/delete.svg";
@@ -136,7 +136,6 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
           onEntityTimeValueChange={onEntityTimeValueChange}
         />
         {!isEntityValueDisable && (
-          
           <TooltipHost content="Edit property" id="editTooltip">
             <div tabIndex={0}>
               <Image
@@ -150,7 +149,6 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
               />
             </div>
           </TooltipHost>
-          
         )}
         {isDeleteOptionVisible && userContext.apiType !== "Cassandra" && (
           <TooltipHost content="Delete property" id="deleteTooltip">

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

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

src/Explorer/Controls/ThroughputInput/__snapshots__/ThroughputInput.test.tsx.snap

@@ -347,14 +347,12 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                     ariaLabel="Set the throughput — Request Units per second (RU/s) — required for the workload. A read of a 1 KB document uses 1 RU. Select manual if you plan to scale RU/s yourself. Select autoscale to allow the system to scale RU/s based on usage."
                     className="panelInfoIcon"
                     iconName="Info"
-                    role="tooltip"
                     tabIndex={0}
                   >
                     <IconBase
                       ariaLabel="Set the throughput — Request Units per second (RU/s) — required for the workload. A read of a 1 KB document uses 1 RU. Select manual if you plan to scale RU/s yourself. Select autoscale to allow the system to scale RU/s based on usage."
                       className="panelInfoIcon"
                       iconName="Info"
-                      role="tooltip"
                       styles={[Function]}
                       tabIndex={0}
                       theme={
@@ -635,7 +633,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                         aria-label="Set the throughput — Request Units per second (RU/s) — required for the workload. A read of a 1 KB document uses 1 RU. Select manual if you plan to scale RU/s yourself. Select autoscale to allow the system to scale RU/s based on usage."
                         className="panelInfoIcon root-57"
                         data-icon-name="Info"
-                        role="tooltip"
+                        role="img"
                         tabIndex={0}
                       >
                         
@@ -1341,14 +1339,12 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                         ariaLabel="Set the max RU/s to the highest RU/s you want your container to scale to. The container will scale between 10% of max RU/s to the max RU/s based on usage."
                         className="panelInfoIcon"
                         iconName="Info"
-                        role="tooltip"
                         tabIndex={0}
                       >
                         <IconBase
                           ariaLabel="Set the max RU/s to the highest RU/s you want your container to scale to. The container will scale between 10% of max RU/s to the max RU/s based on usage."
                           className="panelInfoIcon"
                           iconName="Info"
-                          role="tooltip"
                           styles={[Function]}
                           tabIndex={0}
                           theme={
@@ -1629,7 +1625,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                             aria-label="Set the max RU/s to the highest RU/s you want your container to scale to. The container will scale between 10% of max RU/s to the max RU/s based on usage."
                             className="panelInfoIcon root-57"
                             data-icon-name="Info"
-                            role="tooltip"
+                            role="img"
                             tabIndex={0}
                           >
                             

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -10,7 +10,7 @@ import {
   IButtonStyles,
   IconButton,
   IContextualMenuItemProps,
-  IContextualMenuProps
+  IContextualMenuProps,
 } from "@fluentui/react";
 import * as React from "react";
 import AnimateHeight from "react-animate-height";

src/Explorer/Controls/TreeComponent/__snapshots__/TreeComponent.test.tsx.snap

@@ -40,32 +40,30 @@ exports[`TreeNodeComponent does not render children by default 1`] = `
   onKeyPress={[Function]}
   role="treeitem"
 >
-  <div>
-    <div
-      className="treeNodeHeader "
-      data-test="label"
-      style={
-        Object {
-          "paddingLeft": 9,
-        }
+  <div
+    className="treeNodeHeader "
+    data-test="label"
+    style={
+      Object {
+        "paddingLeft": 9,
       }
-      tabIndex={-1}
+    }
+    tabIndex={-1}
+  >
+    <img
+      alt="label branch is collapsed"
+      className="expandCollapseIcon"
+      onKeyPress={[Function]}
+      role="button"
+      src=""
+      tabIndex={0}
+    />
+    <span
+      className="nodeLabel"
+      title="label"
     >
-      <img
-        alt="label branch is collapsed"
-        className="expandCollapseIcon"
-        onKeyPress={[Function]}
-        role="button"
-        src=""
-        tabIndex={0}
-      />
-      <span
-        className="nodeLabel"
-        title="label"
-      >
-        label
-      </span>
-    </div>
+      label
+    </span>
   </div>
   <div
     className="loadingIconContainer"
@@ -145,80 +143,78 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
   onKeyPress={[Function]}
   role="treeitem"
 >
-  <div>
-    <div
-      className="treeNodeHeader "
-      data-test="label"
-      style={
-        Object {
-          "paddingLeft": 23,
-        }
+  <div
+    className="treeNodeHeader "
+    data-test="label"
+    style={
+      Object {
+        "paddingLeft": 23,
       }
-      tabIndex={-1}
+    }
+    tabIndex={-1}
+  >
+    <img
+      alt="label branch is expanded"
+      className="expandCollapseIcon"
+      onKeyPress={[Function]}
+      role="button"
+      src=""
+      tabIndex={0}
+    />
+    <span
+      className="nodeLabel"
+      title="label"
     >
-      <img
-        alt="label branch is expanded"
-        className="expandCollapseIcon"
-        onKeyPress={[Function]}
-        role="button"
-        src=""
-        tabIndex={0}
+      label
+    </span>
+    <div
+      onContextMenu={[Function]}
+      onKeyPress={[Function]}
+    >
+      <CustomizedIconButton
+        ariaLabel="More"
+        className="treeMenuEllipsis"
+        menuIconProps={
+          Object {
+            "iconName": "More",
+            "styles": Object {
+              "root": Object {
+                "fontSize": "18px",
+                "fontWeight": "bold",
+              },
+            },
+          }
+        }
+        menuProps={
+          Object {
+            "contextualMenuItemAs": [Function],
+            "coverTarget": true,
+            "directionalHint": 3,
+            "isBeakVisible": false,
+            "items": Array [
+              Object {
+                "className": undefined,
+                "disabled": true,
+                "key": "menuLabel",
+                "onClick": [Function],
+                "onRenderIcon": [Function],
+                "text": "menuLabel",
+              },
+            ],
+            "onMenuDismissed": [Function],
+            "onMenuOpened": [Function],
+          }
+        }
+        name="More"
+        styles={
+          Object {
+            "rootFocused": Object {
+              "outline": "1px dashed undefined",
+            },
+          }
+        }
+        title="More"
       />
-      <span
-        className="nodeLabel"
-        title="label"
-      >
-        label
-      </span>
-      <div
-        onContextMenu={[Function]}
-        onKeyPress={[Function]}
-      >
-        <CustomizedIconButton
-          ariaLabel="More"
-          className="treeMenuEllipsis"
-          menuIconProps={
-            Object {
-              "iconName": "More",
-              "styles": Object {
-                "root": Object {
-                  "fontSize": "18px",
-                  "fontWeight": "bold",
-                },
-              },
-            }
-          }
-          menuProps={
-            Object {
-              "contextualMenuItemAs": [Function],
-              "coverTarget": true,
-              "directionalHint": 3,
-              "isBeakVisible": false,
-              "items": Array [
-                Object {
-                  "className": undefined,
-                  "disabled": true,
-                  "key": "menuLabel",
-                  "onClick": [Function],
-                  "onRenderIcon": [Function],
-                  "text": "menuLabel",
-                },
-              ],
-              "onMenuDismissed": [Function],
-              "onMenuOpened": [Function],
-            }
-          }
-          name="More"
-          styles={
-            Object {
-              "rootFocused": Object {
-                "outline": "1px dashed undefined",
-              },
-            }
-          }
-          title="More"
-        />
-      </div>
     </div>
   </div>
   <div
@@ -298,32 +294,30 @@ exports[`TreeNodeComponent renders loading icon 1`] = `
   onKeyPress={[Function]}
   role="treeitem"
 >
-  <div>
-    <div
-      className="treeNodeHeader "
-      data-test="label"
-      style={
-        Object {
-          "paddingLeft": 9,
-        }
+  <div
+    className="treeNodeHeader "
+    data-test="label"
+    style={
+      Object {
+        "paddingLeft": 9,
       }
-      tabIndex={-1}
+    }
+    tabIndex={-1}
+  >
+    <img
+      alt="label branch is expanded"
+      className="expandCollapseIcon"
+      onKeyPress={[Function]}
+      role="button"
+      src=""
+      tabIndex={0}
+    />
+    <span
+      className="nodeLabel"
+      title="label"
     >
-      <img
-        alt="label branch is expanded"
-        className="expandCollapseIcon"
-        onKeyPress={[Function]}
-        role="button"
-        src=""
-        tabIndex={0}
-      />
-      <span
-        className="nodeLabel"
-        title="label"
-      >
-        label
-      </span>
-    </div>
+      label
+    </span>
   </div>
   <div
     className="loadingIconContainer"
@@ -374,71 +368,69 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
   onKeyPress={[Function]}
   role="treeitem"
 >
-  <div>
-    <div
-      className="treeNodeHeader "
-      data-test="label"
-      style={
-        Object {
-          "paddingLeft": 23,
-        }
+  <div
+    className="treeNodeHeader "
+    data-test="label"
+    style={
+      Object {
+        "paddingLeft": 23,
       }
-      tabIndex={-1}
+    }
+    tabIndex={-1}
+  >
+    <img
+      alt="label branch is expanded"
+      className="expandCollapseIcon"
+      onKeyPress={[Function]}
+      role="button"
+      src=""
+      tabIndex={0}
+    />
+    <span
+      className="nodeLabel"
+      title="label"
     >
-      <img
-        alt="label branch is expanded"
-        className="expandCollapseIcon"
-        onKeyPress={[Function]}
-        role="button"
-        src=""
-        tabIndex={0}
+      label
+    </span>
+    <div
+      onContextMenu={[Function]}
+      onKeyPress={[Function]}
+    >
+      <CustomizedIconButton
+        ariaLabel="More"
+        className="treeMenuEllipsis"
+        menuIconProps={
+          Object {
+            "iconName": "More",
+            "styles": Object {
+              "root": Object {
+                "fontSize": "18px",
+                "fontWeight": "bold",
+              },
+            },
+          }
+        }
+        menuProps={
+          Object {
+            "contextualMenuItemAs": [Function],
+            "coverTarget": true,
+            "directionalHint": 3,
+            "isBeakVisible": false,
+            "items": Array [],
+            "onMenuDismissed": [Function],
+            "onMenuOpened": [Function],
+          }
+        }
+        name="More"
+        styles={
+          Object {
+            "rootFocused": Object {
+              "outline": "1px dashed undefined",
+            },
+          }
+        }
+        title="More"
       />
-      <span
-        className="nodeLabel"
-        title="label"
-      >
-        label
-      </span>
-      <div
-        onContextMenu={[Function]}
-        onKeyPress={[Function]}
-      >
-        <CustomizedIconButton
-          ariaLabel="More"
-          className="treeMenuEllipsis"
-          menuIconProps={
-            Object {
-              "iconName": "More",
-              "styles": Object {
-                "root": Object {
-                  "fontSize": "18px",
-                  "fontWeight": "bold",
-                },
-              },
-            }
-          }
-          menuProps={
-            Object {
-              "contextualMenuItemAs": [Function],
-              "coverTarget": true,
-              "directionalHint": 3,
-              "isBeakVisible": false,
-              "items": Array [],
-              "onMenuDismissed": [Function],
-              "onMenuOpened": [Function],
-            }
-          }
-          name="More"
-          styles={
-            Object {
-              "rootFocused": Object {
-                "outline": "1px dashed undefined",
-              },
-            }
-          }
-          title="More"
-        />
-      </div>
     </div>
   </div>
   <div
@@ -546,32 +538,30 @@ exports[`TreeNodeComponent renders unsorted children by default 1`] = `
   onKeyPress={[Function]}
   role="treeitem"
 >
-  <div>
-    <div
-      className="treeNodeHeader "
-      data-test="label"
-      style={
-        Object {
-          "paddingLeft": 9,
-        }
+  <div
+    className="treeNodeHeader "
+    data-test="label"
+    style={
+      Object {
+        "paddingLeft": 9,
       }
-      tabIndex={-1}
+    }
+    tabIndex={-1}
+  >
+    <img
+      alt="label branch is expanded"
+      className="expandCollapseIcon"
+      onKeyPress={[Function]}
+      role="button"
+      src=""
+      tabIndex={0}
+    />
+    <span
+      className="nodeLabel"
+      title="label"
     >
-      <img
-        alt="label branch is expanded"
-        className="expandCollapseIcon"
-        onKeyPress={[Function]}
-        role="button"
-        src=""
-        tabIndex={0}
-      />
-      <span
-        className="nodeLabel"
-        title="label"
-      >
-        label
-      </span>
-    </div>
+      label
+    </span>
   </div>
   <div
     className="loadingIconContainer"

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

@@ -25,7 +25,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       updateUserContext({
         databaseAccount: {
           properties: {
-            capabilities: [{ name: "EnableTable" }],
+            capabilities: [{ name: "EnableMongo" }],
           },
         } as DatabaseAccount,
       });
@@ -38,6 +38,38 @@ describe("CommandBarComponentButtonFactory tests", () => {
       );
       expect(enableAzureSynapseLinkBtn).toBeDefined();
     });
+
+    it("Button should not be visible for Tables API", () => {
+      updateUserContext({
+        databaseAccount: {
+          properties: {
+            capabilities: [{ name: "EnableTable" }],
+          },
+        } as DatabaseAccount,
+      });
+
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const enableAzureSynapseLinkBtn = buttons.find(
+        (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
+      );
+      expect(enableAzureSynapseLinkBtn).toBeUndefined();
+    });
+
+    it("Button should not be visible for Cassandra API", () => {
+      updateUserContext({
+        databaseAccount: {
+          properties: {
+            capabilities: [{ name: "EnableCassandra" }],
+          },
+        } as DatabaseAccount,
+      });
+
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const enableAzureSynapseLinkBtn = buttons.find(
+        (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
+      );
+      expect(enableAzureSynapseLinkBtn).toBeUndefined();
+    });
   });
 
   describe("Enable notebook button", () => {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -51,11 +51,13 @@ export function createStaticCommandBarButtons(
   const buttons: CommandButtonComponentProps[] = [];
 
   buttons.push(newCollectionBtn);
+  if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra") {
+    const addSynapseLink = createOpenSynapseLinkDialogButton(container);
 
-  const addSynapseLink = createOpenSynapseLinkDialogButton(container);
-  if (addSynapseLink) {
-    buttons.push(createDivider());
-    buttons.push(addSynapseLink);
+    if (addSynapseLink) {
+      buttons.push(createDivider());
+      buttons.push(addSynapseLink);
+    }
   }
 
   if (userContext.apiType !== "Tables") {

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -13,7 +13,7 @@ import {
   Stack,
   TeachingBubble,
   Text,
-  TooltipHost
+  TooltipHost,
 } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { createCollection } from "Common/dataAccess/createCollection";
@@ -100,7 +100,6 @@ export interface AddCollectionPanelState {
   isExecuting: boolean;
   isThroughputCapExceeded: boolean;
   teachingBubbleStep: number;
-  isParentTooltipVisible:boolean;
 }
 
 export class AddCollectionPanel extends React.Component<AddCollectionPanelProps, AddCollectionPanelState> {
@@ -109,7 +108,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   private collectionThroughput: number;
   private isCollectionAutoscale: boolean;
   private isCostAcknowledged: boolean;
-  
 
   constructor(props: AddCollectionPanelProps) {
     super(props);
@@ -136,16 +134,13 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       isExecuting: false,
       isThroughputCapExceeded: false,
       teachingBubbleStep: 0,
-      isParentTooltipVisible: false,
     };
-    
   }
 
   componentDidMount(): void {
     if (this.state.teachingBubbleStep === 0 && this.props.isQuickstart) {
       this.setState({ teachingBubbleStep: 1 });
     }
-
   }
 
   render(): JSX.Element {
@@ -413,7 +408,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                   className="panelInfoIcon"
                   tabIndex={0}
                   ariaLabel={`Unique identifier for the ${getCollectionName().toLocaleLowerCase()} and used for id-based routing through REST and all SDKs.`}
-                  
                 />
               </TooltipHost>
             </Stack>

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -9,7 +9,7 @@ import {
   Stack,
   TeachingBubble,
   TeachingBubbleContent,
-  Text
+  Text,
 } from "@fluentui/react";
 import { sendMessage } from "Common/MessageHandler";
 import { MessageTypes } from "Contracts/ExplorerContracts";

src/Explorer/Tabs/MongoShellTab/MongoShellTabComponent.tsx

@@ -78,6 +78,22 @@ export default class MongoShellTabComponent extends Component<
       baseUrl = "/content/mongoshell/";
     }
 
+    if (userContext.features.enableLegacyMongoShellV1 === true) {
+      return "/mongoshell/index.html";
+    }
+
+    if (userContext.features.enableLegacyMongoShellV1Dist === true) {
+      return "/mongoshell/dist/index.html";
+    }
+
+    if (userContext.features.enableLegacyMongoShellV2 === true) {
+      return "/mongoshell/indexv2.html";
+    }
+
+    if (userContext.features.enableLegacyMongoShellV2Dist === true) {
+      return "/mongoshell/dist/indexv2.html";
+    }
+
     return `${extensionEndpoint}${baseUrl}index.html?resourceId=${resourceId}&accountName=${accountName}&mongoEndpoint=${mongoEndpoint}`;
   }
 

src/Platform/Hosted/extractFeatures.ts

@@ -30,6 +30,10 @@ export type Features = {
   readonly mongoProxyAPIs?: string;
   readonly enableThroughputCap: boolean;
   readonly enableHierarchicalKeys: boolean;
+  readonly enableLegacyMongoShellV1: boolean;
+  readonly enableLegacyMongoShellV1Dist: boolean;
+  readonly enableLegacyMongoShellV2: boolean;
+  readonly enableLegacyMongoShellV2Dist: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -92,6 +96,10 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     notebooksDownBanner: "true" === get("notebooksDownBanner"),
     enableThroughputCap: "true" === get("enablethroughputcap"),
     enableHierarchicalKeys: "true" === get("enablehierarchicalkeys"),
+    enableLegacyMongoShellV1: "true" === get("enablelegacymongoshellv1"),
+    enableLegacyMongoShellV1Dist: "true" === get("enablelegacymongoshellv1dist"),
+    enableLegacyMongoShellV2: "true" === get("enablelegacymongoshellv2"),
+    enableLegacyMongoShellV2Dist: "true" === get("enablelegacymongoshellv2dist"),
   };
 }