diff --git a/src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx b/src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx index ce8f185bd..90b621374 100644 --- a/src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx +++ b/src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx @@ -260,11 +260,11 @@ export class CommandButtonComponent extends React.Component) => this.commandClickCallback(e)} >
- if (this.props.iconName){" "} + if (this.props.iconName){" "} {
{ - private readonly userId: string = _.uniqueId(); + private readonly userId: string = _.uniqueId(); - constructor(props: SupportPaneComponentProps) { - super(props); - } + constructor(props: SupportPaneComponentProps) { + super(props); + } - public render(): JSX.Element { - const styleOptions = { - bubbleBackground: "rgba(0, 0, 255, .1)", - bubbleFromUserBackground: "rgba(0, 255, 0, .1)", - }; + 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; + 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 directLine.postActivity(activity); + }, + }; - return ; - } -} \ No newline at end of file + return ; + } +} diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx index aa9becb76..d2bcd3d67 100644 --- a/src/Explorer/Explorer.tsx +++ b/src/Explorer/Explorer.tsx @@ -92,7 +92,7 @@ export default class Explorer { public subId: ko.Observable; public rg: ko.Observable; public accName: ko.Observable; - + private _isInitializingNotebooks: boolean; private notebookToImport: { name: string; @@ -113,7 +113,7 @@ export default class Explorer { ); this.queriesClient = new QueriesClient(this); - + this.conversationToken = ko.observable(); this.generateConversationToken(); @@ -490,7 +490,7 @@ export default class Explorer { setTimeout(() => this.generateConversationToken(), (tokenResponse?.expires_in - 1000) * 1000); } } - + private async _containsDefaultNotebookWorkspace(databaseAccount: DataModels.DatabaseAccount): Promise { if (!databaseAccount) { return false; diff --git a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx index f000e2388..8ea630a72 100644 --- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx +++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx @@ -196,35 +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)", - - ); - }, - commandButtonLabel: null, - ariaLabel: label, - tooltipText: label, - hasPopup: true, - disabled: false, - className: "fonticoncustom", - }; - buttons.push(supportPaneButton); - } - + 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)", + + ); + }, + 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 = { diff --git a/src/Platform/Hosted/extractFeatures.ts b/src/Platform/Hosted/extractFeatures.ts index 25fa9ac38..f851ce251 100644 --- a/src/Platform/Hosted/extractFeatures.ts +++ b/src/Platform/Hosted/extractFeatures.ts @@ -30,7 +30,7 @@ export type Features = { readonly mongoProxyAPIs?: string; readonly enableThroughputCap: boolean; readonly enableChatbot?: boolean; - + // can be set via both flight and feature flag autoscaleDefault: boolean; partitionKeyDefault: boolean;