@finos/legend-application-query 5.1.0 → 5.2.3

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"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"}

package/lib/stores/{filterOperators → filter/operators}/QueryBuilderFilterOperator_LessThanEqual.d.ts

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryBuilderFilterOperator, type QueryBuilderFilterState, type FilterConditionState } from '../QueryBuilderFilterState.js';
+import type { QueryBuilderFilterState, FilterConditionState } from '../QueryBuilderFilterState.js';
+import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { type ValueSpecification, type SimpleFunctionExpression } from '@finos/legend-graph';
 export declare class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilterOperator {
     getLabel(filterConditionState: FilterConditionState): string;

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAa7B,qBAAa,wCAAyC,SAAQ,0BAA0B;IACtF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAmCjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}

package/lib/stores/{filterOperators → filter/operators}/QueryBuilderFilterOperator_LessThanEqual.js

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
+import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
+import { generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
 export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilterOperator {
     getLabel(filterConditionState) {
         return '<=';
@@ -38,7 +37,7 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
         ].includes(propertyType.path);
     }
     isCompatibleWithFilterConditionValue(filterConditionState) {
-        return isTypeCompatibleWithConditionValueType(filterConditionState.value
+        return isTypeCompatibleForAssignment(filterConditionState.value
             ? getNonCollectionValueSpecificationType(filterConditionState.value)
             : undefined, filterConditionState.propertyExpressionState.propertyExpression.func
             .genericType.value.rawType);
@@ -51,12 +50,15 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
             case PRIMITIVE_TYPE.DECIMAL:
             case PRIMITIVE_TYPE.FLOAT:
             case PRIMITIVE_TYPE.INTEGER:
-            case PRIMITIVE_TYPE.DATE:
             case PRIMITIVE_TYPE.STRICTDATE:
             case PRIMITIVE_TYPE.DATETIME: {
                 return buildPrimitiveInstanceValue(filterConditionState.filterState.queryBuilderState.graphManagerState
                     .graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
             }
+            case PRIMITIVE_TYPE.DATE: {
+                return buildPrimitiveInstanceValue(filterConditionState.filterState.queryBuilderState.graphManagerState
+                    .graph, PRIMITIVE_TYPE.STRICTDATE, generateDefaultValueForPrimitiveType(propertyType.path));
+            }
             default:
                 throw new UnsupportedOperationError(`Can't get default value for filter operator '${this.getLabel(filterConditionState)}' when the LHS property is of type '${propertyType.path}'`);
         }

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"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"}

package/lib/stores/{filterOperators → filter/operators}/QueryBuilderFilterOperator_StartWith.d.ts

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryBuilderFilterOperator, type QueryBuilderFilterState, type FilterConditionState } from '../QueryBuilderFilterState.js';
+import type { QueryBuilderFilterState, FilterConditionState } from '../QueryBuilderFilterState.js';
+import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { type ValueSpecification, type SimpleFunctionExpression } from '@finos/legend-graph';
 export declare class QueryBuilderFilterOperator_StartWith extends QueryBuilderFilterOperator {
     getLabel(filterConditionState: FilterConditionState): string;

package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_StartWith.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAc7B,qBAAa,oCAAqC,SAAQ,0BAA0B;IAClF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAOV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAOV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAsBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAOrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAQpC;AAED,qBAAa,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAQZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAMpC"}

package/lib/stores/{filterOperators → filter/operators}/QueryBuilderFilterOperator_StartWith.js

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
+import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { buildNotExpression, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
+import { buildNotExpression, generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
 export class QueryBuilderFilterOperator_StartWith extends QueryBuilderFilterOperator {
     getLabel(filterConditionState) {
         return 'starts with';

package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_StartWith.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,EAGd,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,EACL,kBAAkB,EAClB,oCAAoC,EACpC,sCAAsC,EACtC,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AAEvD,MAAM,OAAO,oCAAqC,SAAQ,0BAA0B;IAClF,QAAQ,CAAC,oBAA0C;QACjD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,OAAO,cAAc,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK;YACrC,CAAC,CAAC,sCAAsC,CAAC,oBAAoB,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,cAAc,CAAC,MAAM,KAAK,IAAI,EAAE,IAAI,CAAC;IAC9C,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,QAAQ,YAAY,CAAC,IAAI,EAAE;YACzB,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC1B,OAAO,2BAA2B,CAChC,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,CAAC,IAAI,EACjB,oCAAoC,CAAC,YAAY,CAAC,IAAI,CAAC,CACxD,CAAC;aACH;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,CAC3D,oBAAoB,CACrB,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC7D,CAAC;SACL;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,WAAW,CAC9C,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,WAAW,EAC7C,IAAI,CACL,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,CAAC,oBAA0C;QAC1D,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C;QAE1C,OAAO,kBAAkB,CACvB,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;aACjE,KAAK,EACR,KAAK,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,CAC3D,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "5.1.0",
+  "version": "5.2.3",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -43,41 +43,42 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "28.0.2",
-    "@ag-grid-community/core": "28.0.2",
-    "@ag-grid-community/react": "28.0.0",
-    "@finos/legend-application": "7.0.4",
-    "@finos/legend-art": "2.1.0",
-    "@finos/legend-graph": "13.0.2",
-    "@finos/legend-server-depot": "3.0.4",
-    "@finos/legend-shared": "5.0.3",
-    "@finos/legend-storage": "3.0.3",
+    "@ag-grid-community/client-side-row-model": "28.1.0",
+    "@ag-grid-community/core": "28.1.0",
+    "@ag-grid-community/react": "28.1.0",
+    "@finos/legend-application": "7.1.2",
+    "@finos/legend-art": "3.0.1",
+    "@finos/legend-graph": "14.0.2",
+    "@finos/legend-server-depot": "3.0.6",
+    "@finos/legend-shared": "6.0.1",
+    "@finos/legend-storage": "3.0.5",
     "@testing-library/react": "13.3.0",
-    "@types/react": "18.0.15",
+    "@types/react": "18.0.17",
     "@types/react-dom": "18.0.6",
     "@types/react-router-dom": "5.3.3",
     "date-fns": "2.29.1",
     "history": "5.3.0",
     "mobx": "6.6.1",
     "mobx-react-lite": "3.4.0",
-    "monaco-editor": "0.33.0",
+    "monaco-editor": "0.34.0",
     "react": "18.2.0",
     "react-dnd": "16.0.1",
     "react-dnd-html5-backend": "16.0.1",
     "react-dom": "18.2.0",
     "react-hotkeys": "2.0.0",
     "react-router": "5.3.3",
-    "react-router-dom": "5.3.3"
+    "react-router-dom": "5.3.3",
+    "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.9",
+    "@finos/legend-dev-utils": "2.0.11",
     "@jest/globals": "28.1.3",
     "cross-env": "7.0.3",
-    "eslint": "8.21.0",
+    "eslint": "8.22.0",
     "jest": "28.1.3",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.54.0",
+    "sass": "1.54.4",
     "typescript": "4.7.4"
   },
   "peerDependencies": {

package/src/application/LegendQueryApplicationConfig.ts

@@ -17,12 +17,40 @@
 import {
   assertNonNullable,
   guaranteeNonEmptyString,
+  SerializationFactory,
+  type PlainObject,
 } from '@finos/legend-shared';
 import {
   LegendApplicationConfig,
   type LegendApplicationConfigurationInput,
   type LegendApplicationConfigurationData,
 } from '@finos/legend-application';
+import { createModelSchema, optional, primitive } from 'serializr';
+
+class LegendQueryApplicationCoreOptions {
+  /**
+   * Indicates if we should enable theme switcher.
+   *
+   * NOTE: support for theme switcher is fairly basic at the moment, so we really should
+   * just keep this feature as a beta.
+   *
+   * This flag will be kept until we have full support for themeing
+   * See https://github.com/finos/legend-studio/issues/264
+   */
+  TEMPORARY__enableThemeSwitcher = false;
+
+  private static readonly serialization = new SerializationFactory(
+    createModelSchema(LegendQueryApplicationCoreOptions, {
+      TEMPORARY__enableThemeSwitcher: optional(primitive()),
+    }),
+  );
+
+  static create(
+    configData: PlainObject<LegendQueryApplicationCoreOptions>,
+  ): LegendQueryApplicationCoreOptions {
+    return LegendQueryApplicationCoreOptions.serialization.fromJson(configData);
+  }
+}
 
 export interface LegendQueryApplicationConfigurationData
   extends LegendApplicationConfigurationData {
@@ -39,10 +67,11 @@ export interface LegendQueryApplicationConfigurationData
   };
   engine: { url: string; queryUrl?: string };
   studio: { url: string };
-  extensions?: Record<PropertyKey, unknown>;
 }
 
 export class LegendQueryApplicationConfig extends LegendApplicationConfig {
+  readonly options = new LegendQueryApplicationCoreOptions();
+
   readonly engineServerUrl: string;
   readonly engineQueryServerUrl?: string | undefined;
   readonly depotServerUrl: string;
@@ -73,5 +102,10 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
     );
     this.TEMPORARY__useLegacyDepotServerAPIRoutes =
       input.configData.depot.TEMPORARY__useLegacyDepotServerAPIRoutes;
+
+    this.options = LegendQueryApplicationCoreOptions.create(
+      (input.configData.extensions?.core ??
+        {}) as PlainObject<LegendQueryApplicationCoreOptions>,
+    );
   }
 }

package/src/components/QueryBuilder.tsx

@@ -33,21 +33,22 @@ import {
   CaretDownIcon,
   CogIcon,
 } from '@finos/legend-art';
-import { QueryBuilderFilterPanel } from './QueryBuilderFilterPanel.js';
-import { QueryBuilderExplorerPanel } from './QueryBuilderExplorerPanel.js';
+import { QueryBuilderFilterPanel } from './filter/QueryBuilderFilterPanel.js';
+import { QueryBuilderExplorerPanel } from './explorer/QueryBuilderExplorerPanel.js';
 import { QueryBuilderSetupPanel } from './QueryBuilderSetupPanel.js';
 import { QueryBuilderResultPanel } from './QueryBuilderResultPanel.js';
 import { QueryBuilderTextEditor } from './QueryBuilderTextEditor.js';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
 import { QueryTextEditorMode } from '../stores/QueryTextEditorState.js';
-import { QueryBuilderFetchStructurePanel } from './QueryBuilderFetchStructurePanel.js';
+import { QueryBuilderFetchStructurePanel } from './fetch-structure/QueryBuilderFetchStructurePanel.js';
 import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
 import { flowResult } from 'mobx';
 import { QueryBuilderUnsupportedQueryEditor } from './QueryBuilderUnsupportedQueryEditor.js';
 import { useApplicationStore } from '@finos/legend-application';
 import { QueryBuilderParameterPanel } from './QueryBuilderParameterPanel.js';
-import { QueryBuilderPostFilterPanel } from './QueryBuilderPostFilterPanel.js';
-import { QueryBuilderFunctionsExplorerPanel } from './QueryBuilderFunctionsExplorerPanel.js';
+import { QueryBuilderPostFilterPanel } from './fetch-structure/QueryBuilderPostFilterPanel.js';
+import { QueryBuilderFunctionsExplorerPanel } from './explorer/QueryBuilderFunctionsExplorerPanel.js';
+import { FETCH_STRUCTURE_MODE } from '../stores/fetch-structure/QueryBuilderFetchStructureState.js';
 
 enum QUERY_BUILDER_HOTKEY {
   COMPILE = 'COMPILE',
@@ -141,8 +142,9 @@ export const QueryBuilder = observer(
       );
     };
     const toggleShowPostFilterPanel = (): void => {
-      queryBuilderState.setShowPostFilterPanel(
-        !queryBuilderState.showPostFilterPanel,
+      queryBuilderState.fetchStructureState.projectionState.setShowPostFilterPanel(
+        !queryBuilderState.fetchStructureState.projectionState
+          .showPostFilterPanel,
       );
     };
 
@@ -176,7 +178,13 @@ export const QueryBuilder = observer(
                       Show Function(s)
                     </MenuContentItemLabel>
                   </MenuContentItem>
-                  <MenuContentItem onClick={toggleShowParameterPanel}>
+                  <MenuContentItem
+                    onClick={toggleShowParameterPanel}
+                    disabled={
+                      queryBuilderState.queryParametersState.parameterStates
+                        .length > 0
+                    }
+                  >
                     <MenuContentItemIcon>
                       {queryBuilderState.showParameterPanel ? (
                         <CheckIcon />
@@ -188,10 +196,18 @@ export const QueryBuilder = observer(
                   </MenuContentItem>
                   <MenuContentItem
                     onClick={toggleShowPostFilterPanel}
-                    disabled={queryBuilderState.fetchStructureState.isGraphFetchMode()}
+                    disabled={
+                      queryBuilderState.fetchStructureState
+                        .fetchStructureMode !==
+                        FETCH_STRUCTURE_MODE.PROJECTION ||
+                      Array.from(
+                        queryBuilderState.fetchStructureState.projectionState.postFilterState.nodes.values(),
+                      ).length > 0
+                    }
                   >
                     <MenuContentItemIcon>
-                      {queryBuilderState.showPostFilterPanel ? (
+                      {queryBuilderState.fetchStructureState.projectionState
+                        .showPostFilterPanel ? (
                         <CheckIcon />
                       ) : null}
                     </MenuContentItemIcon>
@@ -323,12 +339,14 @@ export const QueryBuilder = observer(
                       </ResizablePanel>
                       <ResizablePanelSplitter />
                       <ResizablePanel minSize={300}>
-                        {!queryBuilderState.showPostFilterPanel && (
+                        {!queryBuilderState.fetchStructureState.projectionState
+                          .showPostFilterPanel && (
                           <QueryBuilderFilterPanel
                             queryBuilderState={queryBuilderState}
                           />
                         )}
-                        {queryBuilderState.showPostFilterPanel && (
+                        {queryBuilderState.fetchStructureState.projectionState
+                          .showPostFilterPanel && (
                           <ResizablePanelGroup orientation="horizontal">
                             <ResizablePanel minSize={300}>
                               <QueryBuilderFilterPanel

package/src/components/QueryBuilderParameterPanel.tsx

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { useState } from 'react';
 import { observer } from 'mobx-react-lite';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
 import {
@@ -25,12 +26,13 @@ import {
   DollarIcon,
   PlusIcon,
   InputWithInlineValidation,
+  DragPreviewLayer,
+  useDragPreviewLayer,
 } from '@finos/legend-art';
 import {
   type QueryBuilderParameterDragSource,
-  QUERY_BUILDER_PARAMETER_TREE_DND_TYPE,
+  QUERY_BUILDER_PARAMETER_DND_TYPE,
 } from '../stores/QueryParametersState.js';
-import { useEffect, useState } from 'react';
 import {
   type Type,
   MULTIPLICITY_INFINITE,
@@ -47,9 +49,9 @@ import {
   LambdaParameterState,
   LambdaParameterValuesEditor,
   getPackageableElementOptionFormatter,
+  useApplicationStore,
 } from '@finos/legend-application';
-import { useDrag, useDragLayer } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
+import { useDrag } from 'react-dnd';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { DEFAULT_VARIABLE_NAME } from '../QueryBuilder_Const.js';
 
@@ -60,6 +62,7 @@ const VariableExpressionEditor = observer(
   }) => {
     // main state
     const { queryBuilderState, lambdaParameterState } = props;
+    const applicationStore = useApplicationStore();
     const queryParametersState = queryBuilderState.queryParametersState;
     const isCreating =
       !queryParametersState.parameterStates.includes(lambdaParameterState);
@@ -145,6 +148,7 @@ const VariableExpressionEditor = observer(
       }
       close();
     };
+
     return (
       <Dialog
         open={Boolean(lambdaParameterState)}
@@ -192,10 +196,9 @@ const VariableExpressionEditor = observer(
                 options={typeOptions}
                 onChange={changeType}
                 value={selectedType}
-                darkMode={true}
+                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
                 formatOptionLabel={getPackageableElementOptionFormatter({
-                  darkMode: true,
-                  graphManagerState: queryBuilderState.graphManagerState,
+                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
                 })}
               />
             </div>
@@ -243,47 +246,6 @@ const VariableExpressionEditor = observer(
   },
 );
 
-const QueryBuilderParameterDragLayer = observer(
-  (props: { queryBuilderState: QueryBuilderState }) => {
-    const { itemType, item, isDragging, currentPosition } = useDragLayer(
-      (monitor) => ({
-        itemType:
-          monitor.getItemType() as QUERY_BUILDER_PARAMETER_TREE_DND_TYPE,
-        item: monitor.getItem<QueryBuilderParameterDragSource | null>(),
-        isDragging: monitor.isDragging(),
-        initialOffset: monitor.getInitialSourceClientOffset(),
-        currentPosition: monitor.getClientOffset(),
-      }),
-    );
-
-    if (
-      !isDragging ||
-      !item ||
-      !Object.values(QUERY_BUILDER_PARAMETER_TREE_DND_TYPE).includes(itemType)
-    ) {
-      return null;
-    }
-    return (
-      <div className="query-builder__parameters__drag-preview-layer">
-        <div
-          className="query-builder__parameters__drag-preview"
-          style={
-            !currentPosition
-              ? { display: 'none' }
-              : {
-                  transform: `translate(${currentPosition.x + 20}px, ${
-                    currentPosition.y + 10
-                  }px)`,
-                }
-          }
-        >
-          {item.variable.variableName}
-        </div>
-      </div>
-    );
-  },
-);
-
 export const VariableExpressionViewer = observer(
   (props: {
     queryBuilderState: QueryBuilderState;
@@ -302,18 +264,23 @@ export const VariableExpressionViewer = observer(
       queryParameterState.removeParameter(variableExpressionState);
     const [, dragConnector, dragPreviewConnector] = useDrag(
       () => ({
-        type: QUERY_BUILDER_PARAMETER_TREE_DND_TYPE.VARIABLE,
+        type: QUERY_BUILDER_PARAMETER_DND_TYPE,
         item: { variable: variableExpressionState },
       }),
       [variableExpressionState],
     );
-    // hide default HTML5 preview image
-    useEffect(() => {
-      dragPreviewConnector(getEmptyImage(), { captureDraggingState: true });
-    }, [dragPreviewConnector]);
+    useDragPreviewLayer(dragPreviewConnector);
+
     return (
       <div className="query-builder__parameters__parameter" ref={dragConnector}>
-        <QueryBuilderParameterDragLayer queryBuilderState={queryBuilderState} />
+        <DragPreviewLayer
+          labelGetter={(item: QueryBuilderParameterDragSource): string =>
+            item.variable.variableName === ''
+              ? '(unknown)'
+              : item.variable.variableName
+          }
+          types={[QUERY_BUILDER_PARAMETER_DND_TYPE]}
+        />
         <div className="query-builder__parameters__parameter__content">
           <div className="query-builder__parameters__parameter__icon">
             <div className="query-builder__parameters__parameter-icon">
@@ -376,6 +343,7 @@ export const QueryBuilderParameterPanel = observer(
             ),
           ),
           queryBuilderState.observableContext,
+          queryBuilderState.graphManagerState.graph,
         );
         queryParameterState.setSelectedParameter(parmaterState);
         parmaterState.mockParameterValue();