Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable chat on UI unless config assistant.chat.enabled is true #6

Merged
merged 2 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "assistantDashboards",
"version": "2.11.0.0",
"opensearchDashboardsVersion": "opensearchDashboards",
"opensearchDashboardsVersion": "2.11.0",
"server": true,
"ui": true,
"requiredPlugins": [
Expand All @@ -10,7 +10,7 @@
"opensearchDashboardsReact",
"opensearchDashboardsUtils"
],
"optionalPlugins":[
"observabilityDashboards"
"configPath": [
"assistant"
]
}
5 changes: 4 additions & 1 deletion public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { PluginInitializerContext } from '../../../src/core/public';
import { AssistantPlugin } from './plugin';

export { AssistantPlugin as Plugin };

export const plugin = () => new AssistantPlugin();
export function plugin(initializerContext: PluginInitializerContext) {
return new AssistantPlugin(initializerContext);
}
69 changes: 41 additions & 28 deletions public/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
*/

import React from 'react';
import { CoreSetup, CoreStart, Plugin } from '../../../src/core/public';
import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '../../../src/core/public';
import {
createOpenSearchDashboardsReactContext,
toMountPoint,
} from '../../../src/plugins/opensearch_dashboards_react/public';
import { createGetterSetter } from '../../../src/plugins/opensearch_dashboards_utils/common';
import { HeaderChatButton } from './chat_header_button';
import { AssistantServices } from './contexts/core_context';
import { SessionLoadService } from './services/session_load_service';
import {
ActionExecutor,
AppPluginStartDependencies,
Expand All @@ -21,12 +22,22 @@ import {
ContentRenderer,
SetupDependencies,
} from './types';
import { SessionLoadService } from './services/session_load_service';

export const [getCoreStart, setCoreStart] = createGetterSetter<CoreStart>('CoreStart');

interface PublicConfig {
chat: {
enabled: boolean;
};
}

export class AssistantPlugin
implements Plugin<AssistantSetup, AssistantStart, SetupDependencies, AppPluginStartDependencies> {
private config: PublicConfig;
constructor(initializerContext: PluginInitializerContext) {
this.config = initializerContext.config.get<PublicConfig>();
}

public setup(
core: CoreSetup<AppPluginStartDependencies>,
setupDeps: SetupDependencies
Expand All @@ -52,34 +63,36 @@ export class AssistantPlugin
};
})();

core.getStartServices().then(async ([coreStart, startDeps]) => {
const CoreContext = createOpenSearchDashboardsReactContext<AssistantServices>({
...coreStart,
setupDeps,
startDeps,
sessionLoad: new SessionLoadService(coreStart.http),
});
const account = await getAccount();
const username = account.data.user_name;
if (this.config.chat.enabled) {
core.getStartServices().then(async ([coreStart, startDeps]) => {
const CoreContext = createOpenSearchDashboardsReactContext<AssistantServices>({
...coreStart,
setupDeps,
startDeps,
sessionLoad: new SessionLoadService(coreStart.http),
});
const account = await getAccount();
const username = account.data.user_name;

coreStart.chrome.navControls.registerRight({
order: 10000,
mount: toMountPoint(
<CoreContext.Provider>
<HeaderChatButton
application={coreStart.application}
chatEnabled={account.data.roles.some((role) =>
['all_access', 'assistant_user'].includes(role)
)}
contentRenderers={contentRenderers}
actionExecutors={actionExecutors}
assistantActions={assistantActions}
currentAccount={{ username }}
/>
</CoreContext.Provider>
),
coreStart.chrome.navControls.registerRight({
order: 10000,
mount: toMountPoint(
<CoreContext.Provider>
<HeaderChatButton
application={coreStart.application}
chatEnabled={account.data.roles.some((role) =>
['all_access', 'assistant_user'].includes(role)
)}
contentRenderers={contentRenderers}
actionExecutors={actionExecutors}
assistantActions={assistantActions}
currentAccount={{ username }}
/>
</CoreContext.Provider>
),
});
});
});
}

return {
registerContentRenderer: (contentType, render) => {
Expand Down
20 changes: 19 additions & 1 deletion server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,29 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { PluginInitializerContext } from '../../../src/core/server';
import { schema, TypeOf } from '@osd/config-schema';
import { PluginConfigDescriptor, PluginInitializerContext } from '../../../src/core/server';
import { AssistantPlugin } from './plugin';

export function plugin(initializerContext: PluginInitializerContext) {
return new AssistantPlugin(initializerContext);
}

export { AssistantPluginSetup, AssistantPluginStart } from './types';

const assistantConfig = {
schema: schema.object({
chat: schema.object({
enabled: schema.boolean({ defaultValue: false }),
}),
}),
};

export type AssistantConfig = TypeOf<typeof assistantConfig.schema>;

export const config: PluginConfigDescriptor<AssistantConfig> = {
schema: assistantConfig.schema,
exposeToBrowser: {
chat: true,
},
};
12 changes: 10 additions & 2 deletions server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { first } from 'rxjs/operators';
import 'web-streams-polyfill';
import { AssistantConfig } from '.';
import {
CoreSetup,
CoreStart,
Expand All @@ -15,6 +17,7 @@ import {
import { OpenSearchAlertingPlugin } from './adaptors/opensearch_alerting_plugin';
import { OpenSearchObservabilityPlugin } from './adaptors/opensearch_observability_plugin';
import { PPLPlugin } from './adaptors/ppl_plugin';
import { AssistantServerConfig } from './config/schema';
import './fetch-polyfill';
import { setupRoutes } from './routes/index';
import { chatSavedObject } from './saved_objects/chat_saved_object';
Expand All @@ -24,12 +27,16 @@ import { chatConfigSavedObject } from './saved_objects/chat_config_saved_object'
export class AssistantPlugin implements Plugin<AssistantPluginSetup, AssistantPluginStart> {
private readonly logger: Logger;

constructor(initializerContext: PluginInitializerContext) {
constructor(private readonly initializerContext: PluginInitializerContext) {
this.logger = initializerContext.logger.get();
}

public setup(core: CoreSetup) {
public async setup(core: CoreSetup) {
this.logger.debug('Assistant: Setup');
const config = await this.initializerContext.config
.create<AssistantConfig>()
.pipe(first())
.toPromise();
const router = core.http.createRouter();
const openSearchObservabilityClient: ILegacyClusterClient = core.opensearch.legacy.createClient(
'opensearch_observability',
Expand All @@ -40,6 +47,7 @@ export class AssistantPlugin implements Plugin<AssistantPluginSetup, AssistantPl

core.http.registerRouteHandlerContext('assistant_plugin', (context, request) => {
return {
config,
logger: this.logger,
observabilityClient: openSearchObservabilityClient,
};
Expand Down