@finos/legend-query-builder 0.2.3 → 0.3.0

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderGraphFetchTreePanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderGraphFetchTreePanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAoBH,OAAO,EACL,KAAK,8BAA8B,EAIpC,MAAM,4EAA4E,CAAC;AAKpF,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6EAA6E,CAAC;AA4FnI,eAAO,MAAM,kCAAkC;qBAE1B,+BAA+B;cACtC,8BAA8B;2BACjB,8BAA8B,KAAK,IAAI;gBAClD,OAAO;;;CAkEtB,CAAC;AAEF,eAAO,MAAM,+BAA+B,WAClC;IAAE,mBAAmB,EAAE,+BAA+B,CAAA;CAAE;;CAiEjE,CAAC"}
+{"version":3,"file":"QueryBuilderGraphFetchTreePanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderGraphFetchTreePanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAoBH,OAAO,EACL,KAAK,8BAA8B,EAIpC,MAAM,4EAA4E,CAAC;AAKpF,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6EAA6E,CAAC;AA4FnI,eAAO,MAAM,kCAAkC;qBAE1B,+BAA+B;cACtC,8BAA8B;2BACjB,8BAA8B,KAAK,IAAI;gBAClD,OAAO;;;CAkEtB,CAAC;AAEF,eAAO,MAAM,+BAA+B,WAClC;IAAE,mBAAmB,EAAE,+BAA+B,CAAA;CAAE;;CAiEjE,CAAC"}

package/lib/components/fetch-structure/QueryBuilderOlapGroupByPanel.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { type QueryBuilderOlapGroupByState } from '../../stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByState.js';
+export declare const QueryBuilderOlapGroupByPanel: ((props: {
+    olapGroupByState: QueryBuilderOlapGroupByState;
+}) => JSX.Element) & {
+    displayName: string;
+};
+//# sourceMappingURL=QueryBuilderOlapGroupByPanel.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderOlapGroupByPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderOlapGroupByPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAgCH,OAAO,EACL,KAAK,4BAA4B,EAOlC,MAAM,8EAA8E,CAAC;AA48BtF,eAAO,MAAM,4BAA4B,WAC/B;IAAE,gBAAgB,EAAE,4BAA4B,CAAA;CAAE;;CAgH3D,CAAC"}

package/lib/components/fetch-structure/QueryBuilderOlapGroupByPanel.js

@@ -0,0 +1,363 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { useApplicationStore } from '@finos/legend-application';
+import { PlusIcon, PanelContent, PanelDropZone, BlankPanelPlaceholder, DropdownMenu, InputWithInlineValidation, MenuContent, MenuContentItem, SigmaIcon, CaretDownIcon, clsx, PanelEntryDropZonePlaceholder, ContextMenu, VerticalDragHandleIcon, TimesIcon, useDragPreviewLayer, SortIcon, Dialog, CustomSelectorInput, WindowIcon, BasePopover, EditIcon, } from '@finos/legend-art';
+import { assertErrorThrown, guaranteeNonNullable } from '@finos/legend-shared';
+import { observer } from 'mobx-react-lite';
+import { forwardRef, useCallback, useRef, useState } from 'react';
+import { useDrag, useDrop } from 'react-dnd';
+import { QueryBuilderOlapGroupByColumnState, QueryBuilderTDSOlapRankOperatorState, QueryBuilderTDSOlapAggreationOperatorState, QUERY_BUILDER_OLAP_COLUMN_DND_TYPE, } from '../../stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByState.js';
+import { QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
+import { COLUMN_SORT_TYPE } from '../../stores/fetch-structure/tds/QueryResultSetModifierState.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
+// helpers
+const createOlapColumnState = (columnState, tdsState) => {
+    const operator = tdsState.olapGroupByState.operators.filter((o) => o.isColumnAggregator() &&
+        o.isCompatibleWithType(columnState.getColumnType()))[0];
+    const nonColoperator = guaranteeNonNullable(tdsState.olapGroupByState.operators.filter((o) => !o.isColumnAggregator())[0]);
+    if (operator) {
+        const opState = new QueryBuilderTDSOlapAggreationOperatorState(tdsState.olapGroupByState, operator, columnState);
+        return new QueryBuilderOlapGroupByColumnState(tdsState.olapGroupByState, [], undefined, opState, `${operator.getLabel()} ${columnState.columnName}`);
+    }
+    else {
+        return new QueryBuilderOlapGroupByColumnState(tdsState.olapGroupByState, [columnState], undefined, new QueryBuilderTDSOlapRankOperatorState(tdsState.olapGroupByState, nonColoperator), `${nonColoperator.getLabel()} ${columnState.columnName}`);
+    }
+};
+const QueryBuilderOlapGroupByColumnContextMenu = observer(forwardRef(function QueryBuilderOlapGroupByColumnContextMenu(props, ref) {
+    const { columnState } = props;
+    const editColumn = () => columnState.olapState.setEditColumn(columnState);
+    const removeColumn = () => columnState.olapState.removeColumn(columnState);
+    return (_jsxs(MenuContent, { ref: ref, children: [_jsx(MenuContentItem, { onClick: editColumn, children: "Open Editor" }), _jsx(MenuContentItem, { onClick: removeColumn, children: "Remove" })] }));
+}));
+const TDSColumnSelectorEditor = observer((props) => {
+    const { tdsColOptions, colValue, setColumn, deleteColumn } = props;
+    const applicationStore = useApplicationStore();
+    const options = tdsColOptions.map((col) => ({
+        label: col.columnName,
+        value: col,
+    }));
+    const value = {
+        label: colValue.columnName,
+        value: colValue,
+    };
+    const onChange = (val) => {
+        if (val !== null) {
+            setColumn(val.value);
+        }
+    };
+    const removeColumn = () => deleteColumn(colValue);
+    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: options, disabled: options.length < 1, onChange: onChange, value: value, darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled }), _jsx("button", { className: "query-builder__olap__tds__column__remove-btn btn--dark btn--caution", onClick: removeColumn, tabIndex: -1, title: "Remove", children: _jsx(TimesIcon, {}) })] }));
+});
+const QueryBuilderOlapColumnModalEditor = observer((props) => {
+    const { olapGroupByState, olapColumnState } = props;
+    const createNewOlap = !olapGroupByState.olapColumns.includes(olapColumnState);
+    const tdsState = olapGroupByState.tdsState;
+    const applicationStore = useApplicationStore();
+    const close = () => {
+        olapGroupByState.setEditColumn(undefined);
+    };
+    const isDuplicatedColumnName = createNewOlap
+        ? olapGroupByState.tdsState.tdsColumns
+            .map((c) => c.columnName)
+            .includes(olapColumnState.columnName)
+        : olapGroupByState.tdsState.isDuplicateColumn(olapColumnState);
+    const windowOptions = createNewOlap
+        ? tdsState.tdsColumns
+        : olapColumnState.possibleReferencedColumns;
+    const windowOptionsLabels = windowOptions.map((w) => ({
+        label: w.columnName,
+        value: w,
+    }));
+    // column Name
+    const changeColumnName = (event) => olapColumnState.setColumnName(event.target.value);
+    // operator
+    const operators = olapGroupByState.operators;
+    const operationState = olapColumnState.operationState;
+    const olapOpColumn = operationState instanceof QueryBuilderTDSOlapAggreationOperatorState
+        ? operationState.columnState
+        : undefined;
+    const changeOperatorCol = (val) => {
+        if (operationState instanceof QueryBuilderTDSOlapAggreationOperatorState) {
+            if (val !== null) {
+                operationState.setColumnState(val.value);
+            }
+        }
+    };
+    const changeOperator = (olapOp) => () => {
+        olapColumnState.changeOperator(olapOp);
+    };
+    // window
+    const addOptions = windowOptions.filter((e) => !olapColumnState.windowColumns.includes(e));
+    const create = () => {
+        olapGroupByState.addOlapColumn(olapColumnState);
+        close();
+    };
+    const addWindowValue = () => {
+        if (addOptions.length > 0) {
+            olapColumnState.addWindow(guaranteeNonNullable(addOptions[0]));
+        }
+    };
+    // sortby
+    const sortByState = olapColumnState.sortByState;
+    const changeSortBy = (sortOp) => () => {
+        olapColumnState.changeSortBy(sortOp);
+    };
+    const changeSortCol = (val) => {
+        if (sortByState) {
+            if (val !== null) {
+                sortByState.setColumnState(val.value);
+            }
+        }
+    };
+    return (_jsx(Dialog, { open: Boolean(olapGroupByState.editColumn), onClose: close, classes: {
+            root: 'editor-modal__root-container',
+            container: 'editor-modal__container',
+            paper: 'editor-modal__content',
+        }, children: _jsxs("div", { className: "modal modal--dark query-builder__olap__modal", children: [_jsx("div", { className: "modal__header", children: _jsx("div", { className: "modal__title", children: createNewOlap
+                            ? 'Create OLAP GroupBy Column'
+                            : 'Update OLAP GroupByColumn' }) }), _jsxs("div", { className: "query-builder__olap__modal__body", children: [_jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "OLAP Column Name" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Name of OLAP Column that will be part of TDS Result" }), _jsx(InputWithInlineValidation, { className: "query-builder__olap__column__name__input input-group__input", spellCheck: false, value: olapColumnState.columnName, onChange: changeColumnName, validationErrorMessage: isDuplicatedColumnName ? 'Duplicated column' : undefined })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "OLAP Operator" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "OLAP aggregation function to apply and column if required by function" }), _jsx("div", { className: "panel__content__form__section__list", children: _jsx("div", { className: "panel__content__form__section__list__items", children: _jsxs("div", { className: "query-builder__olap__column__operation__operator", children: [_jsx("div", { className: clsx('query-builder__olap__column__operation__operator__label', {
+                                                        'query-builder__olap__column__operation__operator__label__agg': !olapOpColumn,
+                                                    }), children: operationState.operator.getLabel() }), olapOpColumn && (_jsx("div", { className: "panel__content__form__section__list__item query-builder__olap__tds__column__options", children: _jsx(CustomSelectorInput, { className: "query-builder__olap__tds__column__dropdown", options: windowOptionsLabels, disabled: windowOptionsLabels.length < 1, onChange: changeOperatorCol, value: {
+                                                            value: olapOpColumn,
+                                                            label: olapOpColumn.columnName,
+                                                        }, darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled }) })), _jsxs(DropdownMenu, { className: "query-builder__olap__column__operation__operator__dropdown", disabled: !operators.length, content: _jsx(MenuContent, { children: operators.map((op) => (_jsx(MenuContentItem, { className: "query-builder__olap__column__operation__operator__dropdown__option", onClick: changeOperator(op), children: op.getLabel() }, op.uuid))) }), menuProps: {
+                                                        anchorOrigin: {
+                                                            vertical: 'bottom',
+                                                            horizontal: 'left',
+                                                        },
+                                                        transformOrigin: {
+                                                            vertical: 'top',
+                                                            horizontal: 'left',
+                                                        },
+                                                        elevation: 7,
+                                                    }, children: [_jsx("button", { className: "query-builder__olap__column__operation__operator__badge", tabIndex: -1, title: "Choose OLAP GroupBy Operator...", children: _jsx(SigmaIcon, {}) }), _jsx("button", { className: "query-builder__olap__column__operation__operator__dropdown__trigger", tabIndex: -1, title: "Choose OLAP GroupBy Operator...", children: _jsx(CaretDownIcon, {}) })] })] }) }) })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Window Columns" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Represents the window of columns that will partition the rows for which to apply the aggragte function" }), _jsxs("div", { className: "panel__content__form__section__list", children: [_jsx("div", { className: "panel__content__form__section__list__items", children: olapColumnState.windowColumns.map((value, idx) => (_jsx(TDSColumnSelectorEditor, { colValue: value, setColumn: (v) => olapColumnState.changeWindow(v, idx), deleteColumn: (v) => olapColumnState.deleteWindow(v), tdsColOptions: windowOptions }, value.uuid))) }), _jsx("div", { className: "panel__content__form__section__list__new-item__add", children: _jsx("button", { className: "panel__content__form__section__list__new-item__add-btn btn btn--dark", disabled: !addOptions.length, onClick: addWindowValue, tabIndex: -1, children: "Add Value" }) })] })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Sort By" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Orders by the designated column" }), _jsx("div", { className: "panel__content__form__section__header__prompt" }), _jsx("div", { className: "panel__content__form__section__list", children: _jsxs("div", { className: "query-builder__olap__column__sortby__operator", children: [sortByState && (_jsx("div", { className: "query-builder__olap__column__sortby__operator__label", children: sortByState.sortType.toLowerCase() })), sortByState && (_jsx("div", { className: "panel__content__form__section__list__item query-builder__olap__tds__column__options", children: _jsx(CustomSelectorInput, { className: "query-builder__olap__tds__column__dropdown", options: windowOptionsLabels, disabled: windowOptionsLabels.length < 1, onChange: changeSortCol, value: {
+                                                        value: sortByState.columnState,
+                                                        label: sortByState.columnState.columnName,
+                                                    }, darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled }) })), !sortByState && (_jsx("div", { className: "query-builder__olap__column__sortby__none", children: "(none)" })), _jsxs(DropdownMenu, { className: "query-builder__olap__column__sortby__operator__dropdown", content: _jsxs(MenuContent, { children: [_jsx(MenuContentItem, { className: "query-builder__olap__column__sortby__operator__dropdown__option", onClick: changeSortBy(undefined), children: "(none)" }, "none"), Object.values(COLUMN_SORT_TYPE).map((op) => (_jsx(MenuContentItem, { className: "query-builder__olap__column__sortby__operator__dropdown__option", onClick: changeSortBy(op), children: op.toLowerCase() }, op)))] }), menuProps: {
+                                                    anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
+                                                    transformOrigin: { vertical: 'top', horizontal: 'left' },
+                                                    elevation: 7,
+                                                }, children: [_jsx("button", { className: clsx('query-builder__olap__column__sortby__operator__badge', {
+                                                            'query-builder__olap__column__sortby__operator__badge--activated': Boolean(sortByState),
+                                                        }), tabIndex: -1, title: "Choose OLAP SortBy Operator...", children: _jsx(SortIcon, {}) }), _jsx("button", { className: "query-builder__olap__column__sortby__operator__dropdown__trigger", tabIndex: -1, title: "Choose OLAP SortBy Operator...", children: _jsx(CaretDownIcon, {}) })] })] }) })] })] }), _jsx("div", { className: "modal__footer", children: createNewOlap ? (_jsx("button", { className: "btn modal__footer__close-btn", onClick: create, children: "Create" })) : (_jsx("button", { className: "btn modal__footer__close-btn", onClick: close, children: "Close" })) })] }) }));
+});
+const TDSColumnReferenceEditor = observer((props) => {
+    const { handleChange, tdsColumn } = props;
+    const handleDrop = useCallback((item) => {
+        handleChange(item.columnState);
+    }, [handleChange]);
+    const [{ isDragOver }, dropOpConnector] = useDrop(() => ({
+        accept: [
+            QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+            QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
+        ],
+        drop: (item, monitor) => {
+            if (!monitor.didDrop()) {
+                handleDrop(item);
+            }
+        },
+        collect: (monitor) => ({
+            isDragOver: monitor.isOver({ shallow: true }),
+        }),
+    }), [handleDrop]);
+    return (_jsx("div", { className: "query-builder__olap__tds__column", children: _jsx("div", { ref: dropOpConnector, className: "query-builder__olap__tds__column-badge", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isDragOver, label: "Change Column", className: "query-builder__dnd__placeholder", children: _jsx("div", { className: "query-builder__olap__tds__column-badge__content", children: _jsx("div", { className: "query-builder__olap__tds__column-badge__property", title: `${tdsColumn.columnName}`, children: tdsColumn.columnName }) }) }) }) }));
+});
+const QueryBuilderOlapGroupByColumnEditor = observer((props) => {
+    const { olapColumnState } = props;
+    const olapState = olapColumnState.olapState;
+    const tdsState = olapState.tdsState;
+    const operators = olapState.operators;
+    // state
+    const ref = useRef(null);
+    const [anchorEl, setAnchorEl] = useState(null);
+    const [isSelectedFromContextMenu, setIsSelectedFromContextMenu] = useState(false);
+    const openWindowPopover = (event) => {
+        setAnchorEl(event.currentTarget);
+    };
+    const closeWindowPopover = () => {
+        setAnchorEl(null);
+    };
+    const onContextMenuOpen = () => setIsSelectedFromContextMenu(true);
+    const onContextMenuClose = () => setIsSelectedFromContextMenu(false);
+    // column Name
+    const changeColumnName = (event) => olapColumnState.setColumnName(event.target.value);
+    const isDuplicatedColumnName = tdsState.isDuplicateColumn(olapColumnState);
+    // window columns
+    const windowOptions = olapColumnState.possibleReferencedColumns;
+    const addWindowOptions = windowOptions.filter((e) => !olapColumnState.windowColumns.includes(e));
+    const addWindowValue = () => {
+        if (addWindowOptions.length > 0) {
+            olapColumnState.addWindow(guaranteeNonNullable(addWindowOptions[0]));
+        }
+    };
+    // operator
+    const operationState = olapColumnState.operationState;
+    const aggregateColumn = operationState instanceof QueryBuilderTDSOlapAggreationOperatorState
+        ? operationState.columnState
+        : undefined;
+    const changeOperator = (olapOp) => () => {
+        olapColumnState.changeOperator(olapOp);
+    };
+    // sortby
+    const sortByState = olapColumnState.sortByState;
+    const changeSortBy = (sortOp) => () => {
+        olapColumnState.changeSortBy(sortOp);
+    };
+    // action
+    const isRemovalDisabled = olapState.tdsState.isColumnInUse(olapColumnState);
+    const removeColumn = () => {
+        olapColumnState.olapState.removeColumn(olapColumnState);
+    };
+    const editoColumn = () => {
+        olapState.setEditColumn(olapColumnState);
+    };
+    // Drag and Drop
+    const handleHover = useCallback((item, monitor) => {
+        const dragIndex = tdsState.olapGroupByState.olapColumns.findIndex((e) => e === item.columnState);
+        const hoverIndex = tdsState.olapGroupByState.olapColumns.findIndex((e) => e === olapColumnState);
+        if (dragIndex === -1 || hoverIndex === -1 || dragIndex === hoverIndex) {
+            return;
+        }
+        // move the item being hovered on when the dragged item position is beyond the its middle point
+        const hoverBoundingReact = ref.current?.getBoundingClientRect();
+        const distanceThreshold = ((hoverBoundingReact?.bottom ?? 0) - (hoverBoundingReact?.top ?? 0)) /
+            2;
+        const dragDistance = (monitor.getClientOffset()?.y ?? 0) - (hoverBoundingReact?.top ?? 0);
+        if (dragIndex < hoverIndex && dragDistance < distanceThreshold) {
+            return;
+        }
+        if (dragIndex > hoverIndex && dragDistance > distanceThreshold) {
+            return;
+        }
+        olapState.moveColumn(dragIndex, hoverIndex);
+    }, [olapColumnState, olapState, tdsState.olapGroupByState.olapColumns]);
+    const [, dropConnector] = useDrop(() => ({
+        accept: [QUERY_BUILDER_OLAP_COLUMN_DND_TYPE],
+        hover: (item, monitor) => handleHover(item, monitor),
+    }), [handleHover]);
+    const [{ olapColumnBeingDragged }, dragConnector, dragPreviewConnector] = useDrag(() => ({
+        type: QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
+        item: () => ({
+            columnState: olapColumnState,
+        }),
+        collect: (monitor) => ({
+            /**
+             * @workaround typings - https://github.com/react-dnd/react-dnd/pull/3484
+             */
+            olapColumnBeingDragged: 
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+            monitor.getItem()
+                ?.columnState,
+        }),
+    }), [olapColumnState]);
+    const isBeingDragged = olapColumnState === olapColumnBeingDragged;
+    dragConnector(dropConnector(ref));
+    useDragPreviewLayer(dragPreviewConnector);
+    const handleOpDrop = (val) => {
+        if (operationState instanceof QueryBuilderTDSOlapAggreationOperatorState) {
+            operationState.setColumnState(val);
+        }
+    };
+    const handleSortDrop = (val) => {
+        if (sortByState) {
+            sortByState.setColumnState(val);
+        }
+    };
+    const handleWindowDrop = useCallback((item) => {
+        const colState = item.columnState;
+        if (olapColumnState.possibleReferencedColumns.includes(colState) &&
+            !olapColumnState.windowColumns.includes(colState)) {
+            olapColumnState.addWindow(colState);
+        }
+    }, [olapColumnState]);
+    const [{ isDragOver }, dropOpConnector] = useDrop(() => ({
+        accept: [
+            QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+            QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
+        ],
+        drop: (item, monitor) => {
+            if (!monitor.didDrop()) {
+                handleWindowDrop(item);
+            }
+        },
+        collect: (monitor) => ({
+            isDragOver: monitor.isOver({ shallow: true }),
+        }),
+    }), [handleWindowDrop]);
+    return (_jsx("div", { ref: ref, className: "query-builder__olap__column", children: _jsx(PanelEntryDropZonePlaceholder, { showPlaceholder: isBeingDragged, className: "query-builder__dnd__placeholder", children: _jsxs(ContextMenu, { content: _jsx(QueryBuilderOlapGroupByColumnContextMenu, { columnState: olapColumnState }), className: clsx('query-builder__olap__column__context-menu', {
+                    'query-builder__olap__column--selected-from-context-menu': isSelectedFromContextMenu,
+                }), menuProps: { elevation: 7 }, onOpen: onContextMenuOpen, onClose: onContextMenuClose, children: [_jsx("div", { className: "query-builder__olap__column__drag-handle__container", children: _jsx("div", { className: "query-builder__olap__column__drag-handle", children: _jsx(VerticalDragHandleIcon, {}) }) }), _jsx("div", { className: "query-builder__olap__column__operation", children: _jsxs("div", { className: "query-builder__olap__column__operation__operator", children: [_jsx("div", { className: clsx('query-builder__olap__column__operation__operator__label', {
+                                        'query-builder__olap__column__operation__operator__label__agg': !aggregateColumn,
+                                    }), children: operationState.operator.getLabel() }), aggregateColumn && (_jsx(TDSColumnReferenceEditor, { tdsColumn: aggregateColumn, handleChange: handleOpDrop })), _jsxs(DropdownMenu, { className: "query-builder__olap__column__operation__operator__dropdown", disabled: !operators.length, content: _jsx(MenuContent, { children: operators.map((op) => (_jsx(MenuContentItem, { className: "query-builder__olap__column__operation__operator__dropdown__option", onClick: changeOperator(op), children: op.getLabel() }, op.uuid))) }), menuProps: {
+                                        anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
+                                        transformOrigin: { vertical: 'top', horizontal: 'left' },
+                                        elevation: 7,
+                                    }, children: [_jsx("button", { className: "query-builder__olap__column__operation__operator__badge", tabIndex: -1, title: "Choose OLAP GroupBy Operator...", children: _jsx(SigmaIcon, {}) }), _jsx("button", { className: "query-builder__olap__column__operation__operator__dropdown__trigger", tabIndex: -1, title: "Choose OLAP GroupBy Operator...", children: _jsx(CaretDownIcon, {}) })] })] }) }), _jsxs("div", { className: "query-builder__olap__column__window", children: [_jsx("button", { ref: dropOpConnector, title: "Click to edit or drag and drop columns", onClick: openWindowPopover, className: "query-builder__olap__column__window__content", children: _jsxs(PanelEntryDropZonePlaceholder, { showPlaceholder: isDragOver, label: "Add", className: "query-builder__dnd__placeholder", children: [_jsxs("div", { title: `${olapColumnState.windowColumns.length} columns partitioned`, className: "query-builder__olap__column__window__content__label", children: ["(", olapColumnState.windowColumns.length, ")"] }), _jsx("div", { className: clsx('query-builder__olap__column__window__operator__badge'), tabIndex: -1, title: "Edit window columns...", children: _jsx(WindowIcon, {}) })] }) }), _jsx(BasePopover, { open: Boolean(anchorEl), anchorEl: anchorEl, onClose: closeWindowPopover, anchorOrigin: {
+                                    vertical: 'bottom',
+                                    horizontal: 'center',
+                                }, transformOrigin: {
+                                    vertical: 'top',
+                                    horizontal: 'center',
+                                }, children: _jsx("div", { className: "query-builder__olap__column__window__popover", children: _jsxs("div", { className: "panel__content__form__section__list", children: [_jsx("div", { className: "panel__content__form__section__list__items", children: olapColumnState.windowColumns.map((value, idx) => (_jsx(TDSColumnSelectorEditor, { colValue: value, setColumn: (v) => olapColumnState.changeWindow(v, idx), deleteColumn: (v) => olapColumnState.deleteWindow(v), tdsColOptions: windowOptions }, value.uuid))) }), _jsx("div", { className: "panel__content__form__section__list__new-item__add", children: _jsx("button", { className: "panel__content__form__section__list__new-item__add-btn btn btn--dark", disabled: !addWindowOptions.length, onClick: addWindowValue, tabIndex: -1, children: "Add Value" }) })] }) }) })] }), _jsx("div", { className: "query-builder__olap__column__sortby", children: _jsxs("div", { className: "query-builder__olap__column__sortby__operator", children: [sortByState && (_jsx("div", { className: "query-builder__olap__column__sortby__operator__label", children: sortByState.sortType.toLowerCase() })), sortByState && (_jsx(TDSColumnReferenceEditor, { tdsColumn: sortByState.columnState, handleChange: handleSortDrop })), !sortByState && (_jsx("div", { className: "query-builder__olap__column__sortby__none", children: "(none)" })), _jsxs(DropdownMenu, { className: "query-builder__olap__column__sortby__operator__dropdown", content: _jsxs(MenuContent, { children: [_jsx(MenuContentItem, { className: "query-builder__olap__column__sortby__operator__dropdown__option", onClick: changeSortBy(undefined), children: "(none)" }, "none"), Object.values(COLUMN_SORT_TYPE).map((op) => (_jsx(MenuContentItem, { className: "query-builder__olap__column__sortby__operator__dropdown__option", onClick: changeSortBy(op), children: op.toLowerCase() }, op)))] }), menuProps: {
+                                        anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
+                                        transformOrigin: { vertical: 'top', horizontal: 'left' },
+                                        elevation: 7,
+                                    }, children: [_jsx("button", { className: clsx('query-builder__olap__column__sortby__operator__badge', {
+                                                'query-builder__olap__column__sortby__operator__badge--activated': Boolean(sortByState),
+                                            }), tabIndex: -1, title: "Choose OLAP SortBy Operator...", children: _jsx(SortIcon, {}) }), _jsx("button", { className: "query-builder__olap__column__sortby__operator__dropdown__trigger", tabIndex: -1, title: "Choose OLAP SortBy Operator...", children: _jsx(CaretDownIcon, {}) })] })] }) }), _jsx("div", { className: "query-builder__olap__column__name", children: _jsx(InputWithInlineValidation, { className: "query-builder__olap__column__name__input input-group__input", spellCheck: false, value: olapColumnState.columnName, onChange: changeColumnName, validationErrorMessage: isDuplicatedColumnName ? 'Duplicated column' : undefined }) }), _jsxs("div", { className: "query-builder__olap__column__actions", children: [_jsx("button", { className: "query-builder__olap__column__action", tabIndex: -1, onClick: editoColumn, children: _jsx(EditIcon, {}) }), _jsx("button", { className: "query-builder__olap__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, {}) })] })] }) }) }));
+});
+export const QueryBuilderOlapGroupByPanel = observer((props) => {
+    const { olapGroupByState } = props;
+    const applicationStore = useApplicationStore();
+    const createOlapGroupBy = () => {
+        const col = olapGroupByState.tdsState.tdsColumns[0];
+        if (col) {
+            const newOlapState = createOlapColumnState(col, olapGroupByState.tdsState);
+            olapGroupByState.setEditColumn(newOlapState);
+        }
+    };
+    // Drag and Drop
+    const handleDrop = useCallback(async (item) => {
+        try {
+            const newOlapState = createOlapColumnState(item.columnState, olapGroupByState.tdsState);
+            olapGroupByState.addOlapColumn(newOlapState);
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            applicationStore.notifyError(error.message);
+            return;
+        }
+    }, [applicationStore, olapGroupByState]);
+    const [{ isDragOver }, dropTargetConnector] = useDrop(() => ({
+        accept: [
+            QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+            QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
+        ],
+        drop: (item, monitor) => {
+            if (!monitor.didDrop()) {
+                handleDrop(item).catch(applicationStore.alertUnhandledError);
+            } // prevent drop event propagation to accomondate for nested DnD
+        },
+        collect: (monitor) => ({
+            isDragOver: monitor.isOver({ shallow: true }),
+        }),
+    }), [applicationStore, handleDrop]);
+    return (_jsx("div", { "data-testid": QUERY_BUILDER_TEST_ID.QUERY_BUILDER_OLAP_GROUPBY, className: "panel", children: _jsxs("div", { "data-testid": QUERY_BUILDER_TEST_ID.QUERY_BUILDER_OLAP_GROUPBY, className: "panel", children: [_jsxs("div", { className: "panel__header", children: [_jsx("div", { className: "panel__header__title", children: _jsx("div", { className: "panel__header__title__label", children: "OLAP" }) }), _jsx("div", { className: "panel__header__actions", children: _jsx("button", { className: "panel__header__action", onClick: createOlapGroupBy, disabled: !olapGroupByState.tdsState.tdsColumns.length, tabIndex: -1, title: "Create OLAP GroupBy Column", children: _jsx(PlusIcon, {}) }) })] }), _jsx(PanelContent, { children: _jsxs(PanelDropZone, { isDragOver: isDragOver, dropTargetConnector: dropTargetConnector, children: [olapGroupByState.isEmpty && (_jsx(BlankPanelPlaceholder, { text: "Add OLAP GroupBy Column", tooltipText: "Drag and drop columns here" })), !olapGroupByState.isEmpty && (_jsx("div", { "data-testid": QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS, className: "query-builder__olap__columns", children: olapGroupByState.olapColumns.map((col) => (_jsx(QueryBuilderOlapGroupByColumnEditor, { olapColumnState: col }, col.uuid))) }))] }) }), olapGroupByState.editColumn && (_jsx(QueryBuilderOlapColumnModalEditor, { olapGroupByState: olapGroupByState, olapColumnState: olapGroupByState.editColumn }))] }) }));
+});
+//# sourceMappingURL=QueryBuilderOlapGroupByPanel.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderOlapGroupByPanel.js","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderOlapGroupByPanel.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,qBAAqB,EACrB,YAAY,EACZ,yBAAyB,EACzB,WAAW,EACX,eAAe,EACf,SAAS,EACT,aAAa,EACb,IAAI,EACJ,6BAA6B,EAC7B,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,mBAAmB,EACnB,QAAQ,EACR,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,WAAW,EACX,QAAQ,GACT,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAA0B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAErE,OAAO,EAIL,kCAAkC,EAClC,oCAAoC,EACpC,0CAA0C,EAC1C,kCAAkC,GACnC,MAAM,8EAA8E,CAAC;AACtF,OAAO,EAAE,wCAAwC,EAAE,MAAM,kFAAkF,CAAC;AAG5I,OAAO,EAAE,gBAAgB,EAAE,MAAM,iEAAiE,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,UAAU;AACV,MAAM,qBAAqB,GAAG,CAC5B,WAAuC,EACvC,QAA8B,EACM,EAAE;IACtC,MAAM,QAAQ,GAAG,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CACzD,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,kBAAkB,EAAE;QACtB,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,CACtD,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,cAAc,GAAG,oBAAoB,CACzC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAC/B,CAAC,CAAC,CAAC,CACL,CAAC;IACF,IAAI,QAAQ,EAAE;QACZ,MAAM,OAAO,GAAG,IAAI,0CAA0C,CAC5D,QAAQ,CAAC,gBAAgB,EACzB,QAAQ,EACR,WAAW,CACZ,CAAC;QACF,OAAO,IAAI,kCAAkC,CAC3C,QAAQ,CAAC,gBAAgB,EACzB,EAAE,EACF,SAAS,EACT,OAAO,EACP,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,WAAW,CAAC,UAAU,EAAE,CACnD,CAAC;KACH;SAAM;QACL,OAAO,IAAI,kCAAkC,CAC3C,QAAQ,CAAC,gBAAgB,EACzB,CAAC,WAAW,CAAC,EACb,SAAS,EACT,IAAI,oCAAoC,CACtC,QAAQ,CAAC,gBAAgB,EACzB,cAAc,CACf,EACD,GAAG,cAAc,CAAC,QAAQ,EAAE,IAAI,WAAW,CAAC,UAAU,EAAE,CACzD,CAAC;KACH;AACH,CAAC,CAAC;AAEF,MAAM,wCAAwC,GAAG,QAAQ,CACvD,UAAU,CAKR,SAAS,wCAAwC,CAAC,KAAK,EAAE,GAAG;IAC5D,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,UAAU,GAAG,GAAS,EAAE,CAC5B,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,GAAS,EAAE,CAC9B,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAElD,OAAO,CACL,MAAC,WAAW,IAAC,GAAG,EAAE,GAAG,aACnB,KAAC,eAAe,IAAC,OAAO,EAAE,UAAU,4BAA+B,EACnE,KAAC,eAAe,IAAC,OAAO,EAAE,YAAY,uBAA0B,IACpD,CACf,CAAC;AACJ,CAAC,CAAC,CACH,CAAC;AAEF,MAAM,uBAAuB,GAAG,QAAQ,CACtC,CAAC,KAKA,EAAE,EAAE;IACH,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACnE,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1C,KAAK,EAAE,GAAG,CAAC,UAAU;QACrB,KAAK,EAAE,GAAG;KACX,CAAC,CAAC,CAAC;IACJ,MAAM,KAAK,GAAG;QACZ,KAAK,EAAE,QAAQ,CAAC,UAAU;QAC1B,KAAK,EAAE,QAAQ;KAChB,CAAC;IACF,MAAM,QAAQ,GAAG,CACf,GAAgE,EAC1D,EAAE;QACR,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACtB;IACH,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,GAAS,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAExD,OAAO,CACL,eAAK,SAAS,EAAC,oFAAoF,aACjG,KAAC,mBAAmB,IAClB,SAAS,EAAC,oDAAoD,EAC9D,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,EAC5B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,gBAAgB,CAAC,8BAA8B,GAC1D,EACF,iBACE,SAAS,EAAC,qEAAqE,EAC/E,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,QAAQ,YAEd,KAAC,SAAS,KAAG,GACN,IACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,iCAAiC,GAAG,QAAQ,CAChD,CAAC,KAGA,EAAE,EAAE;IACH,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IACpD,MAAM,aAAa,GACjB,CAAC,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IAC3C,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC,CAAC;IACF,MAAM,sBAAsB,GAAG,aAAa;QAC1C,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;aACxB,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC;QACzC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,aAAa;QACjC,CAAC,CAAC,QAAQ,CAAC,UAAU;QACrB,CAAC,CAAC,eAAe,CAAC,yBAAyB,CAAC;IAC9C,MAAM,mBAAmB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpD,KAAK,EAAE,CAAC,CAAC,UAAU;QACnB,KAAK,EAAE,CAAC;KACT,CAAC,CAAC,CAAC;IACJ,cAAc;IACd,MAAM,gBAAgB,GAA+C,CACnE,KAAK,EACL,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvD,WAAW;IACX,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;IAC7C,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IACtD,MAAM,YAAY,GAChB,cAAc,YAAY,0CAA0C;QAClE,CAAC,CAAC,cAAc,CAAC,WAAW;QAC5B,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,iBAAiB,GAAG,CACxB,GAAgE,EAC1D,EAAE;QACR,IACE,cAAc,YAAY,0CAA0C,EACpE;YACA,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChB,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aAC1C;SACF;IACH,CAAC,CAAC;IACF,MAAM,cAAc,GAClB,CAAC,MAAmC,EAAE,EAAE,CAAC,GAAS,EAAE;QAClD,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC,CAAC;IACJ,SAAS;IACT,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAClD,CAAC;IACF,MAAM,MAAM,GAAG,GAAS,EAAE;QACxB,gBAAgB,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAChD,KAAK,EAAE,CAAC;IACV,CAAC,CAAC;IACF,MAAM,cAAc,GAAG,GAAS,EAAE;QAChC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,eAAe,CAAC,SAAS,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChE;IACH,CAAC,CAAC;IACF,SAAS;IACT,MAAM,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAChD,MAAM,YAAY,GAAG,CAAC,MAAoC,EAAE,EAAE,CAAC,GAAS,EAAE;QACxE,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,MAAM,aAAa,GAAG,CACpB,GAAgE,EAC1D,EAAE;QACR,IAAI,WAAW,EAAE;YACf,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChB,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACvC;SACF;IACH,CAAC,CAAC;IACF,OAAO,CACL,KAAC,MAAM,IACL,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAC1C,OAAO,EAAE,KAAK,EACd,OAAO,EAAE;YACP,IAAI,EAAE,8BAA8B;YACpC,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,uBAAuB;SAC/B,YAED,eAAK,SAAS,EAAC,8CAA8C,aAC3D,cAAK,SAAS,EAAC,eAAe,YAC5B,cAAK,SAAS,EAAC,cAAc,YAC1B,aAAa;4BACZ,CAAC,CAAC,4BAA4B;4BAC9B,CAAC,CAAC,2BAA2B,GAC3B,GACF,EACN,eAAK,SAAS,EAAC,kCAAkC,aAC/C,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,iCAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,oEAExD,EACN,KAAC,yBAAyB,IACxB,SAAS,EAAC,6DAA6D,EACvE,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,eAAe,CAAC,UAAU,EACjC,QAAQ,EAAE,gBAAgB,EAC1B,sBAAsB,EACpB,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,GAE1D,IACE,EACN,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,8BAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,sFAGxD,EACN,cAAK,SAAS,EAAC,qCAAqC,YAClD,cAAK,SAAS,EAAC,4CAA4C,YACzD,eAAK,SAAS,EAAC,kDAAkD,aAC/D,cACE,SAAS,EAAE,IAAI,CACb,yDAAyD,EACzD;wDACE,8DAA8D,EAC5D,CAAC,YAAY;qDAChB,CACF,YAEA,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAC/B,EACL,YAAY,IAAI,CACf,cAAK,SAAS,EAAC,qFAAqF,YAClG,KAAC,mBAAmB,IAClB,SAAS,EAAC,4CAA4C,EACtD,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,mBAAmB,CAAC,MAAM,GAAG,CAAC,EACxC,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE;4DACL,KAAK,EAAE,YAAY;4DACnB,KAAK,EAAE,YAAY,CAAC,UAAU;yDAC/B,EACD,QAAQ,EACN,CAAC,gBAAgB,CAAC,8BAA8B,GAElD,GACE,CACP,EACD,MAAC,YAAY,IACX,SAAS,EAAC,4DAA4D,EACtE,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,EAC3B,OAAO,EACL,KAAC,WAAW,cACT,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CACrB,KAAC,eAAe,IAEd,SAAS,EAAC,oEAAoE,EAC9E,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,YAE1B,EAAE,CAAC,QAAQ,EAAE,IAJT,EAAE,CAAC,IAAI,CAKI,CACnB,CAAC,GACU,EAEhB,SAAS,EAAE;wDACT,YAAY,EAAE;4DACZ,QAAQ,EAAE,QAAQ;4DAClB,UAAU,EAAE,MAAM;yDACnB;wDACD,eAAe,EAAE;4DACf,QAAQ,EAAE,KAAK;4DACf,UAAU,EAAE,MAAM;yDACnB;wDACD,SAAS,EAAE,CAAC;qDACb,aAED,iBACE,SAAS,EAAC,yDAAyD,EACnE,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,iCAAiC,YAEvC,KAAC,SAAS,KAAG,GACN,EACT,iBACE,SAAS,EAAC,qEAAqE,EAC/E,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,iCAAiC,YAEvC,KAAC,aAAa,KAAG,GACV,IACI,IACX,GACF,GACF,IACF,EACN,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,+BAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,uHAGxD,EACN,eAAK,SAAS,EAAC,qCAAqC,aAClD,cAAK,SAAS,EAAC,4CAA4C,YACxD,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CACjD,KAAC,uBAAuB,IAEtB,QAAQ,EAAE,KAAK,EACf,SAAS,EAAE,CAAC,CAA6B,EAAE,EAAE,CAC3C,eAAe,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,EAEtC,YAAY,EAAE,CAAC,CAA6B,EAAQ,EAAE,CACpD,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,EAEjC,aAAa,EAAE,aAAa,IARvB,KAAK,CAAC,IAAI,CASf,CACH,CAAC,GACE,EACN,cAAK,SAAS,EAAC,oDAAoD,YACjE,iBACE,SAAS,EAAC,sEAAsE,EAChF,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,EAC5B,OAAO,EAAE,cAAc,EACvB,QAAQ,EAAE,CAAC,CAAC,0BAGL,GACL,IACF,IACF,EACN,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,wBAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,gDAExD,EACN,cAAK,SAAS,EAAC,+CAA+C,GAAO,EACrE,cAAK,SAAS,EAAC,qCAAqC,YAClD,eAAK,SAAS,EAAC,+CAA+C,aAC3D,WAAW,IAAI,CACd,cAAK,SAAS,EAAC,sDAAsD,YAClE,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,GAC/B,CACP,EACA,WAAW,IAAI,CACd,cAAK,SAAS,EAAC,qFAAqF,YAClG,KAAC,mBAAmB,IAClB,SAAS,EAAC,4CAA4C,EACtD,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,mBAAmB,CAAC,MAAM,GAAG,CAAC,EACxC,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE;wDACL,KAAK,EAAE,WAAW,CAAC,WAAW;wDAC9B,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,UAAU;qDAC1C,EACD,QAAQ,EACN,CAAC,gBAAgB,CAAC,8BAA8B,GAElD,GACE,CACP,EACA,CAAC,WAAW,IAAI,CACf,cAAK,SAAS,EAAC,2CAA2C,uBAEpD,CACP,EACD,MAAC,YAAY,IACX,SAAS,EAAC,yDAAyD,EACnE,OAAO,EACL,MAAC,WAAW,eACV,KAAC,eAAe,IAEd,SAAS,EAAC,iEAAiE,EAC3E,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,wBAF5B,MAAM,CAKM,EAEjB,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAC3C,KAAC,eAAe,IAEd,SAAS,EAAC,iEAAiE,EAC3E,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,YAExB,EAAE,CAAC,WAAW,EAAE,IAJZ,EAAE,CAKS,CACnB,CAAC,IACU,EAEhB,SAAS,EAAE;oDACT,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE;oDACxD,eAAe,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE;oDACxD,SAAS,EAAE,CAAC;iDACb,aAED,iBACE,SAAS,EAAE,IAAI,CACb,sDAAsD,EACtD;4DACE,iEAAiE,EAC/D,OAAO,CAAC,WAAW,CAAC;yDACvB,CACF,EACD,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,gCAAgC,YAEtC,KAAC,QAAQ,KAAG,GACL,EACT,iBACE,SAAS,EAAC,kEAAkE,EAC5E,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,gCAAgC,YAEtC,KAAC,aAAa,KAAG,GACV,IACI,IACX,GACF,IACF,IACF,EACN,cAAK,SAAS,EAAC,eAAe,YAC3B,aAAa,CAAC,CAAC,CAAC,CACf,iBAAQ,SAAS,EAAC,8BAA8B,EAAC,OAAO,EAAE,MAAM,uBAEvD,CACV,CAAC,CAAC,CAAC,CACF,iBAAQ,SAAS,EAAC,8BAA8B,EAAC,OAAO,EAAE,KAAK,sBAEtD,CACV,GACG,IACF,GACC,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,wBAAwB,GAAG,QAAQ,CACvC,CAAC,KAGA,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC1C,MAAM,UAAU,GAAG,WAAW,CAC5B,CAAC,IAAsC,EAAQ,EAAE;QAC/C,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;IACF,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,eAAe,CAAC,GAAG,OAAO,CAK/C,GAAG,EAAE,CAAC,CAAC;QACL,MAAM,EAAE;YACN,wCAAwC;YACxC,kCAAkC;SACnC;QACD,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAQ,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBACtB,UAAU,CAAC,IAAI,CAAC,CAAC;aAClB;QACH,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC9C,CAAC;KACH,CAAC,EACF,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,OAAO,CACL,cAAK,SAAS,EAAC,kCAAkC,YAC/C,cACE,GAAG,EAAE,eAAe,EACpB,SAAS,EAAC,wCAAwC,YAElD,KAAC,6BAA6B,IAC5B,eAAe,EAAE,UAAU,EAC3B,KAAK,EAAC,eAAe,EACrB,SAAS,EAAC,iCAAiC,YAE3C,cAAK,SAAS,EAAC,iDAAiD,YAC9D,cACE,SAAS,EAAC,kDAAkD,EAC5D,KAAK,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE,YAE/B,SAAS,CAAC,UAAU,GACjB,GACF,GACwB,GAC5B,GACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,mCAAmC,GAAG,QAAQ,CAClD,CAAC,KAA8D,EAAE,EAAE;IACjE,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAClC,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IACpC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;IACtC,QAAQ;IACR,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAA2B,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,yBAAyB,EAAE,4BAA4B,CAAC,GAC7D,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClB,MAAM,iBAAiB,GAAG,CACxB,KAA0C,EACpC,EAAE;QACR,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC,CAAC;IACF,MAAM,kBAAkB,GAAG,GAAS,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,MAAM,iBAAiB,GAAG,GAAS,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,kBAAkB,GAAG,GAAS,EAAE,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAE3E,cAAc;IACd,MAAM,gBAAgB,GAA+C,CACnE,KAAK,EACL,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,sBAAsB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAE3E,iBAAiB;IACjB,MAAM,aAAa,GAAG,eAAe,CAAC,yBAAyB,CAAC;IAChE,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAClD,CAAC;IACF,MAAM,cAAc,GAAG,GAAS,EAAE;QAChC,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,eAAe,CAAC,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;IACH,CAAC,CAAC;IAEF,WAAW;IACX,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IACtD,MAAM,eAAe,GACnB,cAAc,YAAY,0CAA0C;QAClE,CAAC,CAAC,cAAc,CAAC,WAAW;QAC5B,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,cAAc,GAClB,CAAC,MAAmC,EAAE,EAAE,CAAC,GAAS,EAAE;QAClD,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC,CAAC;IAEJ,SAAS;IACT,MAAM,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAChD,MAAM,YAAY,GAAG,CAAC,MAAoC,EAAE,EAAE,CAAC,GAAS,EAAE;QACxE,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,SAAS;IACT,MAAM,iBAAiB,GAAG,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,GAAS,EAAE;QAC9B,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC,CAAC;IACF,MAAM,WAAW,GAAG,GAAS,EAAE;QAC7B,SAAS,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAC3C,CAAC,CAAC;IAEF,gBAAgB;IAChB,MAAM,WAAW,GAAG,WAAW,CAC7B,CACE,IAAsC,EACtC,OAA0B,EACpB,EAAE;QACR,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAC,SAAS,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAC9B,CAAC;QACF,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAC,SAAS,CAChE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,eAAe,CAC7B,CAAC;QACF,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,UAAU,KAAK,CAAC,CAAC,IAAI,SAAS,KAAK,UAAU,EAAE;YACrE,OAAO;SACR;QACD,+FAA+F;QAC/F,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,EAAE,qBAAqB,EAAE,CAAC;QAChE,MAAM,iBAAiB,GACrB,CAAC,CAAC,kBAAkB,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YACpE,CAAC,CAAC;QACJ,MAAM,YAAY,GAChB,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QACvE,IAAI,SAAS,GAAG,UAAU,IAAI,YAAY,GAAG,iBAAiB,EAAE;YAC9D,OAAO;SACR;QACD,IAAI,SAAS,GAAG,UAAU,IAAI,YAAY,GAAG,iBAAiB,EAAE;YAC9D,OAAO;SACR;QACD,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC,EACD,CAAC,eAAe,EAAE,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAC,CACpE,CAAC;IACF,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,OAAO,CAC/B,GAAG,EAAE,CAAC,CAAC;QACL,MAAM,EAAE,CAAC,kCAAkC,CAAC;QAC5C,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;KAC3D,CAAC,EACF,CAAC,WAAW,CAAC,CACd,CAAC;IACF,MAAM,CAAC,EAAE,sBAAsB,EAAE,EAAE,aAAa,EAAE,oBAAoB,CAAC,GACrE,OAAO,CASL,GAAG,EAAE,CAAC,CAAC;QACL,IAAI,EAAE,kCAAkC;QACxC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YACX,WAAW,EAAE,eAAe;SAC7B,CAAC;QACF,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrB;;eAEG;YACH,sBAAsB;YACpB,4EAA4E;YAC3E,OAAO,CAAC,OAAO,EAA8C;gBAC5D,EAAE,WAAW;SAClB,CAAC;KACH,CAAC,EACF,CAAC,eAAe,CAAC,CAClB,CAAC;IACJ,MAAM,cAAc,GAAG,eAAe,KAAK,sBAAsB,CAAC;IAClE,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAClC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAE1C,MAAM,YAAY,GAAG,CAAC,GAA+B,EAAQ,EAAE;QAC7D,IACE,cAAc,YAAY,0CAA0C,EACpE;YACA,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SACpC;IACH,CAAC,CAAC;IACF,MAAM,cAAc,GAAG,CAAC,GAA+B,EAAQ,EAAE;QAC/D,IAAI,WAAW,EAAE;YACf,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SACjC;IACH,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,WAAW,CAClC,CAAC,IAAsC,EAAQ,EAAE;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;QAClC,IACE,eAAe,CAAC,yBAAyB,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC5D,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACjD;YACA,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;SACrC;IACH,CAAC,EACD,CAAC,eAAe,CAAC,CAClB,CAAC;IACF,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,eAAe,CAAC,GAAG,OAAO,CAK/C,GAAG,EAAE,CAAC,CAAC;QACL,MAAM,EAAE;YACN,wCAAwC;YACxC,kCAAkC;SACnC;QACD,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAQ,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBACtB,gBAAgB,CAAC,IAAI,CAAC,CAAC;aACxB;QACH,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC9C,CAAC;KACH,CAAC,EACF,CAAC,gBAAgB,CAAC,CACnB,CAAC;IAEF,OAAO,CACL,cAAK,GAAG,EAAE,GAAG,EAAE,SAAS,EAAC,6BAA6B,YACpD,KAAC,6BAA6B,IAC5B,eAAe,EAAE,cAAc,EAC/B,SAAS,EAAC,iCAAiC,YAE3C,MAAC,WAAW,IACV,OAAO,EACL,KAAC,wCAAwC,IACvC,WAAW,EAAE,eAAe,GAC5B,EAEJ,SAAS,EAAE,IAAI,CAAC,2CAA2C,EAAE;oBAC3D,yDAAyD,EACvD,yBAAyB;iBAC5B,CAAC,EACF,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAC3B,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,kBAAkB,aAE3B,cAAK,SAAS,EAAC,qDAAqD,YAClE,cAAK,SAAS,EAAC,0CAA0C,YACvD,KAAC,sBAAsB,KAAG,GACtB,GACF,EACN,cAAK,SAAS,EAAC,wCAAwC,YACrD,eAAK,SAAS,EAAC,kDAAkD,aAC/D,cACE,SAAS,EAAE,IAAI,CACb,yDAAyD,EACzD;wCACE,8DAA8D,EAC5D,CAAC,eAAe;qCACnB,CACF,YAEA,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAC/B,EACL,eAAe,IAAI,CAClB,KAAC,wBAAwB,IACvB,SAAS,EAAE,eAAe,EAC1B,YAAY,EAAE,YAAY,GAC1B,CACH,EACD,MAAC,YAAY,IACX,SAAS,EAAC,4DAA4D,EACtE,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,EAC3B,OAAO,EACL,KAAC,WAAW,cACT,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CACrB,KAAC,eAAe,IAEd,SAAS,EAAC,oEAAoE,EAC9E,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,YAE1B,EAAE,CAAC,QAAQ,EAAE,IAJT,EAAE,CAAC,IAAI,CAKI,CACnB,CAAC,GACU,EAEhB,SAAS,EAAE;wCACT,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE;wCACxD,eAAe,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE;wCACxD,SAAS,EAAE,CAAC;qCACb,aAED,iBACE,SAAS,EAAC,yDAAyD,EACnE,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,iCAAiC,YAEvC,KAAC,SAAS,KAAG,GACN,EACT,iBACE,SAAS,EAAC,qEAAqE,EAC/E,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,iCAAiC,YAEvC,KAAC,aAAa,KAAG,GACV,IACI,IACX,GACF,EACN,eAAK,SAAS,EAAC,qCAAqC,aAClD,iBACE,GAAG,EAAE,eAAe,EACpB,KAAK,EAAC,wCAAwC,EAC9C,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAC,8CAA8C,YAExD,MAAC,6BAA6B,IAC5B,eAAe,EAAE,UAAU,EAC3B,KAAK,EAAC,KAAK,EACX,SAAS,EAAC,iCAAiC,aAE3C,eACE,KAAK,EAAE,GAAG,eAAe,CAAC,aAAa,CAAC,MAAM,sBAAsB,EACpE,SAAS,EAAC,qDAAqD,kBAE7D,eAAe,CAAC,aAAa,CAAC,MAAM,SAClC,EACN,cACE,SAAS,EAAE,IAAI,CACb,sDAAsD,CACvD,EACD,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,wBAAwB,YAE9B,KAAC,UAAU,KAAG,GACV,IACwB,GACzB,EACT,KAAC,WAAW,IACV,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,kBAAkB,EAC3B,YAAY,EAAE;oCACZ,QAAQ,EAAE,QAAQ;oCAClB,UAAU,EAAE,QAAQ;iCACrB,EACD,eAAe,EAAE;oCACf,QAAQ,EAAE,KAAK;oCACf,UAAU,EAAE,QAAQ;iCACrB,YAED,cAAK,SAAS,EAAC,8CAA8C,YAC3D,eAAK,SAAS,EAAC,qCAAqC,aAClD,cAAK,SAAS,EAAC,4CAA4C,YACxD,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CACjD,KAAC,uBAAuB,IAEtB,QAAQ,EAAE,KAAK,EACf,SAAS,EAAE,CAAC,CAA6B,EAAE,EAAE,CAC3C,eAAe,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,EAEtC,YAAY,EAAE,CAAC,CAA6B,EAAQ,EAAE,CACpD,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,EAEjC,aAAa,EAAE,aAAa,IARvB,KAAK,CAAC,IAAI,CASf,CACH,CAAC,GACE,EACN,cAAK,SAAS,EAAC,oDAAoD,YACjE,iBACE,SAAS,EAAC,sEAAsE,EAChF,QAAQ,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAClC,OAAO,EAAE,cAAc,EACvB,QAAQ,EAAE,CAAC,CAAC,0BAGL,GACL,IACF,GACF,GACM,IACV,EACN,cAAK,SAAS,EAAC,qCAAqC,YAClD,eAAK,SAAS,EAAC,+CAA+C,aAC3D,WAAW,IAAI,CACd,cAAK,SAAS,EAAC,sDAAsD,YAClE,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,GAC/B,CACP,EACA,WAAW,IAAI,CACd,KAAC,wBAAwB,IACvB,SAAS,EAAE,WAAW,CAAC,WAAW,EAClC,YAAY,EAAE,cAAc,GAC5B,CACH,EACA,CAAC,WAAW,IAAI,CACf,cAAK,SAAS,EAAC,2CAA2C,uBAEpD,CACP,EACD,MAAC,YAAY,IACX,SAAS,EAAC,yDAAyD,EACnE,OAAO,EACL,MAAC,WAAW,eACV,KAAC,eAAe,IAEd,SAAS,EAAC,iEAAiE,EAC3E,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,wBAF5B,MAAM,CAKM,EAEjB,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAC3C,KAAC,eAAe,IAEd,SAAS,EAAC,iEAAiE,EAC3E,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,YAExB,EAAE,CAAC,WAAW,EAAE,IAJZ,EAAE,CAKS,CACnB,CAAC,IACU,EAEhB,SAAS,EAAE;wCACT,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE;wCACxD,eAAe,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE;wCACxD,SAAS,EAAE,CAAC;qCACb,aAED,iBACE,SAAS,EAAE,IAAI,CACb,sDAAsD,EACtD;gDACE,iEAAiE,EAC/D,OAAO,CAAC,WAAW,CAAC;6CACvB,CACF,EACD,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,gCAAgC,YAEtC,KAAC,QAAQ,KAAG,GACL,EACT,iBACE,SAAS,EAAC,kEAAkE,EAC5E,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,gCAAgC,YAEtC,KAAC,aAAa,KAAG,GACV,IACI,IACX,GACF,EACN,cAAK,SAAS,EAAC,mCAAmC,YAChD,KAAC,yBAAyB,IACxB,SAAS,EAAC,6DAA6D,EACvE,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,eAAe,CAAC,UAAU,EACjC,QAAQ,EAAE,gBAAgB,EAC1B,sBAAsB,EACpB,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,GAE1D,GACE,EACN,eAAK,SAAS,EAAC,sCAAsC,aACnD,iBACE,SAAS,EAAC,qCAAqC,EAC/C,QAAQ,EAAE,CAAC,CAAC,EACZ,OAAO,EAAE,WAAW,YAEpB,KAAC,QAAQ,KAAG,GACL,EACT,iBACE,SAAS,EAAC,qCAAqC,EAC/C,QAAQ,EAAE,CAAC,CAAC,EACZ,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EACH,iBAAiB;oCACf,CAAC,CAAC,6DAA6D;oCAC/D,CAAC,CAAC,QAAQ,YAGd,KAAC,SAAS,KAAG,GACN,IACL,IACM,GACgB,GAC5B,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,QAAQ,CAClD,CAAC,KAAyD,EAAE,EAAE;IAC5D,MAAM,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;IACnC,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,iBAAiB,GAAG,GAAS,EAAE;QACnC,MAAM,GAAG,GAAG,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACpD,IAAI,GAAG,EAAE;YACP,MAAM,YAAY,GAAG,qBAAqB,CACxC,GAAG,EACH,gBAAgB,CAAC,QAAQ,CAC1B,CAAC;YACF,gBAAgB,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;SAC9C;IACH,CAAC,CAAC;IACF,gBAAgB;IAChB,MAAM,UAAU,GAAG,WAAW,CAC5B,KAAK,EAAE,IAAgC,EAAiB,EAAE;QACxD,IAAI;YACF,MAAM,YAAY,GAAG,qBAAqB,CACxC,IAAI,CAAC,WAAW,EAChB,gBAAgB,CAAC,QAAQ,CAC1B,CAAC;YACF,gBAAgB,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5C,OAAO;SACR;IACH,CAAC,EACD,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CACrC,CAAC;IACF,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,mBAAmB,CAAC,GAAG,OAAO,CAKnD,GAAG,EAAE,CAAC,CAAC;QACL,MAAM,EAAE;YACN,wCAAwC;YACxC,kCAAkC;SACnC;QACD,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAQ,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBACtB,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;aAC9D,CAAC,+DAA+D;QACnE,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC9C,CAAC;KACH,CAAC,EACF,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAC/B,CAAC;IACF,OAAO,CACL,6BACe,qBAAqB,CAAC,0BAA0B,EAC7D,SAAS,EAAC,OAAO,YAEjB,8BACe,qBAAqB,CAAC,0BAA0B,EAC7D,SAAS,EAAC,OAAO,aAEjB,eAAK,SAAS,EAAC,eAAe,aAC5B,cAAK,SAAS,EAAC,sBAAsB,YACnC,cAAK,SAAS,EAAC,6BAA6B,qBAAW,GACnD,EACN,cAAK,SAAS,EAAC,wBAAwB,YACrC,iBACE,SAAS,EAAC,uBAAuB,EACjC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EACtD,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,4BAA4B,YAElC,KAAC,QAAQ,KAAG,GACL,GACL,IACF,EACN,KAAC,YAAY,cACX,MAAC,aAAa,IACZ,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB,aAEvC,gBAAgB,CAAC,OAAO,IAAI,CAC3B,KAAC,qBAAqB,IACpB,IAAI,EAAC,yBAAyB,EAC9B,WAAW,EAAC,4BAA4B,GACxC,CACH,EACA,CAAC,gBAAgB,CAAC,OAAO,IAAI,CAC5B,6BACe,qBAAqB,CAAC,iBAAiB,EACpD,SAAS,EAAC,8BAA8B,YAEvC,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CACzC,KAAC,mCAAmC,IAClC,eAAe,EAAE,GAAG,IACf,GAAG,CAAC,IAAI,CACb,CACH,CAAC,GACE,CACP,IACa,GACH,EACd,gBAAgB,CAAC,UAAU,IAAI,CAC9B,KAAC,iCAAiC,IAChC,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,EAAE,gBAAgB,CAAC,UAAU,GAC5C,CACH,IACG,GACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/components/fetch-structure/QueryBuilderPostFilterPanel.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/// <reference types="react" resolution-mode="require"/>
 import { PostFilterConditionState } from '../../stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js';
 import { type QueryBuilderProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderPostFilterPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AA6DH,OAAO,EAGL,wBAAwB,EAMzB,MAAM,6EAA6E,CAAC;AACrF,OAAO,EACL,KAAK,iCAAiC,EAIvC,MAAM,kFAAkF,CAAC;AAC1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAiM3E,eAAO,MAAM,uBAAuB;8BAEN,wBAAwB;kCAEnC,iCAAiC,KAC3C,QAAQ,IAAI,CAAC;;;CAsErB,CAAC;AA8rBF,eAAO,MAAM,2BAA2B,WAC9B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CAgCjD,CAAC"}
+{"version":3,"file":"QueryBuilderPostFilterPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAkDH,OAAO,EAGL,wBAAwB,EAMzB,MAAM,6EAA6E,CAAC;AACrF,OAAO,EACL,KAAK,iCAAiC,EAIvC,MAAM,kFAAkF,CAAC;AAC1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAqH3E,eAAO,MAAM,uBAAuB;8BAEN,wBAAwB;kCAEnC,iCAAiC,KAC3C,QAAQ,IAAI,CAAC;;;CAyErB,CAAC;AAusBF,eAAO,MAAM,2BAA2B,WAC9B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CAgCjD,CAAC"}

package/lib/components/fetch-structure/QueryBuilderPostFilterPanel.js

@@ -15,14 +15,13 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * limitations under the License.
  */
 import { useApplicationStore } from '@finos/legend-application';
-import { BlankPanelPlaceholder, CaretDownIcon, ChevronDownIcon, ChevronRightIcon, ClickAwayListener, clsx, ContextMenu, DropdownMenu, FilledTriangleIcon, MenuContent, MenuContentItem, TimesIcon, PlusIcon, ExpandIcon, CompressIcon, CircleIcon, BrushIcon, NewFolderIcon, PlusCircleIcon, InfoCircleIcon, Tooltip, StringTypeIcon, ToggleIcon, HashtagIcon, ClockIcon, PanelDropZone, DragPreviewLayer, PanelEntryDropZonePlaceholder, useDragPreviewLayer, BlankPanelContent, PanelContent, } from '@finos/legend-art';
-import { Class, Enumeration, PrimitiveType, PRIMITIVE_TYPE, getMultiplicityDescription, } from '@finos/legend-graph';
-import { assertErrorThrown, guaranteeNonNullable, returnUndefOnError, debounce, } from '@finos/legend-shared';
+import { BlankPanelPlaceholder, CaretDownIcon, ChevronDownIcon, ChevronRightIcon, ClickAwayListener, clsx, ContextMenu, DropdownMenu, FilledTriangleIcon, MenuContent, MenuContentItem, TimesIcon, PlusIcon, ExpandIcon, CompressIcon, CircleIcon, BrushIcon, NewFolderIcon, PlusCircleIcon, InfoCircleIcon, PanelDropZone, DragPreviewLayer, PanelEntryDropZonePlaceholder, useDragPreviewLayer, BlankPanelContent, PanelContent, } from '@finos/legend-art';
+import { Class, Enumeration, PrimitiveType, } from '@finos/legend-graph';
+import { assertErrorThrown, guaranteeNonNullable, debounce, } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
 import { useDrop, useDrag } from 'react-dnd';
-import { getColumnMultiplicity } from '../../stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorHelper.js';
 import { QueryBuilderAggregateColumnState } from '../../stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.js';
 import { PostFilterConditionState, QueryBuilderPostFilterTreeConditionNodeData, QueryBuilderPostFilterTreeGroupNodeData, QUERY_BUILDER_POST_FILTER_DND_TYPE, QueryBuilderPostFilterTreeBlankConditionNodeData, } from '../../stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js';
 import { QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE, QueryBuilderDerivationProjectionColumnState, } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
@@ -32,6 +31,8 @@ import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpe
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import { BasicValueSpecificationEditor } from '../shared/BasicValueSpecificationEditor.js';
+import { QueryBuilderColumnInfoTooltip, renderPropertyTypeIcon, } from './QueryBuilderTDSComponentHelper.js';
+import { QUERY_BUILDER_OLAP_COLUMN_DND_TYPE, } from '../../stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByState.js';
 const QueryBuilderPostFilterConditionContextMenu = observer(forwardRef(function QueryBuilderPostFilterConditionContextMenu(props, ref) {
     const { tdsState, node } = props;
     const postFilterState = tdsState.postFilterState;
@@ -63,53 +64,16 @@ const QueryBuilderPostFilterGroupConditionEditor = observer((props) => {
                     'query-builder-post-filter-tree__group-node--or': node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.OR,
                 }), title: "Switch Operation", onClick: switchOperation, children: [_jsx("div", { className: "query-builder-post-filter-tree__group-node__label", children: node.groupOperation }), _jsx("button", { className: "query-builder-post-filter-tree__group-node__action", children: _jsx(FilledTriangleIcon, {}) })] }) }) }));
 });
-const renderPropertyTypeIcon = (type) => {
-    if (type instanceof PrimitiveType) {
-        if (type.name === PRIMITIVE_TYPE.STRING) {
-            return _jsx(StringTypeIcon, { className: "query-builder-column-badge__icon" });
-        }
-        else if (type.name === PRIMITIVE_TYPE.BOOLEAN) {
-            return _jsx(ToggleIcon, { className: "query-builder-column-badge__icon" });
-        }
-        else if (type.name === PRIMITIVE_TYPE.NUMBER ||
-            type.name === PRIMITIVE_TYPE.INTEGER ||
-            type.name === PRIMITIVE_TYPE.FLOAT ||
-            type.name === PRIMITIVE_TYPE.DECIMAL) {
-            return _jsx(HashtagIcon, { className: "query-builder-column-badge__icon" });
-        }
-        else if (type.name === PRIMITIVE_TYPE.DATE ||
-            type.name === PRIMITIVE_TYPE.DATETIME ||
-            type.name === PRIMITIVE_TYPE.STRICTDATE) {
-            return _jsx(ClockIcon, { className: "query-builder-column-badge__icon" });
-        }
-    }
-    else if (type instanceof Enumeration) {
-        return _jsx("div", { className: "icon query-builder-column-badge__icon", children: "E" });
-    }
-    return null;
-};
-const QueryBuilderColumnInfoTooltip = (props) => {
-    const { columnState, placement, children } = props;
-    const type = columnState.getReturnType();
-    const multiplicity = returnUndefOnError(() => getColumnMultiplicity(columnState));
-    return (_jsx(Tooltip, { arrow: true, ...(placement !== undefined ? { placement } : {}), classes: {
-            tooltip: 'query-builder__tooltip',
-            arrow: 'query-builder__tooltip__arrow',
-            tooltipPlacementRight: 'query-builder__tooltip--right',
-        }, TransitionProps: {
-            // disable transition
-            // NOTE: somehow, this is the only workaround we have, if for example
-            // we set `appear = true`, the tooltip will jump out of position
-            timeout: 0,
-        }, title: _jsxs("div", { className: "query-builder__tooltip__content", children: [_jsxs("div", { className: "query-builder__tooltip__item", children: [_jsx("div", { className: "query-builder__tooltip__item__label", children: "Name" }), _jsx("div", { className: "query-builder__tooltip__item__value", children: columnState.columnName })] }), _jsxs("div", { className: "query-builder__tooltip__item", children: [_jsx("div", { className: "query-builder__tooltip__item__label", children: "Type" }), _jsx("div", { className: "query-builder__tooltip__item__value", children: type?.path })] }), multiplicity && (_jsxs("div", { className: "query-builder__tooltip__item", children: [_jsx("div", { className: "query-builder__tooltip__item__label", children: "Multiplicity" }), _jsx("div", { className: "query-builder__tooltip__item__value", children: getMultiplicityDescription(multiplicity) })] }))] }), children: children }));
-};
 export const QueryBuilderColumnBadge = observer((props) => {
     const { postFilterConditionState, onColumnChange } = props;
     const applicationStore = useApplicationStore();
-    const type = postFilterConditionState.columnState.getReturnType();
+    const type = postFilterConditionState.columnState.getColumnType();
     const handleDrop = useCallback((item) => onColumnChange(item.columnState), [onColumnChange]);
     const [{ isDragOver }, dropConnector] = useDrop(() => ({
-        accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
+        accept: [
+            QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+            QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
+        ],
         drop: (item, monitor) => {
             if (!monitor.didDrop()) {
                 handleDrop(item).catch(applicationStore.alertUnhandledError);
@@ -142,7 +106,7 @@ const QueryBuilderPostFilterConditionEditor = observer((props) => {
     // Drag and Drop on filter condition value
     const handleDrop = useCallback((item) => {
         const parameterType = item.variable.parameter.genericType?.value.rawType;
-        const conditionValueType = node.condition.columnState.getReturnType();
+        const conditionValueType = node.condition.columnState.getColumnType();
         if (conditionValueType &&
             isTypeCompatibleForAssignment(parameterType, conditionValueType)) {
             node.condition.setValue(item.variable.parameter);
@@ -184,7 +148,7 @@ const QueryBuilderPostFilterConditionEditor = observer((props) => {
                             elevation: 7,
                         }, children: [_jsx("div", { className: "query-builder-post-filter-tree__condition-node__operator__label", children: node.condition.operator.getLabel() }), _jsx("div", { className: "query-builder-post-filter-tree__condition-node__operator__dropdown__trigger", children: _jsx(CaretDownIcon, {}) })] }), node.condition.value && (_jsx("div", { ref: dropConnector, className: "query-builder-post-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, obseverContext: node.condition.postFilterState.tdsState.queryBuilderState
                                     .observableContext, typeCheckOption: {
-                                    expectedType: guaranteeNonNullable(node.condition.columnState.getReturnType()),
+                                    expectedType: guaranteeNonNullable(node.condition.columnState.getColumnType()),
                                 }, resetValue: resetNode, selectorConfig: selectorConfig }) }) }))] }) }) }));
 });
 const QueryBuilderPostFilterBlankConditionEditor = observer((props) => {
@@ -203,9 +167,9 @@ const QueryBuilderPostFilterTreeNodeContainer = observer((props) => {
     const toggleExpandNode = () => node.setIsOpen(!node.isOpen);
     const removeNode = () => postFilterState.removeNodeAndPruneBranch(node);
     const handleDrop = useCallback((item, type) => {
-        if (type === QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE) {
-            const columnState = item
-                .columnState;
+        if (type === QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE ||
+            type === QUERY_BUILDER_OLAP_COLUMN_DND_TYPE) {
+            const columnState = item.columnState;
             let conditionState;
             try {
                 conditionState = new PostFilterConditionState(postFilterState, columnState, undefined, undefined);
@@ -231,6 +195,7 @@ const QueryBuilderPostFilterTreeNodeContainer = observer((props) => {
         accept: [
             ...Object.values(QUERY_BUILDER_POST_FILTER_DND_TYPE),
             QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+            QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
         ],
         drop: (item, monitor) => {
             if (!monitor.didDrop()) {
@@ -354,11 +319,14 @@ const QueryBuilderPostFilterPanelContent = observer((props) => {
         postFilterState.addNodeFromNode(new QueryBuilderPostFilterTreeConditionNodeData(undefined, postFilterConditionState), undefined);
     }, [applicationStore, postFilterState, tdsState.aggregationState.columns]);
     const [{ isDragOver }, dropTargetConnector] = useDrop(() => ({
-        accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
+        accept: [
+            QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+            QUERY_BUILDER_OLAP_COLUMN_DND_TYPE,
+        ],
         drop: (item, monitor) => {
             if (!monitor.didDrop()) {
                 handleDrop(item).catch(applicationStore.alertUnhandledError);
-            } // prevent drop event propagation to accomondate for nested DnD
+            }
         },
         collect: (monitor) => ({
             isDragOver: monitor.isOver({ shallow: true }),