@finos/legend-application-query 5.1.0 → 5.2.3

package/lib/components/fetch-structure/QueryBuilderProjectionPanel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderProjectionPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderProjectionPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAoCH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AA+b3E,eAAO,MAAM,2BAA2B,WAC9B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CA4HjD,CAAC"}

package/lib/components/{QueryBuilderProjectionPanel.js → fetch-structure/QueryBuilderProjectionPanel.js}

@@ -16,44 +16,23 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { useEffect, useRef, useCallback, useState, forwardRef } from 'react';
 import { observer } from 'mobx-react-lite';
-import { clsx, BlankPanelPlaceholder, TimesIcon, DropdownMenu, MenuContent, MenuContentItem, CaretDownIcon, VerticalDragHandleIcon, ContextMenu, InputWithInlineValidation, SigmaIcon, TimesCircleIcon, } from '@finos/legend-art';
-import { buildPropertyExpressionFromExplorerTreeNodeData, QUERY_BUILDER_EXPLORER_TREE_DND_TYPE, } from '../stores/QueryBuilderExplorerState.js';
-import { useDragLayer, useDrag, useDrop, } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
-import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, QUERY_BUILDER_PROJECTION_DND_TYPE, } from '../stores/QueryBuilderProjectionState.js';
-import { QueryBuilderPropertyExpressionBadge } from './QueryBuilderPropertyExpressionEditor.js';
+import { clsx, BlankPanelPlaceholder, TimesIcon, DropdownMenu, MenuContent, MenuContentItem, CaretDownIcon, VerticalDragHandleIcon, ContextMenu, InputWithInlineValidation, SigmaIcon, PanelDropZone, DragPreviewLayer, PanelEntryDropZonePlaceholder, useDragPreviewLayer, } from '@finos/legend-art';
+import { buildPropertyExpressionFromExplorerTreeNodeData, QUERY_BUILDER_EXPLORER_TREE_DND_TYPE, } from '../../stores/explorer/QueryBuilderExplorerState.js';
+import { useDrag, useDrop } from 'react-dnd';
+import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE, } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
 import { QueryResultModifierModal } from './QueryBuilderResultModifierPanel.js';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
+import { QueryBuilderAggregateColumnState } from '../../stores/fetch-structure/projection/aggregation/QueryBuilderAggregationState.js';
 import { flowResult } from 'mobx';
-import { QueryBuilderLambdaEditor } from './QueryBuilderLambdaEditor.js';
+import { QueryBuilderLambdaEditor } from '../shared/QueryBuilderLambdaEditor.js';
 import { useApplicationStore } from '@finos/legend-application';
-import { QUERY_BUILDER_PARAMETER_TREE_DND_TYPE, } from '../stores/QueryParametersState.js';
+import { QUERY_BUILDER_PARAMETER_DND_TYPE, } from '../../stores/QueryParametersState.js';
 import { generateFunctionCallString, LAMBDA_PIPE, VARIABLE_REFERENCE_TOKEN, } from '@finos/legend-graph';
-import { QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE, } from '../stores/QueryFunctionsExplorerState.js';
-import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilder_Const.js';
-import { QueryBuilderPostFilterTreeConditionNodeData } from '../stores/QueryBuilderPostFilterState.js';
+import { QUERY_BUILDER_FUNCTION_DND_TYPE, } from '../../stores/explorer/QueryFunctionsExplorerState.js';
+import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../QueryBuilder_Const.js';
+import { QueryBuilderPostFilterTreeConditionNodeData } from '../../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import { filterByType } from '@finos/legend-shared';
-const ProjectionColumnDragLayer = () => {
-    const { itemType, item, isDragging, currentPosition } = useDragLayer((monitor) => ({
-        itemType: monitor.getItemType(),
-        item: monitor.getItem(),
-        isDragging: monitor.isDragging(),
-        initialOffset: monitor.getInitialSourceClientOffset(),
-        currentPosition: monitor.getClientOffset(),
-    }));
-    if (!isDragging ||
-        !item ||
-        itemType !== QUERY_BUILDER_PROJECTION_DND_TYPE.PROJECTION_COLUMN) {
-        return null;
-    }
-    return (_jsx("div", { className: "query-builder__projection__column__drag-preview-layer", children: _jsx("div", { className: "query-builder__projection__column__drag-preview", 
-            // added some offset so the mouse doesn't overlap the label too much
-            style: !currentPosition
-                ? { display: 'none' }
-                : {
-                    transform: `translate(${currentPosition.x + 20}px, ${currentPosition.y + 10}px)`,
-                }, children: item.columnState.columnName }) }));
-};
 const QueryBuilderProjectionColumnContextMenu = observer(forwardRef(function QueryBuilderProjectionColumnContextMenu(props, ref) {
     const { projectionColumnState } = props;
     const removeColumn = () => projectionColumnState.projectionState.removeColumn(projectionColumnState);
@@ -75,10 +54,10 @@ const QueryBuilderDerivationProjectionColumnEditor = observer((props) => {
     const { projectionColumnState } = props;
     const hasParserError = projectionColumnState.projectionState.hasParserError;
     const handleDrop = useCallback((item, type) => {
-        if (type === QUERY_BUILDER_PARAMETER_TREE_DND_TYPE.VARIABLE) {
+        if (type === QUERY_BUILDER_PARAMETER_DND_TYPE) {
             projectionColumnState.derivationLambdaEditorState.setLambdaString(`${projectionColumnState.derivationLambdaEditorState.lambdaString}${VARIABLE_REFERENCE_TOKEN}${item.variable.variableName}`);
         }
-        else if (type === QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE.FUNCTION) {
+        else if (type === QUERY_BUILDER_FUNCTION_DND_TYPE) {
             projectionColumnState.derivationLambdaEditorState.setLambdaString(`${projectionColumnState.derivationLambdaEditorState.lambdaString}${`${generateFunctionCallString(item.node
                 .packageableElement)}`}`);
         }
@@ -93,8 +72,8 @@ const QueryBuilderDerivationProjectionColumnEditor = observer((props) => {
             QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.CLASS_PROPERTY,
             QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
             QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-            QUERY_BUILDER_PARAMETER_TREE_DND_TYPE.VARIABLE,
-            QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE.FUNCTION,
+            QUERY_BUILDER_PARAMETER_DND_TYPE,
+            QUERY_BUILDER_FUNCTION_DND_TYPE,
         ],
         drop: (item, monitor) => {
             if (!monitor.didDrop()) {
@@ -110,13 +89,17 @@ const QueryBuilderProjectionColumnEditor = observer((props) => {
     const [isSelectedFromContextMenu, setIsSelectedFromContextMenu] = useState(false);
     const onContextMenuOpen = () => setIsSelectedFromContextMenu(true);
     const onContextMenuClose = () => setIsSelectedFromContextMenu(false);
-    const { projectionColumnState, isRearrangingColumns } = props;
+    const { projectionColumnState } = props;
     const queryBuilderState = projectionColumnState.projectionState.queryBuilderState;
     const projectionState = queryBuilderState.fetchStructureState.projectionState;
-    const isRemovalDisabled = Array.from(queryBuilderState.postFilterState.nodes.values())
+    const postFilterColumnStates = Array.from(projectionState.postFilterState.nodes.values())
         .filter(filterByType(QueryBuilderPostFilterTreeConditionNodeData))
-        .map((n) => n.condition.columnState)
-        .includes(projectionColumnState);
+        .map((n) => n.condition.columnState);
+    const isRemovalDisabled = postFilterColumnStates
+        .filter((co) => co instanceof QueryBuilderAggregateColumnState)
+        .map((co) => co.projectionColumnState)
+        .includes(projectionColumnState) ||
+        postFilterColumnStates.includes(projectionColumnState);
     const removeColumn = () => projectionState.removeColumn(projectionColumnState);
     // name
     const changeColumnName = (event) => projectionColumnState.setColumnName(event.target.value);
@@ -136,8 +119,7 @@ const QueryBuilderProjectionColumnEditor = observer((props) => {
         const hoverBoundingReact = ref.current?.getBoundingClientRect();
         const distanceThreshold = ((hoverBoundingReact?.bottom ?? 0) - (hoverBoundingReact?.top ?? 0)) /
             2;
-        const dragDistance = monitor.getClientOffset().y -
-            (hoverBoundingReact?.top ?? 0);
+        const dragDistance = (monitor.getClientOffset()?.y ?? 0) - (hoverBoundingReact?.top ?? 0);
         if (dragIndex < hoverIndex && dragDistance < distanceThreshold) {
             return;
         }
@@ -147,29 +129,31 @@ const QueryBuilderProjectionColumnEditor = observer((props) => {
         projectionState.moveColumn(dragIndex, hoverIndex);
     }, [projectionColumnState, projectionState]);
     const [, dropConnector] = useDrop(() => ({
-        accept: [QUERY_BUILDER_PROJECTION_DND_TYPE.PROJECTION_COLUMN],
+        accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
         hover: (item, monitor) => handleHover(item, monitor),
     }), [handleHover]);
-    const [, dragConnector, dragPreviewConnector] = useDrag(() => ({
-        type: QUERY_BUILDER_PROJECTION_DND_TYPE.PROJECTION_COLUMN,
-        item: () => {
-            projectionColumnState.setIsBeingDragged(true);
-            return { columnState: projectionColumnState };
-        },
-        end: (item) => item?.columnState.setIsBeingDragged(false),
+    const [{ projectionColumnBeingDragged }, dragConnector, dragPreviewConnector,] = useDrag(() => ({
+        type: QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+        item: () => ({
+            columnState: projectionColumnState,
+        }),
+        collect: (monitor) => ({
+            /**
+             * @workaround typings - https://github.com/react-dnd/react-dnd/pull/3484
+             */
+            projectionColumnBeingDragged: 
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+            monitor.getItem()
+                ?.columnState,
+        }),
     }), [projectionColumnState]);
+    const isBeingDragged = projectionColumnState === projectionColumnBeingDragged;
     dragConnector(dropConnector(ref));
-    // hide default HTML5 preview image
-    useEffect(() => {
-        dragPreviewConnector(getEmptyImage(), { captureDraggingState: true });
-    }, [dragPreviewConnector]);
-    return (_jsxs("div", { ref: ref, className: clsx('query-builder__projection__column', {
-            'query-builder__projection__column--dragged': projectionColumnState.isBeingDragged,
-            'query-builder__projection__column--no-hover': isRearrangingColumns,
-        }), children: [projectionColumnState.isBeingDragged && (_jsx("div", { className: "query-builder__projection__column__dnd__placeholder__container", children: _jsx("div", { className: "query-builder__dnd__placeholder query-builder__projection__column__dnd__placeholder" }) })), !projectionColumnState.isBeingDragged && (_jsxs(ContextMenu, { content: _jsx(QueryBuilderProjectionColumnContextMenu, { projectionColumnState: projectionColumnState }), disabled: !(projectionColumnState instanceof
+    useDragPreviewLayer(dragPreviewConnector);
+    return (_jsx("div", { ref: ref, className: "query-builder__projection__column", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isBeingDragged, className: "query-builder__dnd__placeholder", children: _jsxs(ContextMenu, { content: _jsx(QueryBuilderProjectionColumnContextMenu, { projectionColumnState: projectionColumnState }), disabled: !(projectionColumnState instanceof
                     QueryBuilderSimpleProjectionColumnState), className: clsx('query-builder__projection__column__context-menu', {
                     'query-builder__projection__column--selected-from-context-menu': isSelectedFromContextMenu,
-                }), menuProps: { elevation: 7 }, onOpen: onContextMenuOpen, onClose: onContextMenuClose, children: [_jsx("div", { className: "query-builder__projection__column__dnd__indicator", children: _jsx("div", { className: "query-builder__projection__column__dnd__indicator__handler", children: _jsx(VerticalDragHandleIcon, {}) }) }), _jsx("div", { className: "query-builder__projection__column__name", children: _jsx(InputWithInlineValidation, { className: "query-builder__projection__column__name__input input-group__input", spellCheck: false, value: projectionColumnState.columnName, onChange: changeColumnName, validationErrorMessage: isDuplicatedColumnName ? 'Duplicated column' : undefined }) }), _jsxs("div", { className: "query-builder__projection__column__value", children: [projectionColumnState instanceof
+                }), menuProps: { elevation: 7 }, onOpen: onContextMenuOpen, onClose: onContextMenuClose, children: [_jsx("div", { className: "query-builder__projection__column__drag-handle__container", children: _jsx("div", { className: "query-builder__projection__column__drag-handle", children: _jsx(VerticalDragHandleIcon, {}) }) }), _jsx("div", { className: "query-builder__projection__column__name", children: _jsx(InputWithInlineValidation, { className: "query-builder__projection__column__name__input input-group__input", spellCheck: false, value: projectionColumnState.columnName, onChange: changeColumnName, validationErrorMessage: isDuplicatedColumnName ? 'Duplicated column' : undefined }) }), _jsxs("div", { className: "query-builder__projection__column__value", children: [projectionColumnState instanceof
                                 QueryBuilderSimpleProjectionColumnState && (_jsx(QueryBuilderSimpleProjectionColumnEditor, { projectionColumnState: projectionColumnState })), projectionColumnState instanceof
                                 QueryBuilderDerivationProjectionColumnState && (_jsx(QueryBuilderDerivationProjectionColumnEditor, { projectionColumnState: projectionColumnState }))] }), _jsx("div", { className: "query-builder__projection__column__aggregate", children: _jsxs("div", { className: "query-builder__projection__column__aggregate__operator", children: [aggregateColumnState && (_jsx("div", { className: "query-builder__projection__column__aggregate__operator__label", children: aggregateColumnState.operator.getLabel(projectionColumnState) })), _jsxs(DropdownMenu, { className: "query-builder__projection__column__aggregate__operator__dropdown", disabled: !aggreateOperators.length, content: _jsxs(MenuContent, { children: [aggregateColumnState && (_jsx(MenuContentItem, { className: "query-builder__projection__column__aggregate__operator__dropdown__option", onClick: changeOperator(undefined), children: "(none)" })), aggreateOperators.map((op) => (_jsx(MenuContentItem, { className: "query-builder__projection__column__aggregate__operator__dropdown__option", onClick: changeOperator(op), children: op.getLabel(projectionColumnState) }, op.uuid)))] }), menuProps: {
                                         anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
@@ -179,19 +163,17 @@ const QueryBuilderProjectionColumnEditor = observer((props) => {
                                                 'query-builder__projection__column__aggregate__operator__badge--activated': Boolean(aggregateColumnState),
                                             }), tabIndex: -1, title: "Choose Aggregate Operator...", children: _jsx(SigmaIcon, {}) }), _jsx("button", { className: "query-builder__projection__column__aggregate__operator__dropdown__trigger", tabIndex: -1, title: "Choose Aggregate Operator...", children: _jsx(CaretDownIcon, {}) })] })] }) }), _jsx("div", { className: "query-builder__projection__column__actions", children: _jsx("button", { className: "query-builder__projection__column__action", tabIndex: -1, onClick: removeColumn, disabled: isRemovalDisabled, title: isRemovalDisabled
                                 ? "This column is used in the post filter and can't be removed"
-                                : 'Remove', children: _jsx(TimesIcon, {}) }) })] }))] }));
+                                : 'Remove', children: _jsx(TimesIcon, {}) }) })] }) }) }));
 });
 export const QueryBuilderProjectionPanel = observer((props) => {
     const applicationStore = useApplicationStore();
     const { queryBuilderState } = props;
     const projectionState = queryBuilderState.fetchStructureState.projectionState;
     const projectionColumns = projectionState.columns;
-    // Drag and Drop
-    const isRearrangingColumns = projectionColumns.some((columnState) => columnState.isBeingDragged);
     const handleDrop = useCallback((item, type) => {
         switch (type) {
-            case QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE.FUNCTION: {
-                const derivationProjectionColumn = new QueryBuilderDerivationProjectionColumnState(projectionState, queryBuilderState.graphManagerState.graphManager.HACKY__createDefaultBlankLambda());
+            case QUERY_BUILDER_FUNCTION_DND_TYPE: {
+                const derivationProjectionColumn = new QueryBuilderDerivationProjectionColumnState(projectionState, queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda({ addDummyParameter: true }));
                 derivationProjectionColumn.derivationLambdaEditorState.setLambdaString(`${DEFAULT_LAMBDA_VARIABLE_NAME}${LAMBDA_PIPE}${generateFunctionCallString(item.node
                     .packageableElement)}`);
                 projectionState.addColumn(derivationProjectionColumn);
@@ -206,12 +188,11 @@ export const QueryBuilderProjectionPanel = observer((props) => {
                 break;
         }
     }, [queryBuilderState, projectionState]);
-    const isInvalidProjection = !projectionState.isValidProjectionState();
-    const [{ isPropertyDragOver }, dropConnector] = useDrop(() => ({
+    const [{ isDragOver }, dropTargetConnector] = useDrop(() => ({
         accept: [
             QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
             QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-            QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE.FUNCTION,
+            QUERY_BUILDER_FUNCTION_DND_TYPE,
         ],
         drop: (item, monitor) => {
             if (!monitor.didDrop()) {
@@ -219,15 +200,14 @@ export const QueryBuilderProjectionPanel = observer((props) => {
             } // prevent drop event propagation to accomondate for nested DnD
         },
         collect: (monitor) => ({
-            isPropertyDragOver: monitor.isOver({ shallow: true }),
+            isDragOver: monitor.isOver({ shallow: true }),
         }),
     }), [handleDrop]);
     useEffect(() => {
         flowResult(projectionState.convertDerivationProjectionObjects()).catch(applicationStore.alertUnhandledError);
     }, [applicationStore, projectionState]);
-    return (_jsxs("div", { ref: dropConnector, className: `panel__content dnd__overlay__container`, children: [isInvalidProjection && (_jsx("div", { className: "query-builder__projection__container__error", children: _jsxs("div", { className: "query-builder__projection__error__label", children: [_jsx(TimesCircleIcon, { className: "query-builder__projection__error__icon" }), projectionState.getValidationErrorMessage() ??
-                            'There is an error with the projection'] }) })), _jsx("div", { className: clsx({ dnd__overlay: isPropertyDragOver }) }), !projectionColumns.length && (_jsx(BlankPanelPlaceholder, { placeholderText: "Add a projection column", tooltipText: "Drag and drop properties here" })), Boolean(projectionColumns.length) && (_jsxs("div", { "data-testid": QUERY_BUILDER_TEST_ID.QUERY_BUILDER_PROJECTION, className: `query-builder__projection__columns ${clsx({
-                    ['query-builder__projection__columns--with-error']: isInvalidProjection,
-                })} `, children: [_jsx(ProjectionColumnDragLayer, {}), projectionColumns.map((projectionColumnState) => (_jsx(QueryBuilderProjectionColumnEditor, { projectionColumnState: projectionColumnState, isRearrangingColumns: isRearrangingColumns }, projectionColumnState.uuid)))] })), _jsx(QueryResultModifierModal, { queryBuilderState: queryBuilderState })] }));
+    return (_jsx("div", { className: "panel__content", children: _jsxs(PanelDropZone, { isDragOver: isDragOver, dropTargetConnector: dropTargetConnector, children: [!projectionColumns.length && (_jsx(BlankPanelPlaceholder, { text: "Add a projection column", tooltipText: "Drag and drop properties here" })), Boolean(projectionColumns.length) && (_jsxs("div", { "data-testid": QUERY_BUILDER_TEST_ID.QUERY_BUILDER_PROJECTION, className: "query-builder__projection__columns", children: [_jsx(DragPreviewLayer, { labelGetter: (item) => item.columnState.columnName === ''
+                                ? '(unknown)'
+                                : item.columnState.columnName, types: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE] }), projectionColumns.map((projectionColumnState) => (_jsx(QueryBuilderProjectionColumnEditor, { projectionColumnState: projectionColumnState }, projectionColumnState.uuid)))] })), _jsx(QueryResultModifierModal, { queryBuilderState: queryBuilderState })] }) }));
 });
 //# sourceMappingURL=QueryBuilderProjectionPanel.js.map

package/lib/components/fetch-structure/QueryBuilderProjectionPanel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderProjectionPanel.js","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderProjectionPanel.tsx"],"names":[],"mappings":"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"}

package/lib/components/{QueryBuilderResultModifierPanel.d.ts → fetch-structure/QueryBuilderResultModifierPanel.d.ts}

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /// <reference types="react" resolution-mode="require"/>
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 export declare const QueryResultModifierModal: ((props: {
     queryBuilderState: QueryBuilderState;
 }) => JSX.Element) & {

package/lib/components/fetch-structure/QueryBuilderResultModifierPanel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderResultModifierPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAiBH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAmJ3E,eAAO,MAAM,wBAAwB,WAC3B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CAkFjD,CAAC"}

package/lib/components/{QueryBuilderResultModifierPanel.js → fetch-structure/QueryBuilderResultModifierPanel.js}

@@ -16,12 +16,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { observer } from 'mobx-react-lite';
 import { clsx, Dialog, CustomSelectorInput, CheckSquareIcon, SortDownIcon, SortDownAltIcon, SquareIcon, TimesIcon, } from '@finos/legend-art';
-import { COLUMN_SORT_TYPE, SortColumnState, } from '../stores/QueryResultSetModifierState.js';
+import { COLUMN_SORT_TYPE, SortColumnState, } from '../../stores/fetch-structure/projection/QueryResultSetModifierState.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
+import { useApplicationStore } from '@finos/legend-application';
 const ColumnSortEditor = observer((props) => {
     const { queryBuilderState, columnSort } = props;
+    const applicationStore = useApplicationStore();
     const projectionState = queryBuilderState.fetchStructureState.projectionState;
-    const sortColumns = queryBuilderState.resultSetModifierState.sortColumns;
+    const sortColumns = queryBuilderState.fetchStructureState.projectionState
+        .resultSetModifierState.sortColumns;
     const projectionOptions = projectionState.columns
         .filter((projectionCol) => projectionCol === columnSort.columnState ||
         !sortColumns.some((sortCol) => sortCol.columnState === projectionCol))
@@ -44,12 +47,13 @@ const ColumnSortEditor = observer((props) => {
             ? COLUMN_SORT_TYPE.DESC
             : COLUMN_SORT_TYPE.ASC);
     };
-    const deleteColumnSort = () => queryBuilderState.resultSetModifierState.deleteSortColumn(columnSort);
-    return (_jsxs("div", { className: "panel__content__form__section__list__item query-builder__projection__options__sort", children: [_jsx(CustomSelectorInput, { className: "query-builder__projection__options__sort__dropdown", options: projectionOptions, disabled: projectionOptions.length <= 1, onChange: onChange, value: value, darkMode: true }), _jsx("button", { className: "btn--dark btn--sm query-builder__projection__options__sort__type-btn", tabIndex: -1, onClick: toggleSortType, children: sortType === COLUMN_SORT_TYPE.ASC ? (_jsx(SortDownIcon, {})) : (_jsx(SortDownAltIcon, {})) }), _jsx("button", { className: "query-builder__projection__options__sort__remove-btn", onClick: deleteColumnSort, tabIndex: -1, title: 'Remove', children: _jsx(TimesIcon, {}) })] }));
+    const deleteColumnSort = () => queryBuilderState.fetchStructureState.projectionState.resultSetModifierState.deleteSortColumn(columnSort);
+    return (_jsxs("div", { className: "panel__content__form__section__list__item query-builder__projection__options__sort", children: [_jsx(CustomSelectorInput, { className: "query-builder__projection__options__sort__dropdown", options: projectionOptions, disabled: projectionOptions.length <= 1, onChange: onChange, value: value, darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled }), _jsx("button", { className: "btn--dark btn--sm query-builder__projection__options__sort__type-btn", tabIndex: -1, onClick: toggleSortType, children: sortType === COLUMN_SORT_TYPE.ASC ? (_jsx(SortDownIcon, {})) : (_jsx(SortDownAltIcon, {})) }), _jsx("button", { className: "query-builder__projection__options__sort__remove-btn btn--dark btn--caution", onClick: deleteColumnSort, tabIndex: -1, title: 'Remove', children: _jsx(TimesIcon, {}) })] }));
 });
 const ColumnsSortEditor = observer((props) => {
     const { queryBuilderState } = props;
-    const resultModifier = queryBuilderState.resultSetModifierState;
+    const resultModifier = queryBuilderState.fetchStructureState.projectionState
+        .resultSetModifierState;
     const sortColumns = resultModifier.sortColumns;
     const projectionState = queryBuilderState.fetchStructureState.projectionState;
     const projectionOptions = projectionState.columns
@@ -60,7 +64,7 @@ const ColumnsSortEditor = observer((props) => {
     }));
     const addValue = () => {
         if (projectionOptions.length > 0) {
-            const sortColumn = new SortColumnState(queryBuilderState, guaranteeNonNullable(projectionOptions[0]).value);
+            const sortColumn = new SortColumnState(guaranteeNonNullable(projectionOptions[0]).value);
             resultModifier.addSortColumn(sortColumn);
         }
     };
@@ -68,7 +72,8 @@ const ColumnsSortEditor = observer((props) => {
 });
 export const QueryResultModifierModal = observer((props) => {
     const { queryBuilderState } = props;
-    const resultModifier = queryBuilderState.resultSetModifierState;
+    const resultModifier = queryBuilderState.fetchStructureState.projectionState
+        .resultSetModifierState;
     const limitResults = resultModifier.limit;
     const distinct = resultModifier.distinct;
     const close = () => resultModifier.setShowModal(false);

package/lib/components/fetch-structure/QueryBuilderResultModifierPanel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderResultModifierPanel.js","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,IAAI,EACJ,MAAM,EACN,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,eAAe,EACf,UAAU,EACV,SAAS,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,gBAAgB,EAChB,eAAe,GAChB,MAAM,wEAAwE,CAAC;AAGhF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,gBAAgB,GAAG,QAAQ,CAC/B,CAAC,KAGA,EAAE,EAAE;IACH,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAChD,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,eAAe,GACnB,iBAAiB,CAAC,mBAAmB,CAAC,eAAe,CAAC;IACxD,MAAM,WAAW,GACf,iBAAiB,CAAC,mBAAmB,CAAC,eAAe;SAClD,sBAAsB,CAAC,WAAW,CAAC;IACxC,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO;SAC9C,MAAM,CACL,CAAC,aAAa,EAAE,EAAE,CAChB,aAAa,KAAK,UAAU,CAAC,WAAW;QACxC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CACxE;SACA,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,aAAa,CAAC,UAAU;QAC/B,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC,CAAC;IACN,MAAM,KAAK,GAAG;QACZ,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,UAAU;QACxC,KAAK,EAAE,UAAU;KAClB,CAAC;IACF,MAAM,QAAQ,GAAG,CACf,GAAuE,EACjE,EAAE;QACR,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACtC;IACH,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;IACrC,MAAM,cAAc,GAAG,GAAS,EAAE;QAChC,UAAU,CAAC,WAAW,CACpB,QAAQ,KAAK,gBAAgB,CAAC,GAAG;YAC/B,CAAC,CAAC,gBAAgB,CAAC,IAAI;YACvB,CAAC,CAAC,gBAAgB,CAAC,GAAG,CACzB,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,GAAS,EAAE,CAClC,iBAAiB,CAAC,mBAAmB,CAAC,eAAe,CAAC,sBAAsB,CAAC,gBAAgB,CAC3F,UAAU,CACX,CAAC;IAEJ,OAAO,CACL,eAAK,SAAS,EAAC,oFAAoF,aACjG,KAAC,mBAAmB,IAClB,SAAS,EAAC,oDAAoD,EAC9D,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,iBAAiB,CAAC,MAAM,IAAI,CAAC,EACvC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,gBAAgB,CAAC,8BAA8B,GAC1D,EACF,iBACE,SAAS,EAAC,sEAAsE,EAChF,QAAQ,EAAE,CAAC,CAAC,EACZ,OAAO,EAAE,cAAc,YAEtB,QAAQ,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CACnC,KAAC,YAAY,KAAG,CACjB,CAAC,CAAC,CAAC,CACF,KAAC,eAAe,KAAG,CACpB,GACM,EACT,iBACE,SAAS,EAAC,6EAA6E,EACvF,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAE,QAAQ,YAEf,KAAC,SAAS,KAAG,GACN,IACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,iBAAiB,GAAG,QAAQ,CAChC,CAAC,KAA+C,EAAE,EAAE;IAClD,MAAM,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC;IACpC,MAAM,cAAc,GAClB,iBAAiB,CAAC,mBAAmB,CAAC,eAAe;SAClD,sBAAsB,CAAC;IAC5B,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;IAC/C,MAAM,eAAe,GACnB,iBAAiB,CAAC,mBAAmB,CAAC,eAAe,CAAC;IACxD,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO;SAC9C,MAAM,CACL,CAAC,aAAa,EAAE,EAAE,CAChB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CACxE;SACA,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,aAAa,CAAC,UAAU;QAC/B,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC,CAAC;IACN,MAAM,QAAQ,GAAG,GAAS,EAAE;QAC1B,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,UAAU,GAAG,IAAI,eAAe,CACpC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CACjD,CAAC;YACF,cAAc,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC;IACF,OAAO,CACL,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,+BAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,mGAGxD,EACN,eAAK,SAAS,EAAC,qCAAqC,aAClD,cAAK,SAAS,EAAC,4CAA4C,YAExD,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAC1B,KAAC,gBAAgB,IAEf,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,KAAK,IAFZ,KAAK,CAAC,WAAW,CAAC,IAAI,CAG3B,CACH,CAAC,GACE,EACN,cAAK,SAAS,EAAC,oDAAoD,YACjE,iBACE,SAAS,EAAC,sEAAsE,EAChF,QAAQ,EAAE,CAAC,iBAAiB,CAAC,MAAM,EACnC,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,CAAC,CAAC,0BAGL,GACL,IACF,IACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,QAAQ,CAC9C,CAAC,KAA+C,EAAE,EAAE;IAClD,MAAM,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC;IACpC,MAAM,cAAc,GAClB,iBAAiB,CAAC,mBAAmB,CAAC,eAAe;SAClD,sBAAsB,CAAC;IAC5B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC;IAC1C,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;IACzC,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,GAAS,EAAE,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IACnE,MAAM,WAAW,GAA+C,CAAC,KAAK,EAAE,EAAE;QACxE,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,cAAc,CAAC,QAAQ,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;IACF,OAAO,CACL,KAAC,MAAM,IACL,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,EACvC,OAAO,EAAE,KAAK,EACd,OAAO,EAAE;YACP,IAAI,EAAE,8BAA8B;YACpC,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,uBAAuB;SAC/B,YAED,eAAK,SAAS,EAAC,gCAAgC,aAC7C,cAAK,SAAS,EAAC,eAAe,YAC5B,cAAK,SAAS,EAAC,cAAc,oCAA0B,GACnD,EACN,cAAK,SAAS,EAAC,oDAAoD,YACjE,eAAK,SAAS,EAAC,oCAAoC,aACjD,KAAC,iBAAiB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,EAC3D,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,yCAEvD,EACN,eACE,SAAS,EAAC,wCAAwC,EAClD,OAAO,EAAE,cAAc,aAEvB,iBACE,SAAS,EAAE,IAAI,CACb,6CAA6C,EAC7C;oDACE,sDAAsD,EACpD,QAAQ;iDACX,CACF,EACD,QAAQ,EAAE,CAAC,CAAC,YAEX,QAAQ,CAAC,CAAC,CAAC,KAAC,eAAe,KAAG,CAAC,CAAC,CAAC,KAAC,UAAU,KAAG,GACzC,EACT,cAAK,SAAS,EAAC,gDAAgD,uDAEzD,IACF,IACF,EACN,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,8BAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,iFAGxD,EACN,gBACE,SAAS,EAAC,kFAAkF,EAC5F,UAAU,EAAE,KAAK,EACjB,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,YAAY,IAAI,EAAE,EACzB,QAAQ,EAAE,WAAW,GACrB,IACE,IACF,GACF,EACN,cAAK,SAAS,EAAC,eAAe,YAC5B,iBAAQ,SAAS,EAAC,8BAA8B,EAAC,OAAO,EAAE,KAAK,sBAEtD,GACL,IACF,GACC,CACV,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/components/{QueryBuilderFilterPanel.d.ts → filter/QueryBuilderFilterPanel.d.ts}

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /// <reference types="react" resolution-mode="require"/>
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 export declare const QueryBuilderFilterPanel: ((props: {
     queryBuilderState: QueryBuilderState;
 }) => JSX.Element) & {

package/lib/components/filter/QueryBuilderFilterPanel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterPanel.d.ts","sourceRoot":"","sources":["../../../src/components/filter/QueryBuilderFilterPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAiDH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAilB3E,eAAO,MAAM,uBAAuB,WAC1B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CAwOjD,CAAC"}

package/lib/components/{QueryBuilderFilterPanel.js → filter/QueryBuilderFilterPanel.js}

@@ -14,56 +14,35 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useEffect, useRef, useState, useCallback, forwardRef, useMemo, } from 'react';
+import { useRef, useState, useCallback, forwardRef, useMemo } from 'react';
 import { observer } from 'mobx-react-lite';
-import { clsx, ClickAwayListener, ContextMenu, DropdownMenu, MenuContent, MenuContentItem, BlankPanelPlaceholder, FilledTriangleIcon, CompressIcon, ExpandIcon, BrushIcon, NewFolderIcon, CircleIcon, CaretDownIcon, PlusIcon, ChevronDownIcon, ChevronRightIcon, PlusCircleIcon, TimesIcon, } from '@finos/legend-art';
-import { QUERY_BUILDER_FILTER_DND_TYPE, FilterConditionState, QueryBuilderFilterTreeConditionNodeData, QueryBuilderFilterTreeBlankConditionNodeData, QueryBuilderFilterTreeGroupNodeData, } from '../stores/QueryBuilderFilterState.js';
-import { useDragLayer, useDrag, useDrop, } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
-import { buildPropertyExpressionFromExplorerTreeNodeData, QUERY_BUILDER_EXPLORER_TREE_DND_TYPE, } from '../stores/QueryBuilderExplorerState.js';
-import { QueryBuilderPropertyExpressionBadge } from './QueryBuilderPropertyExpressionEditor.js';
+import { clsx, ClickAwayListener, ContextMenu, DropdownMenu, MenuContent, MenuContentItem, BlankPanelPlaceholder, FilledTriangleIcon, CompressIcon, ExpandIcon, BrushIcon, NewFolderIcon, CircleIcon, CaretDownIcon, PlusIcon, ChevronDownIcon, ChevronRightIcon, PlusCircleIcon, TimesIcon, PanelDropZone, DragPreviewLayer, PanelEntryDropZonePlaceholder, useDragPreviewLayer, } from '@finos/legend-art';
+import { QUERY_BUILDER_FILTER_DND_TYPE, FilterConditionState, QueryBuilderFilterTreeConditionNodeData, QueryBuilderFilterTreeBlankConditionNodeData, QueryBuilderFilterTreeGroupNodeData, } from '../../stores/filter/QueryBuilderFilterState.js';
+import { useDrag, useDrop } from 'react-dnd';
+import { buildPropertyExpressionFromExplorerTreeNodeData, QUERY_BUILDER_EXPLORER_TREE_DND_TYPE, } from '../../stores/explorer/QueryBuilderExplorerState.js';
+import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
 import { assertErrorThrown, debounce, UnsupportedOperationError, } from '@finos/legend-shared';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { useApplicationStore, BasicValueSpecificationEditor, } from '@finos/legend-application';
-import { QUERY_BUILDER_PARAMETER_TREE_DND_TYPE, } from '../stores/QueryParametersState.js';
-import { isTypeCompatibleWithConditionValueType, QUERY_BUILDER_GROUP_OPERATION, } from '../stores/QueryBuilderOperatorsHelper.js';
-import { QueryBuilderSimpleProjectionColumnState, QUERY_BUILDER_PROJECTION_DND_TYPE, } from '../stores/QueryBuilderProjectionState.js';
-const FilterConditionDragLayer = () => {
-    const { itemType, item, isDragging, currentPosition } = useDragLayer((monitor) => ({
-        itemType: monitor.getItemType(),
-        item: monitor.getItem(),
-        isDragging: monitor.isDragging(),
-        initialOffset: monitor.getInitialSourceClientOffset(),
-        currentPosition: monitor.getClientOffset(),
-    }));
-    if (!isDragging ||
-        !item ||
-        !Object.values(QUERY_BUILDER_FILTER_DND_TYPE).includes(itemType)) {
-        return null;
-    }
-    return (_jsx("div", { className: "query-builder-filter-tree__drag-preview-layer", children: _jsx("div", { className: "query-builder-filter-tree__drag-preview", 
-            // added some offset so the mouse doesn't overlap the label too much
-            style: !currentPosition
-                ? { display: 'none' }
-                : {
-                    transform: `translate(${currentPosition.x + 20}px, ${currentPosition.y + 10}px)`,
-                }, children: item.node.dragLayerLabel }) }));
-};
+import { QUERY_BUILDER_PARAMETER_DND_TYPE, } from '../../stores/QueryParametersState.js';
+import { QueryBuilderSimpleProjectionColumnState, QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE, } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
+import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 const QueryBuilderFilterGroupConditionEditor = observer((props) => {
-    const { node, isPropertyDragOver } = props;
+    const { node, isDragOver } = props;
     const switchOperation = (event) => {
         event.stopPropagation(); // prevent triggering selecting the node
         node.setGroupOperation(node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.AND
             ? QUERY_BUILDER_GROUP_OPERATION.OR
             : QUERY_BUILDER_GROUP_OPERATION.AND);
     };
-    return (_jsxs("div", { className: "query-builder-filter-tree__node__label__content dnd__overlay__container", children: [isPropertyDragOver && (_jsx("div", { className: "query-builder-filter-tree__node__dnd__overlay", children: "Add to Logical Group" })), _jsxs("div", { className: clsx('query-builder-filter-tree__group-node', {
+    return (_jsx("div", { className: "query-builder-filter-tree__node__label__content", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isDragOver, label: "Add to Logical Group", className: "query-builder__dnd__placeholder", children: _jsxs("div", { className: clsx('query-builder-filter-tree__group-node', {
                     'query-builder-filter-tree__group-node--and': node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.AND,
                     'query-builder-filter-tree__group-node--or': node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.OR,
-                }), title: "Switch Operation", onClick: switchOperation, children: [_jsx("div", { className: "query-builder-filter-tree__group-node__label", children: node.groupOperation }), _jsx("button", { className: "query-builder-filter-tree__group-node__action", children: _jsx(FilledTriangleIcon, {}) })] })] }));
+                }), title: "Switch Operation", onClick: switchOperation, children: [_jsx("div", { className: "query-builder-filter-tree__group-node__label", children: node.groupOperation }), _jsx("button", { className: "query-builder-filter-tree__group-node__action", children: _jsx(FilledTriangleIcon, {}) })] }) }) }));
 });
 const QueryBuilderFilterConditionEditor = observer((props) => {
-    const { node, isPropertyDragOver } = props;
+    const { node, isDragOver } = props;
     const graph = node.condition.filterState.queryBuilderState.graphManagerState.graph;
     const applicationStore = useApplicationStore();
     const changeOperator = (val) => () => node.condition.changeOperator(val);
@@ -75,7 +54,7 @@ const QueryBuilderFilterConditionEditor = observer((props) => {
         const parameterType = item.variable.parameter.genericType?.value.rawType;
         const conditionValueType = node.condition.propertyExpressionState.propertyExpression.func
             .genericType.value.rawType;
-        if (isTypeCompatibleWithConditionValueType(parameterType, conditionValueType)) {
+        if (isTypeCompatibleForAssignment(parameterType, conditionValueType)) {
             node.condition.setValue(item.variable.parameter);
         }
         else {
@@ -83,11 +62,11 @@ const QueryBuilderFilterConditionEditor = observer((props) => {
         }
     }, [applicationStore, node.condition]);
     const [{ isFilterValueDragOver }, dropConnector] = useDrop(() => ({
-        accept: [QUERY_BUILDER_PARAMETER_TREE_DND_TYPE.VARIABLE],
+        accept: [QUERY_BUILDER_PARAMETER_DND_TYPE],
         drop: (item, monitor) => {
             if (!monitor.didDrop()) {
                 handleDrop(item);
-            }
+            } // prevent drop event propagation to accomondate for nested DnD
         },
         collect: (monitor) => ({
             isFilterValueDragOver: monitor.isOver({ shallow: true }),
@@ -109,18 +88,18 @@ const QueryBuilderFilterConditionEditor = observer((props) => {
         reloadValues: debouncedTypeaheadSearch,
         cleanUpReloadValues,
     };
-    return (_jsxs("div", { className: "query-builder-filter-tree__node__label__content dnd__overlay__container", children: [isPropertyDragOver && (_jsx("div", { className: "query-builder-filter-tree__node__dnd__overlay", children: "Add New Logical Group" })), _jsxs("div", { className: "query-builder-filter-tree__condition-node", children: [_jsx("div", { className: "query-builder-filter-tree__condition-node__property", children: _jsx(QueryBuilderPropertyExpressionBadge, { propertyExpressionState: node.condition.propertyExpressionState, onPropertyExpressionChange: changeProperty }) }), _jsxs(DropdownMenu, { className: "query-builder-filter-tree__condition-node__operator", content: _jsx(MenuContent, { children: node.condition.operators.map((op) => (_jsx(MenuContentItem, { className: "query-builder-filter-tree__condition-node__operator__dropdown__option", onClick: changeOperator(op), children: op.getLabel(node.condition) }, op.uuid))) }), menuProps: {
+    return (_jsx("div", { className: "query-builder-filter-tree__node__label__content", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isDragOver, label: "Add New Logical Group", className: "query-builder__dnd__placeholder", children: _jsxs("div", { className: "query-builder-filter-tree__condition-node", children: [_jsx("div", { className: "query-builder-filter-tree__condition-node__property", children: _jsx(QueryBuilderPropertyExpressionBadge, { propertyExpressionState: node.condition.propertyExpressionState, onPropertyExpressionChange: changeProperty }) }), _jsxs(DropdownMenu, { className: "query-builder-filter-tree__condition-node__operator", content: _jsx(MenuContent, { children: node.condition.operators.map((op) => (_jsx(MenuContentItem, { className: "query-builder-filter-tree__condition-node__operator__dropdown__option", onClick: changeOperator(op), children: op.getLabel(node.condition) }, op.uuid))) }), menuProps: {
                             anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
                             transformOrigin: { vertical: 'top', horizontal: 'left' },
                             elevation: 7,
-                        }, children: [_jsx("div", { className: "query-builder-filter-tree__condition-node__operator__label", children: node.condition.operator.getLabel(node.condition) }), _jsx("button", { className: "query-builder-filter-tree__condition-node__operator__dropdown__trigger", tabIndex: -1, title: "Choose Operator...", children: _jsx(CaretDownIcon, {}) })] }), node.condition.value && (_jsxs("div", { ref: dropConnector, className: "query-builder-filter-tree__condition-node__value dnd__overlay__container", children: [isFilterValueDragOver && (_jsx("div", { className: "query-builder-filter-tree__node__dnd__overlay", children: "Change Filter Value" })), _jsx(BasicValueSpecificationEditor, { valueSpecification: node.condition.value, setValueSpecification: changeValueSpecification, graph: graph, typeCheckOption: {
-                                    expectedType: node.condition.propertyExpressionState.propertyExpression
-                                        .func.genericType.value.rawType,
-                                }, resetValue: resetNode, selectorConfig: selectorConfig })] }))] })] }));
+                        }, children: [_jsx("div", { className: "query-builder-filter-tree__condition-node__operator__label", children: node.condition.operator.getLabel(node.condition) }), _jsx("button", { className: "query-builder-filter-tree__condition-node__operator__dropdown__trigger", tabIndex: -1, title: "Choose Operator...", children: _jsx(CaretDownIcon, {}) })] }), node.condition.value && (_jsx("div", { ref: dropConnector, className: "query-builder-filter-tree__condition-node__value", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isFilterValueDragOver, label: "Change Filter Value", className: "query-builder__dnd__placeholder", children: _jsx(BasicValueSpecificationEditor, { valueSpecification: node.condition.value, setValueSpecification: changeValueSpecification, graph: graph, typeCheckOption: {
+                                    expectedType: node.condition.propertyExpressionState
+                                        .propertyExpression.func.genericType.value.rawType,
+                                }, resetValue: resetNode, selectorConfig: selectorConfig }) }) }))] }) }) }));
 });
 const QueryBuilderFilterBlankConditionEditor = observer((props) => {
-    const { isPropertyDragOver } = props;
-    return (_jsxs("div", { className: "query-builder-filter-tree__node__label__content dnd__overlay__container", children: [isPropertyDragOver && (_jsx("div", { className: "query-builder-filter-tree__node__dnd__overlay", children: "Create Condition" })), _jsx("div", { className: "query-builder-filter-tree__blank-node", children: "blank" })] }));
+    const { isDragOver } = props;
+    return (_jsx("div", { className: "query-builder-filter-tree__node__label__content", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isDragOver, label: "Create Condition", className: "query-builder__dnd__placeholder", children: _jsx("div", { className: "query-builder-filter-tree__blank-node", children: "blank" }) }) }));
 });
 const QueryBuilderFilterConditionContextMenu = observer(forwardRef(function QueryBuilderFilterConditionContextMenu(props, ref) {
     const { queryBuilderState, node } = props;
@@ -180,7 +159,7 @@ const QueryBuilderFilterTreeNodeContainer = observer((props) => {
             }
         }
     }, [applicationStore, filterState, node]);
-    const [{ isPropertyDragOver }, dropConnector] = useDrop(() => ({
+    const [{ isDragOver }, dropConnector] = useDrop(() => ({
         accept: [
             ...Object.values(QUERY_BUILDER_FILTER_DND_TYPE),
             QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
@@ -191,13 +170,8 @@ const QueryBuilderFilterTreeNodeContainer = observer((props) => {
                 handleDrop(item, monitor.getItemType());
             } // prevent drop event propagation to accomondate for nested DnD
         },
-        // canDrop: (item: QueryBuilderFilterConditionDragSource, monitor: DropTargetMonitor): boolean => {
-        //   // prevent drop inside of children
-        //   // prevent dropping inside my direct ancestor
-        //   return true;
-        // },
         collect: (monitor) => ({
-            isPropertyDragOver: monitor.isOver({ shallow: true }),
+            isDragOver: monitor.isOver({ shallow: true }),
         }),
     }), [handleDrop]);
     const [, dragConnector, dragPreviewConnector] = useDrag(() => ({
@@ -210,10 +184,7 @@ const QueryBuilderFilterTreeNodeContainer = observer((props) => {
         end: () => filterState.setRearrangingConditions(false),
     }), [node, filterState]);
     dragConnector(dropConnector(ref));
-    // hide default HTML5 preview image
-    useEffect(() => {
-        dragPreviewConnector(getEmptyImage(), { captureDraggingState: true });
-    }, [dragPreviewConnector]);
+    useDragPreviewLayer(dragPreviewConnector);
     // context menu
     const onContextMenuOpen = () => setIsSelectedFromContextMenu(true);
     const onContextMenuClose = () => setIsSelectedFromContextMenu(false);
@@ -226,7 +197,7 @@ const QueryBuilderFilterTreeNodeContainer = observer((props) => {
                         display: 'flex',
                     }, onClick: selectNode, children: [isExpandable && (_jsx("div", { className: "query-builder-filter-tree__expand-icon", onClick: toggleExpandNode, children: node.isOpen ? _jsx(ChevronDownIcon, {}) : _jsx(ChevronRightIcon, {}) })), _jsxs("div", { className: clsx('tree-view__node__label query-builder-filter-tree__node__label', {
                                 'query-builder-filter-tree__node__label--expandable': isExpandable,
-                            }), children: [node instanceof QueryBuilderFilterTreeGroupNodeData && (_jsx(QueryBuilderFilterGroupConditionEditor, { node: node, isPropertyDragOver: isPropertyDragOver })), node instanceof QueryBuilderFilterTreeConditionNodeData && (_jsx(QueryBuilderFilterConditionEditor, { node: node, isPropertyDragOver: isPropertyDragOver })), node instanceof QueryBuilderFilterTreeBlankConditionNodeData && (_jsx(QueryBuilderFilterBlankConditionEditor, { node: node, isPropertyDragOver: isPropertyDragOver }))] })] }), _jsx("div", { className: "query-builder-filter-tree__node__actions", children: _jsx("button", { className: "query-builder-filter-tree__node__action", tabIndex: -1, title: "Remove", onClick: removeNode, children: _jsx(TimesIcon, {}) }) })] }) }));
+                            }), children: [node instanceof QueryBuilderFilterTreeGroupNodeData && (_jsx(QueryBuilderFilterGroupConditionEditor, { node: node, isDragOver: isDragOver })), node instanceof QueryBuilderFilterTreeConditionNodeData && (_jsx(QueryBuilderFilterConditionEditor, { node: node, isDragOver: isDragOver })), node instanceof QueryBuilderFilterTreeBlankConditionNodeData && (_jsx(QueryBuilderFilterBlankConditionEditor, { node: node, isDragOver: isDragOver }))] })] }), _jsx("div", { className: "query-builder-filter-tree__node__actions", children: _jsx("button", { className: "query-builder-filter-tree__node__action", tabIndex: -1, title: "Remove", onClick: removeNode, children: _jsx(TimesIcon, {}) }) })] }) }));
 });
 const QueryBuilderFilterTreeNodeView = observer((props) => {
     const { node, level, onNodeSelect, getChildNodes, stepPaddingInRem, innerProps, } = props;
@@ -293,7 +264,7 @@ export const QueryBuilderFilterPanel = observer((props) => {
         let filterConditionState;
         try {
             let propertyExpression;
-            if (type === QUERY_BUILDER_PROJECTION_DND_TYPE.PROJECTION_COLUMN) {
+            if (type === QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE) {
                 if (item
                     .columnState instanceof QueryBuilderSimpleProjectionColumnState) {
                     propertyExpression = item
@@ -319,12 +290,12 @@ export const QueryBuilderFilterPanel = observer((props) => {
         filterState.setSelectedNode(undefined);
         filterState.addNodeFromNode(new QueryBuilderFilterTreeConditionNodeData(undefined, filterConditionState), undefined);
     }, [applicationStore, filterState]);
-    const [{ isPropertyDragOver }, dropConnector] = useDrop(() => ({
-        accept: filterState.allowDnDProjectionToFilter
+    const [{ isDragOver }, dropTargetConnector] = useDrop(() => ({
+        accept: queryBuilderState.mode.isDnDFetchStructureToFilterSupported
             ? [
                 QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
                 QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-                QUERY_BUILDER_PROJECTION_DND_TYPE.PROJECTION_COLUMN,
+                QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
             ]
             : [
                 QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
@@ -336,10 +307,10 @@ export const QueryBuilderFilterPanel = observer((props) => {
             } // prevent drop event propagation to accomondate for nested DnD
         },
         collect: (monitor) => ({
-            isPropertyDragOver: monitor.isOver({ shallow: true }),
+            isDragOver: monitor.isOver({ shallow: true }),
         }),
     }), [handleDrop]);
     return (_jsxs("div", { "data-testid": QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER, className: "panel query-builder__filter", children: [_jsxs("div", { className: "panel__header", children: [_jsx("div", { className: "panel__header__title", children: _jsx("div", { className: "panel__header__title__label", children: "filter" }) }), _jsxs("div", { className: "panel__header__actions", children: [_jsx("button", { className: "panel__header__action", onClick: createCondition, tabIndex: -1, title: "Create Condition", children: _jsx(PlusIcon, {}) }), _jsx("button", { className: "panel__header__action", disabled: !(filterState.selectedNode instanceof
-                                    QueryBuilderFilterTreeConditionNodeData), onClick: newGroupWithCondition, tabIndex: -1, title: "Create Group From Condition", children: _jsx(PlusCircleIcon, {}) }), _jsx("button", { className: "panel__header__action", disabled: !allowGroupCreation, onClick: createGroupCondition, tabIndex: -1, title: "Create Logical Group", children: _jsx(NewFolderIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: pruneTree, tabIndex: -1, title: "Cleanup Tree", children: _jsx(BrushIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: simplifyTree, tabIndex: -1, title: "Simplify Tree", children: _jsx(CircleIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: collapseTree, tabIndex: -1, title: "Collapse Tree", children: _jsx(CompressIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: expandTree, tabIndex: -1, title: "Expand Tree", children: _jsx(ExpandIcon, {}) })] })] }), _jsxs("div", { className: "panel__content query-builder__filter__content dnd__overlay__container", ref: dropConnector, children: [_jsx("div", { className: clsx({ dnd__overlay: isPropertyDragOver }) }), filterState.isEmpty && (_jsx(BlankPanelPlaceholder, { placeholderText: "Add a filter condition", tooltipText: "Drag and drop properties here" })), !filterState.isEmpty && (_jsxs(_Fragment, { children: [_jsx(FilterConditionDragLayer, {}), _jsx(QueryBuilderFilterTree, { queryBuilderState: queryBuilderState })] }))] })] }));
+                                    QueryBuilderFilterTreeConditionNodeData), onClick: newGroupWithCondition, tabIndex: -1, title: "Create Group From Condition", children: _jsx(PlusCircleIcon, {}) }), _jsx("button", { className: "panel__header__action", disabled: !allowGroupCreation, onClick: createGroupCondition, tabIndex: -1, title: "Create Logical Group", children: _jsx(NewFolderIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: pruneTree, tabIndex: -1, title: "Cleanup Tree", children: _jsx(BrushIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: simplifyTree, tabIndex: -1, title: "Simplify Tree", children: _jsx(CircleIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: collapseTree, tabIndex: -1, title: "Collapse Tree", children: _jsx(CompressIcon, {}) }), _jsx("button", { className: "panel__header__action", onClick: expandTree, tabIndex: -1, title: "Expand Tree", children: _jsx(ExpandIcon, {}) })] })] }), _jsx("div", { className: "panel__content query-builder__filter__content", children: _jsxs(PanelDropZone, { isDragOver: isDragOver, dropTargetConnector: dropTargetConnector, children: [filterState.isEmpty && (_jsx(BlankPanelPlaceholder, { text: "Add a filter condition", tooltipText: "Drag and drop properties here" })), !filterState.isEmpty && (_jsxs(_Fragment, { children: [_jsx(DragPreviewLayer, { labelGetter: (item) => item.node.dragPreviewLabel, types: Object.values(QUERY_BUILDER_FILTER_DND_TYPE) }), _jsx(QueryBuilderFilterTree, { queryBuilderState: queryBuilderState })] }))] }) })] }));
 });
 //# sourceMappingURL=QueryBuilderFilterPanel.js.map