@finos/legend-query-builder 4.16.20 → 4.16.21

package/src/components/__test-utils__/QueryBuilderComponentTestUtils.tsx

@@ -28,8 +28,15 @@ import {
 import { LogService, guaranteeNonNullable } from '@finos/legend-shared';
 import { createSpy } from '@finos/legend-shared/test';
 import {
-  type RawMappingModelCoverageAnalysisResult,
+  type GraphManagerPluginManager,
+  type ObserverContext,
+  type PureModel,
   type RawLambda,
+  type RawMappingModelCoverageAnalysisResult,
+  type V1_Enumeration,
+  type V1_Multiplicity,
+  type V1_ValueSpecification,
+  type ValueSpecification,
   GraphManagerState,
   PackageableElementExplicitReference,
   RuntimePointer,
@@ -56,6 +63,14 @@ 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 {
+  BasicValueSpecificationEditor,
+  type TypeCheckOption,
+} from '../shared/BasicValueSpecificationEditor.js';
+import {
+  V1_BasicValueSpecificationEditor,
+  type V1_TypeCheckOption,
+} from '../shared/V1_BasicValueSpecificationEditor.js';
 
 const getSelectorContainerClassName = (lightMode?: boolean): string =>
   '.' + `${lightMode ? STYLE_PREFIX : STYLE_PREFIX__DARK}__value-container`;
@@ -189,23 +204,15 @@ export const setDerivedPropertyValue = async (
   await waitFor(() => expect(renderResult.queryByRole('dialog')).toBeNull());
 };
 
-export const TEST__setUpQueryBuilder = async (
+export const TEST__setUpGraphManagerState = async (
   entities: Entity[],
-  lambda: RawLambda,
-  mappingPath: string,
-  runtimePath: string,
-  rawMappingModelCoverageAnalysisResult?: RawMappingModelCoverageAnalysisResult,
-): Promise<{
-  renderResult: RenderResult;
-  queryBuilderState: QueryBuilderState;
-}> => {
-  const pluginManager = TEST__LegendApplicationPluginManager.create();
+  pluginManager: GraphManagerPluginManager,
+): Promise<GraphManagerState> => {
   pluginManager.usePresets([new QueryBuilder_GraphManagerPreset()]).install();
   const graphManagerState = new GraphManagerState(
     pluginManager,
     new LogService(),
   );
-
   await graphManagerState.graphManager.initialize({
     env: 'test',
     tabSize: 2,
@@ -217,6 +224,24 @@ export const TEST__setUpQueryBuilder = async (
     entities,
     graphManagerState.graphBuildState,
   );
+  return graphManagerState;
+};
+
+export const TEST__setUpQueryBuilder = async (
+  entities: Entity[],
+  lambda: RawLambda,
+  mappingPath: string,
+  runtimePath: string,
+  rawMappingModelCoverageAnalysisResult?: RawMappingModelCoverageAnalysisResult,
+): Promise<{
+  renderResult: RenderResult;
+  queryBuilderState: QueryBuilderState;
+}> => {
+  const pluginManager = TEST__LegendApplicationPluginManager.create();
+  const graphManagerState = await TEST__setUpGraphManagerState(
+    entities,
+    pluginManager,
+  );
 
   const MOCK__applicationStore = new ApplicationStore(
     TEST__getGenericApplicationConfig(),
@@ -275,3 +300,67 @@ export const TEST__setUpQueryBuilder = async (
     queryBuilderState,
   };
 };
+
+export const TEST__setUpBasicValueSpecificationEditor = (
+  pluginManager: TEST__LegendApplicationPluginManager,
+  props: {
+    valueSpecification: ValueSpecification;
+    setValueSpecification: (val: ValueSpecification) => void;
+    typeCheckOption: TypeCheckOption;
+    resetValue: () => void;
+    graph: PureModel;
+    observerContext: ObserverContext;
+  },
+): void => {
+  const MOCK__applicationStore = new ApplicationStore(
+    TEST__getGenericApplicationConfig(),
+    pluginManager,
+  );
+
+  render(
+    <ApplicationStoreProvider store={MOCK__applicationStore}>
+      <TEST__BrowserEnvironmentProvider initialEntries={['/']}>
+        <ApplicationFrameworkProvider>
+          <Routes>
+            <Route
+              path="*"
+              element={<BasicValueSpecificationEditor {...props} />}
+            />
+          </Routes>
+        </ApplicationFrameworkProvider>
+      </TEST__BrowserEnvironmentProvider>
+    </ApplicationStoreProvider>,
+  );
+};
+
+export const TEST__setUpV1BasicValueSpecificationEditor = (
+  pluginManager: TEST__LegendApplicationPluginManager,
+  props: {
+    valueSpecification: V1_ValueSpecification;
+    setValueSpecification: (val: V1_ValueSpecification) => void;
+    multiplicity: V1_Multiplicity;
+    typeCheckOption: V1_TypeCheckOption;
+    resetValue: () => void;
+    enumeration?: V1_Enumeration | undefined;
+  },
+): void => {
+  const MOCK__applicationStore = new ApplicationStore(
+    TEST__getGenericApplicationConfig(),
+    pluginManager,
+  );
+
+  render(
+    <ApplicationStoreProvider store={MOCK__applicationStore}>
+      <TEST__BrowserEnvironmentProvider initialEntries={['/']}>
+        <ApplicationFrameworkProvider>
+          <Routes>
+            <Route
+              path="*"
+              element={<V1_BasicValueSpecificationEditor {...props} />}
+            />
+          </Routes>
+        </ApplicationFrameworkProvider>
+      </TEST__BrowserEnvironmentProvider>
+    </ApplicationStoreProvider>,
+  );
+};

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -446,7 +446,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
                   ),
                 }}
                 resetValue={resetNode}
-                selectorConfig={selectorConfig}
+                selectorSearchConfig={selectorConfig}
                 isConstant={queryBuilderState.constantState.isValueSpecConstant(
                   rightConditionValue.value,
                 )}

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -1046,7 +1046,7 @@ const QueryBuilderFilterConditionEditor = observer(
                       .func.value.genericType.value.rawType,
                 }}
                 resetValue={resetNode}
-                selectorConfig={selectorConfig}
+                selectorSearchConfig={selectorConfig}
                 isConstant={queryBuilderState.constantState.isValueSpecConstant(
                   rightConditionValue.value,
                 )}