Add .github/fabricbot.json

.github/fabricbot.json

@@ -0,0 +1,30 @@
+{
+  "version": "1.0",
+  "tasks": [
+    {
+      "taskType": "trigger",
+      "capabilityId": "AutoMerge",
+      "subCapability": "AutoMerge",
+      "version": "1.0",
+      "id": "LUEPwPETV",
+      "config": {
+        "taskName": "Auto Merge",
+        "label": "automerge",
+        "minMinutesOpen": "5",
+        "mergeType": "squash",
+        "deleteBranches": true,
+        "requireAllStatuses": true,
+        "requireSpecificCheckRuns": false,
+        "usePrDescriptionAsCommitMessage": true,
+        "requireAllStatuses_exemptList": [
+          "Azure Pipelines",
+          "Dependabot",
+          "GitHub Pages",
+          "Check Enforcer"
+        ],
+        "silentMode": true
+      }
+    }
+  ],
+  "userGroups": []
+}

package.json

@@ -47,7 +47,6 @@
     "@types/node-fetch": "2.5.7",
     "applicationinsights": "1.8.0",
     "bootstrap": "3.4.1",
-    "botframework-webchat": "4.14.1",
     "canvas": "file:./canvas",
     "clean-webpack-plugin": "3.0.0",
     "clipboard-copy": "4.0.1",

src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx

@@ -1,13 +1,13 @@
 /**
  * React component for Command button component.
  */
-import { Icon, IIconStyles } from "@fluentui/react";
 import * as React from "react";
 import CollapseChevronDownIcon from "../../../../images/QueryBuilder/CollapseChevronDown_16x.png";
 import { KeyCodes } from "../../../Common/Constants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import * as StringUtils from "../../../Utils/StringUtils";
+
 /**
  * Options for this component
  */
@@ -243,7 +243,6 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
     if (this.props.children && this.props.children.length > 0) {
       contentClassName += " hasHiddenItems";
     }
-    const iconButtonStyles: Partial<IIconStyles> = { root: { marginBottom: -3 } };
 
     return (
       <div className="commandButtonReact">
@@ -260,18 +259,7 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
           onClick={(e: React.MouseEvent<HTMLSpanElement>) => this.commandClickCallback(e)}
         >
           <div className={contentClassName}>
-            if (this.props.iconName){" "}
-            {
-              <div>
-                <Icon
-                  styles={iconButtonStyles}
-                  className="panelInfoIcon"
-                  iconName={this.props.iconName}
-                  ariaLabel="ChatBot"
-                />
-              </div>
-            }{" "}
-            else {<img className="commandIcon" src={this.props.iconSrc} alt={this.props.iconAlt} />}
+            <img className="commandIcon" src={this.props.iconSrc} alt={this.props.iconAlt} />
             {CommandButtonComponent.renderLabel(this.props)}
           </div>
         </span>

src/Explorer/Controls/SupportPaneComponent/SupportPaneComponent.tsx

@@ -1,41 +0,0 @@
-import { Activity } from "botframework-directlinejs";
-import ReactWebChat, { createDirectLine } from "botframework-webchat";
-import React from "react";
-import * as _ from "underscore";
-export interface SupportPaneComponentProps {
-  directLineToken: string;
-  userToken: string;
-  subId: string;
-  rg: string;
-  accName: string;
-}
-
-export class SupportPaneComponent extends React.Component<SupportPaneComponentProps> {
-  private readonly userId: string = _.uniqueId();
-
-  constructor(props: SupportPaneComponentProps) {
-    super(props);
-  }
-
-  public render(): JSX.Element {
-    const styleOptions = {
-      bubbleBackground: "rgba(0, 0, 255, .1)",
-      bubbleFromUserBackground: "rgba(0, 255, 0, .1)",
-    };
-
-    const directLine = createDirectLine({ token: this.props.directLineToken });
-    const dl = {
-      ...directLine,
-      postActivity: (activity: Activity) => {
-        activity.channelData.token = this.props.userToken;
-        activity.channelData.subId = this.props.subId;
-        activity.channelData.rg = this.props.rg;
-        activity.channelData.accName = this.props.accName;
-
-        return directLine.postActivity(activity);
-      },
-    };
-
-    return <ReactWebChat directLine={dl} userID={this.userId} styleOptions={styleOptions} />;
-  }
-}

src/Explorer/Explorer.tsx

@@ -1,6 +1,5 @@
 import { Link } from "@fluentui/react/lib/Link";
 import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
-import { configContext } from "ConfigContext";
 import { IGalleryItem } from "Juno/JunoClient";
 import * as ko from "knockout";
 import React from "react";
@@ -35,7 +34,6 @@ import { userContext } from "../UserContext";
 import { getCollectionName, getUploadName } from "../Utils/APITypeUtils";
 import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
 import { listByDatabaseAccount } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
-import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { isCapabilityEnabled } from "../Utils/CapabilityUtils";
 import { fromContentUri, toRawContentUri } from "../Utils/GitHubUtils";
@@ -87,12 +85,6 @@ export default class Explorer {
   // Notebooks
   public notebookManager?: NotebookManager;
 
-  public conversationToken: ko.Observable<string>;
-  public userToken: ko.Observable<string>;
-  public subId: ko.Observable<string>;
-  public rg: ko.Observable<string>;
-  public accName: ko.Observable<string>;
-
   private _isInitializingNotebooks: boolean;
   private notebookToImport: {
     name: string;
@@ -114,10 +106,6 @@ export default class Explorer {
 
     this.queriesClient = new QueriesClient(this);
 
-    this.conversationToken = ko.observable<string>();
-
-    this.generateConversationToken();
-
     useSelectedNode.subscribe(() => {
       // Make sure switching tabs restores tabs display
       this.isTabsContentExpanded(false);
@@ -467,30 +455,6 @@ export default class Explorer {
     useDialog.getState().openDialog(resetConfirmationDialogProps);
   }
 
-  private async generateConversationToken() {
-    const url = `${configContext.JUNO_ENDPOINT}/api/chatbot/bot${userContext.databaseAccount.id}/conversationToken`;
-    const authorizationHeader = getAuthorizationHeader();
-
-    const response = await fetch(url, {
-      method: "GET",
-      headers: {
-        [Constants.HttpHeaders.authorization]: authorizationHeader.token,
-        Accept: "application/json",
-        [Constants.HttpHeaders.contentType]: "application/json",
-      },
-    });
-
-    if (!response.ok) {
-      throw new Error(await response.json());
-    }
-
-    const tokenResponse: { conversationId: string; token: string; expires_in: number } = await response.json();
-    this.conversationToken(tokenResponse?.token);
-    if (tokenResponse?.expires_in) {
-      setTimeout(() => this.generateConversationToken(), (tokenResponse?.expires_in - 1000) * 1000);
-    }
-  }
-
   private async _containsDefaultNotebookWorkspace(databaseAccount: DataModels.DatabaseAccount): Promise<boolean> {
     if (!databaseAccount) {
       return false;

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -26,7 +26,6 @@ import { userContext } from "../../../UserContext";
 import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
 import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-import { SupportPaneComponent } from "../../Controls/SupportPaneComponent/SupportPaneComponent";
 import Explorer from "../../Explorer";
 import { useNotebook } from "../../Notebook/useNotebook";
 import { OpenFullScreen } from "../../OpenFullScreen";
@@ -196,35 +195,6 @@ export function createControlCommandBarButtons(container: Explorer): CommandButt
   const showOpenFullScreen =
     configContext.platform === Platform.Portal && !isRunningOnNationalCloud() && userContext.apiType !== "Gremlin";
 
-  if (userContext.authType === AuthType.AAD && userContext.features.enableChatbot) {
-    const label = "Chat Assistant";
-    const supportPaneButton: CommandButtonComponentProps = {
-      iconName: "ChatBot",
-      iconAlt: label,
-      onCommandClick: () => {
-        useSidePanel
-          .getState()
-          .openSidePanel(
-            "Chat Assistant (Beta)",
-            <SupportPaneComponent
-              directLineToken={container.conversationToken()}
-              userToken={userContext.authorizationToken}
-              subId={userContext.subscriptionId}
-              rg={userContext.resourceGroup}
-              accName={userContext.databaseAccount.name}
-            />
-          );
-      },
-      commandButtonLabel: null,
-      ariaLabel: label,
-      tooltipText: label,
-      hasPopup: true,
-      disabled: false,
-      className: "fonticoncustom",
-    };
-    buttons.push(supportPaneButton);
-  }
-
   if (showOpenFullScreen) {
     const label = "Open Full Screen";
     const fullScreenButton: CommandButtonComponentProps = {

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.less

@@ -42,10 +42,6 @@
         width: 18px;
         color: rgb(0, 120, 212);
 } 
-.fonticoncustom {
-  padding-top: 12px;
-} 
-
   .status {
     position: relative;
     display: block;

src/Platform/Hosted/extractFeatures.ts

@@ -29,7 +29,6 @@ export type Features = {
   readonly mongoProxyEndpoint?: string;
   readonly mongoProxyAPIs?: string;
   readonly enableThroughputCap: boolean;
-  readonly enableChatbot?: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -91,7 +90,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     partitionKeyDefault2: "true" === get("pkpartitionkeytest"),
     notebooksDownBanner: "true" === get("notebooksDownBanner"),
     enableThroughputCap: "true" === get("enablethroughputcap"),
-    enableChatbot: "true" === get("enablechatbot"),
   };
 }
 

tsconfig.json

@@ -21,8 +21,7 @@
     "resolveJsonModule": true,
     "noEmit": true,
     "types": ["jest"],
-    "baseUrl": "src",
-    "skipLibCheck": true
+    "baseUrl": "src"
   },
   "typedocOptions": {
     "entryPoints": [