feat: Disable virtual assistant with AssistantService property rather…

… than QueryBuilderConfig

packages/legend-application/src/stores/AssistantService.ts

@@ -106,6 +106,7 @@ export class AssistantService {
  * This key is used to allow programmatic re-rendering of the assistant panel
  */
  panelRenderingKey = uuid();
+ isDisabled = false;
  isHidden = true; // hide by default unless specified by the application to show
  isOpen = false;
  isPanelMaximized = false;
@@ -123,6 +124,7 @@ export class AssistantService {
 
  constructor(applicationStore: GenericLegendApplicationStore) {
  makeObservable(this, {
+ isDisabled: observable,
  isHidden: observable,
  isOpen: observable,
  isPanelMaximized: observable,
@@ -134,6 +136,7 @@ export class AssistantService {
  currentDocumentationEntry: observable,
  showSearchConfigurationMenu: observable,
  currentContextualDocumentationEntry: computed,
+ setIsDisabled: action,
  setIsHidden: action,
  setIsOpen: action,
  setIsPanelMaximized: action,
@@ -241,6 +244,10 @@ export class AssistantService {
  }
  }
 
+ setIsDisabled(val: boolean): void {
+ this.isDisabled = val;
+ }
+
  setIsHidden(val: boolean): void {
  this.isHidden = val;
  }

packages/legend-query-builder/src/components/QueryBuilder.tsx

@@ -243,10 +243,10 @@ const QueryBuilderStatusBar = observer(
  onClick={toggleAssistant}
  tabIndex={-1}
  disabled={
- queryBuilderState.config?.TEMPORARY__disableVirtualAssistant
+ queryBuilderState.applicationStore.assistantService.isDisabled
  }
  title={
- queryBuilderState.config?.TEMPORARY__disableVirtualAssistant
+ queryBuilderState.applicationStore.assistantService.isDisabled
  ? 'Virtual Assistant is disabled'
  : 'Toggle assistant'
  }
@@ -944,12 +944,12 @@ export const QueryBuilder = observer(
  <MenuContentItem
  onClick={toggleAssistant}
  disabled={
- queryBuilderState.config
- ?.TEMPORARY__disableVirtualAssistant ?? false
+ queryBuilderState.applicationStore.assistantService
+ .isDisabled
  }
  title={
- queryBuilderState.config
- ?.TEMPORARY__disableVirtualAssistant
+ queryBuilderState.applicationStore.assistantService
+ .isDisabled
  ? 'Virtual Assistant is disabled'
  : ''
  }

packages/legend-query-builder/src/components/__test-utils__/QueryBuilderComponentTestUtils.tsx

@@ -56,7 +56,6 @@ import { STYLE_PREFIX, STYLE_PREFIX__DARK } from '@finos/legend-art';
 import { expect } from '@jest/globals';
 import { QueryBuilderAdvancedWorkflowState } from '../../stores/query-workflow/QueryBuilderWorkFlowState.js';
 import { Route, Routes } from '@finos/legend-application/browser';
-import type { QueryBuilderConfig } from '../../graph-manager/QueryBuilderConfig.js';
 
 const getSelectorContainerClassName = (lightMode?: boolean): string =>
  '.' + `${lightMode ? STYLE_PREFIX : STYLE_PREFIX__DARK}__value-container`;
@@ -196,7 +195,6 @@ export const TEST__setUpQueryBuilder = async (
  mappingPath: string,
  runtimePath: string,
  rawMappingModelCoverageAnalysisResult?: RawMappingModelCoverageAnalysisResult,
- queryBuilderConfig?: QueryBuilderConfig,
 ): Promise<{
  renderResult: RenderResult;
  queryBuilderState: QueryBuilderState;
@@ -229,7 +227,7 @@ export const TEST__setUpQueryBuilder = async (
  MOCK__applicationStore,
  graphManagerState,
  QueryBuilderAdvancedWorkflowState.INSTANCE,
- queryBuilderConfig,
+ undefined,
  );
  const mapping = graphManagerState.graph.getMapping(mappingPath);
  queryBuilderState.executionContextState.setMapping(mapping);

packages/legend-query-builder/src/components/__tests__/QueryBuilder.test.tsx

@@ -98,14 +98,18 @@ test(
  ),
 
  async () => {
- const { renderResult } = await TEST__setUpQueryBuilder(
+ const { renderResult, queryBuilderState } = await TEST__setUpQueryBuilder(
  TEST_DATA__QueryBuilder_Model_SimpleRelational,
  stub_RawLambda(),
  'execution::RelationalMapping',
  'execution::Runtime',
  TEST_DATA__ModelCoverageAnalysisResult_SimpleRelationalWithExists,
  );
 
+ await act(async () => {
+ queryBuilderState.applicationStore.assistantService.setIsDisabled(false);
+ });
+
  // Verify help menu button is enabled
  fireEvent.click(renderResult.getByRole('button', { name: 'Help...' }));
  expect(
@@ -127,22 +131,18 @@ test(
  ),
 
  async () => {
- const { renderResult } = await TEST__setUpQueryBuilder(
+ const { renderResult, queryBuilderState } = await TEST__setUpQueryBuilder(
  TEST_DATA__QueryBuilder_Model_SimpleRelational,
  stub_RawLambda(),
  'execution::RelationalMapping',
  'execution::Runtime',
  TEST_DATA__ModelCoverageAnalysisResult_SimpleRelationalWithExists,
- {
- TEMPORARY__enableExportToCube: false,
- TEMPORARY__disableQueryBuilderChat: false,
- TEMPORARY__enableGridEnterpriseMode: false,
- TEMPORARY__disableVirtualAssistant: true,
- legendAIServiceURL: '',
- zipkinTraceBaseURL: '',
- },
  );
 
+ await act(async () => {
+ queryBuilderState.applicationStore.assistantService.setIsDisabled(true);
+ });
+
  // Verify status bar button is disabled
  expect(
  await renderResult.findByTitle('Virtual Assistant is disabled'),

packages/legend-query-builder/src/graph-manager/QueryBuilderConfig.ts

@@ -33,12 +33,6 @@ export class QueryBuilderConfig {
  */
  TEMPORARY__enableGridEnterpriseMode = false;
 
- /**
- * This flag is to disable the "Show Virtual Assistant" button
- * in Query Builder
- */
- TEMPORARY__disableVirtualAssistant = false;
-
  /**
  * This is the URL of the LegendAI service
  */
@@ -54,7 +48,6 @@ export class QueryBuilderConfig {
  TEMPORARY__disableQueryBuilderChat: optional(primitive()),
  TEMPORARY__enableExportToCube: optional(primitive()),
  TEMPORARY__enableGridEnterpriseMode: optional(primitive()),
- TEMPORARY__disableVirtualAssistant: optional(primitive()),
  legendAIServiceURL: optional(primitive()),
  zipkinTraceBaseURL: optional(primitive()),
  }),