Compare commits

...

25 Commits

Author SHA1 Message Date
tomasvaron
04d6a17b70 Merge branch 'user/t-tomasvaron/chatbot' of https://github.com/Azure/cosmos-explorer into user/t-tomasvaron/chatbot 2022-07-27 21:30:39 -04:00
tomasvaron
905413bf17 remove testing values 2022-07-27 21:29:52 -04:00
tomasvaron
f519aa7be3 Remove newline 2022-07-27 21:27:11 -04:00
tomasvaron
053e346fa4 revert changes 2022-07-27 21:26:21 -04:00
tomasvaron
b4909d9e13 merge 2022-07-18 11:59:08 -04:00
tomasvaron
b268b525d8 merge with master 2022-07-18 11:23:29 -04:00
tomasvaron
02d0353215 Added space between the chat symbol and button text 2022-07-14 10:30:28 -04:00
tomasvaron
4fd153d676 chatbot sticky button 2022-06-20 15:16:07 -04:00
tomasvaron
7b1f3bb493 Merge branch 'user/balalakshmin/chatbot' into user/t-tomasvaron/chatbot 2022-05-11 11:30:04 -04:00
Bala Lakshmi Narayanasami
95b43d83d1 Compile errors fixed 2022-05-11 15:12:55 +05:30
Bala Lakshmi Narayanasami
f9494030ac Format fix 2022-05-10 18:08:25 +05:30
Bala Lakshmi Narayanasami
a1087b2626 Updating package-lock 2022-05-10 16:35:19 +05:30
Bala Lakshmi Narayanasami
5aeca52234 Reverting local change 2022-05-10 15:42:00 +05:30
Bala Lakshmi Narayanasami
6c77430775 Fixed lint errors 2022-05-10 15:34:58 +05:30
Bala Lakshmi Narayanasami
7bc78f126b Reverting unwanted changes 2022-05-09 19:08:26 +05:30
Bala Lakshmi Narayanasami
e3ef515d8b Reverting vscode settings changes 2022-05-09 19:05:42 +05:30
Bala Lakshmi Narayanasami
7ffc1bc35a Code cleanup 2022-05-09 19:04:17 +05:30
Bala Lakshmi Narayanasami
6add6d2e86 Changes for getting conversation token 2022-05-09 18:50:04 +05:30
Bala Lakshmi Narayanasami
a089bac80e Adding chatbot behind feature flag 2022-05-06 16:59:47 +05:30
Bala Lakshmi Narayanasami
c0b5e185aa Merge branch 'master' of https://github.com/Azure/cosmos-explorer into user/balalakshmin/chatbot 2022-05-04 16:55:03 +05:30
Bala Lakshmi Narayanasami
986fe39d07 Minor fix 2022-04-27 16:13:37 +05:30
Bala Lakshmi Narayanasami
fd511f2706 icon alignment fix 2022-02-17 21:02:42 +05:30
Bala Lakshmi Narayanasami
c35e23eb47 updating botframework version 2022-01-12 19:45:34 +05:30
Bala Lakshmi Narayanasami
80be52685f Merge branch 'master' of https://github.com/Azure/cosmos-explorer into user/balalakshmin/chatbot 2022-01-06 19:48:55 +05:30
Bala Lakshmi Narayanasami
d29fd6e957 Merge latest master changes to chatbot 2021-08-03 17:11:00 +05:30
13 changed files with 17581 additions and 1087 deletions

23
less/chat.less Normal file
View File

@@ -0,0 +1,23 @@
@import "./Common/Constants";
.chat {
display: grid;
justify-content: right;
padding: 10px;
.chatButton {
margin: 0 45px 15px 0;
border: 10px;
min-height: 44px;
&:focus {
outline: 0px;
}
>span {
font-size: 17px;
font-family: @DataExplorerFont;
color: @AccentLow;
}
}
}

18453
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -47,6 +47,7 @@
"@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",
@@ -127,6 +128,7 @@
"@types/react-notification-system": "0.2.39",
"@types/react-redux": "7.1.7",
"@types/react-splitter-layout": "3.0.1",
"@types/react-youtube": "7.10.0",
"@types/sanitize-html": "1.27.2",
"@types/sinon": "2.3.3",
"@types/styled-components": "5.1.1",

View File

@@ -9,7 +9,7 @@ import {
allowedJunoOrigins,
allowedMongoBackendEndpoints,
allowedMsalRedirectEndpoints,
validateEndpoint,
validateEndpoint
} from "Utils/EndpointValidation";
export enum Platform {
@@ -190,3 +190,4 @@ export async function initializeConfiguration(): Promise<ConfigContext> {
}
export { configContext };

View File

@@ -0,0 +1,42 @@
import { IIconProps } from '@fluentui/react';
import { PrimaryButton } from '@fluentui/react/lib/Button';
import { AuthType } from 'AuthType';
import { SupportPaneComponent } from 'Explorer/Controls/SupportPaneComponent/SupportPaneComponent';
import Explorer from 'Explorer/Explorer';
import { useSidePanel } from 'hooks/useSidePanel';
import * as React from 'react';
import { userContext } from 'UserContext';
export interface ChatButtonProps {
container: Explorer;
}
const chatIcon: IIconProps = { iconName: 'ChatSolid', style: { marginRight: 10 } };
export const ChatButtonAction: React.FunctionComponent<ChatButtonProps> = props => {
const { container } = props;
if (userContext.authType === AuthType.AAD && userContext.features.enableChatbot) {
return (
<PrimaryButton className={"chatButton"} iconProps={chatIcon} onClick={() => {
useSidePanel
.getState()
.openSidePanel(
"Chat Assistant (Beta)",
<SupportPaneComponent
directLineToken={container.conversationToken()}
userToken={userContext.authorizationToken}
subId={userContext.subscriptionId}
rg={userContext.resourceGroup}
accName={userContext.databaseAccount.name}
/>
);
}}>
<span> Help? </span>
</PrimaryButton>
);
}
return <div></div>
};

View File

@@ -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,6 +243,7 @@ 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">
@@ -259,7 +260,18 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
onClick={(e: React.MouseEvent<HTMLSpanElement>) => this.commandClickCallback(e)}
>
<div className={contentClassName}>
<img className="commandIcon" src={this.props.iconSrc} alt={this.props.iconAlt} />
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} />}
{CommandButtonComponent.renderLabel(this.props)}
</div>
</span>

View File

@@ -0,0 +1,46 @@
import { Activity } from "botframework-directlinejs";
import ReactWebChat from "botframework-webchat";
import React from "react";
import * as _ from "underscore";
const BotFramework = require('botframework-webchat');
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)",
suggestedActionLayout: 'flow',
markdownRespectCRLF: true,
};
const directLine = BotFramework.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} />;
}
}

View File

@@ -1,5 +1,6 @@
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";
@@ -34,6 +35,7 @@ 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";
@@ -85,6 +87,12 @@ 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;
@@ -106,6 +114,10 @@ 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);
@@ -455,6 +467,30 @@ 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;

View File

@@ -26,6 +26,7 @@ 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";
@@ -195,6 +196,35 @@ 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 = {

View File

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

View File

@@ -1,6 +1,7 @@
// CSS Dependencies
import { initializeIcons } from "@fluentui/react";
import "bootstrap/dist/css/bootstrap.css";
import { ChatButtonAction } from "Explorer/Controls/ChatButton/ChatButtonComponent";
import { QuickstartCarousel } from "Explorer/Tutorials/QuickstartCarousel";
import { QuickstartTutorial } from "Explorer/Tutorials/QuickstartTutorial";
import { useCarousel } from "hooks/useCarousel";
@@ -17,6 +18,7 @@ import "../externals/jquery.typeahead.min.js";
import "../images/CosmosDB_rgb_ui_lighttheme.ico";
import "../images/favicon.ico";
import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";
import "../less/chat.less";
import "../less/documentDB.less";
import "../less/forms.less";
import "../less/infobox.less";
@@ -103,6 +105,9 @@ const App: React.FunctionComponent = () => {
<Tabs explorer={explorer} />
</div>
{/* Collections Tree and Tabs - End */}
<div className="chat">
<ChatButtonAction container={explorer} />
</div>
<div
className="dataExplorerErrorConsoleContainer"
role="contentinfo"
@@ -111,6 +116,7 @@ const App: React.FunctionComponent = () => {
>
<NotificationConsole />
</div>
</div>
<SidePanel />
<Dialog />

View File

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