@finos/legend-query-builder 4.14.68 → 4.14.70

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

@@ -317,7 +317,10 @@ const QueryBuilderPostFilterConditionEditor = observer(
         const conditionValueType =
           node.condition.leftConditionValue.getColumnType();
         if (canDropTypeOntoNodeValue(itemType, node.condition)) {
-          if (type === QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE) {
+          if (
+            type === QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE ||
+            type === QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE
+          ) {
             const columnState = (item as QueryBuilderProjectionColumnDragSource)
               .columnState;
             node.condition.setRightConditionVal(
@@ -1047,7 +1050,7 @@ const QueryBuilderPostFilterPanelContent = observer(
       [applicationStore, handleDrop],
     );
 
-    const addPostFilterRef = useRef<HTMLInputElement>(null);
+    const addPostFilterRef = useRef<HTMLDivElement>(null);
     dropTargetConnector(addPostFilterRef);
 
     return (

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

@@ -119,6 +119,41 @@ import {
 } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 import { getNameOfValueSpecification } from '../shared/QueryBuilderVariableSelector.js';
 import { QueryBuilderAggregateOperator_Percentile } from '../../stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Percentile.js';
+import {
+  getFurthestExistsNodeParent,
+  isExistsNodeChild,
+  QUERY_BUILDER_FILTER_DND_TYPE,
+  QueryBuilderFilterTreeConditionNodeData,
+  type QueryBuilderFilterConditionDragSource,
+} from '../../stores/filter/QueryBuilderFilterState.js';
+import { cloneAbstractPropertyExpression } from '../../stores/shared/ValueSpecificationEditorHelper.js';
+import { buildPropertyExpressionFromExistsNode } from '../filter/QueryBuilderFilterPanel.js';
+
+const CAN_DROP_MAIN_GROUP_DND_TYPES = [
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
+  QUERY_BUILDER_FILTER_DND_TYPE.CONDITION,
+  QUERY_BUILDER_FUNCTION_DND_TYPE,
+];
+
+const CAN_DROP_DERIVATION_PROJECTION_COLUMN_DND_TYPES = [
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ROOT,
+  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_VARIABLE_DND_TYPE,
+  QUERY_BUILDER_FUNCTION_DND_TYPE,
+];
+
+type QueryBuilderTDSPanelDropTarget =
+  | QueryBuilderExplorerTreeDragSource
+  | QueryBuilderFunctionsExplorerDragSource
+  | QueryBuilderFilterConditionDragSource;
+
+type QueryBuilderDerivationProjectionColumnDropTarget =
+  | QueryBuilderExplorerTreeDragSource
+  | QueryBuilderVariableDragSource
+  | QueryBuilderFunctionsExplorerDragSource;
 
 const QueryBuilderProjectionColumnContextMenu = observer(
   forwardRef<
@@ -192,10 +227,7 @@ const QueryBuilderDerivationProjectionColumnEditor = observer(
     };
     const handleDrop = useCallback(
       (
-        item:
-          | QueryBuilderExplorerTreeDragSource
-          | QueryBuilderVariableDragSource
-          | QueryBuilderFunctionsExplorerDragSource,
+        item: QueryBuilderDerivationProjectionColumnDropTarget,
         type: string,
       ): void => {
         if (type === QUERY_BUILDER_VARIABLE_DND_TYPE) {
@@ -224,28 +256,18 @@ const QueryBuilderDerivationProjectionColumnEditor = observer(
       },
       [projectionColumnState],
     );
-    const [, dropConnector] = useDrop<
-      | QueryBuilderExplorerTreeDragSource
-      | QueryBuilderVariableDragSource
-      | QueryBuilderFunctionsExplorerDragSource
-    >(
-      () => ({
-        accept: [
-          QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ROOT,
-          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_VARIABLE_DND_TYPE,
-          QUERY_BUILDER_FUNCTION_DND_TYPE,
-        ],
-        drop: (item, monitor): void => {
-          if (!monitor.didDrop()) {
-            handleDrop(item, monitor.getItemType() as string);
-          } // prevent drop event propagation to accomondate for nested DnD
-        },
-      }),
-      [handleDrop],
-    );
+    const [, dropConnector] =
+      useDrop<QueryBuilderDerivationProjectionColumnDropTarget>(
+        () => ({
+          accept: CAN_DROP_DERIVATION_PROJECTION_COLUMN_DND_TYPES,
+          drop: (item, monitor): void => {
+            if (!monitor.didDrop()) {
+              handleDrop(item, monitor.getItemType() as string);
+            } // prevent drop event propagation to accomondate for nested DnD
+          },
+        }),
+        [handleDrop],
+      );
 
     return (
       <div
@@ -1230,12 +1252,7 @@ export const QueryBuilderTDSPanel = observer(
 
     // Drag and Drop
     const handleDrop = useCallback(
-      (
-        item:
-          | QueryBuilderExplorerTreeDragSource
-          | QueryBuilderFunctionsExplorerDragSource,
-        type: string,
-      ): void => {
+      (item: QueryBuilderTDSPanelDropTarget, type: string): void => {
         switch (type) {
           case QUERY_BUILDER_FUNCTION_DND_TYPE: {
             const derivationProjectionColumn =
@@ -1267,6 +1284,30 @@ export const QueryBuilderTDSPanel = observer(
               ),
             );
             break;
+          case QUERY_BUILDER_FILTER_DND_TYPE.CONDITION:
+            if (item.node instanceof QueryBuilderFilterTreeConditionNodeData) {
+              const propertyExpression = isExistsNodeChild(item.node)
+                ? buildPropertyExpressionFromExistsNode(
+                    tdsState.queryBuilderState.filterState,
+                    guaranteeNonNullable(
+                      getFurthestExistsNodeParent(item.node),
+                    ),
+                    item.node,
+                  )
+                : cloneAbstractPropertyExpression(
+                    item.node.condition.propertyExpressionState
+                      .propertyExpression,
+                    tdsState.queryBuilderState.observerContext,
+                  );
+              tdsState.addColumn(
+                new QueryBuilderSimpleProjectionColumnState(
+                  tdsState,
+                  propertyExpression,
+                  tdsState.queryBuilderState.explorerState.humanizePropertyName,
+                ),
+              );
+            }
+            break;
           default:
             break;
         }
@@ -1275,17 +1316,12 @@ export const QueryBuilderTDSPanel = observer(
     );
 
     const [{ isDragOver }, dropTargetConnector] = useDrop<
-      | QueryBuilderExplorerTreeDragSource
-      | QueryBuilderFunctionsExplorerDragSource,
+      QueryBuilderTDSPanelDropTarget,
       void,
       { isDragOver: boolean }
     >(
       () => ({
-        accept: [
-          QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
-          QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-          QUERY_BUILDER_FUNCTION_DND_TYPE,
-        ],
+        accept: CAN_DROP_MAIN_GROUP_DND_TYPES,
         drop: (item, monitor): void => {
           if (!monitor.didDrop()) {
             handleDrop(item, monitor.getItemType() as string);
@@ -1315,11 +1351,9 @@ export const QueryBuilderTDSPanel = observer(
     const { isDroppable } = useDragLayer((monitor) => ({
       isDroppable:
         monitor.isDragging() &&
-        [
-          QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
-          QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-          QUERY_BUILDER_FUNCTION_DND_TYPE,
-        ].includes(monitor.getItemType()?.toString() ?? ''),
+        CAN_DROP_MAIN_GROUP_DND_TYPES.includes(
+          monitor.getItemType()?.toString() ?? '',
+        ),
     }));
 
     useEffect(() => {

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

@@ -48,6 +48,7 @@ import {
   PanelHeader,
   PanelHeaderActions,
   Panel,
+  DragPreviewLayer,
 } from '@finos/legend-art';
 import {
   assertErrorThrown,
@@ -57,7 +58,12 @@ import {
 } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { forwardRef, useCallback, useRef, useState } from 'react';
-import { type DropTargetMonitor, useDrag, useDrop } from 'react-dnd';
+import {
+  type DropTargetMonitor,
+  useDrag,
+  useDragLayer,
+  useDrop,
+} from 'react-dnd';
 import type { QueryBuilderTDS_WindowOperator } from '../../stores/fetch-structure/tds/window/operators/QueryBuilderTDS_WindowOperator.js';
 import {
   type QueryBuilderWindowState,
@@ -75,6 +81,7 @@ import type { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/Quer
 import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
 import { COLUMN_SORT_TYPE } from '../../graph/QueryBuilderMetaModelConst.js';
+import { CAN_DROP_MAIN_GROUP_DND_TYPES } from './QueryBuilderPostFilterPanel.js';
 
 // helpers
 const createWindowColumnState = (
@@ -965,6 +972,10 @@ const QueryBuilderWindowColumnEditor = observer(
         ref={ref}
         className="query-builder__olap__column"
         showPlaceholder={isBeingDragged}
+        placeholder={
+          <div className="query-builder__olap__column__placeholder" />
+        }
+        placeholderContainerClassName="query-builder__olap__column__placeholder__container"
       >
         <ContextMenu
           content={
@@ -1236,6 +1247,7 @@ export const QueryBuilderTDSWindowPanel = observer(
         tdsWindowState.setEditColumn(newWindowState);
       }
     };
+
     // Drag and Drop
     const handleDrop = useCallback(
       async (item: QueryBuilderWindowDropTarget): Promise<void> => {
@@ -1253,6 +1265,7 @@ export const QueryBuilderTDSWindowPanel = observer(
       },
       [applicationStore, tdsWindowState],
     );
+
     const [{ isDragOver }, dropTargetConnector] = useDrop<
       QueryBuilderWindowDropTarget,
       void,
@@ -1274,6 +1287,18 @@ export const QueryBuilderTDSWindowPanel = observer(
       }),
       [applicationStore, handleDrop],
     );
+
+    const { isDroppable } = useDragLayer((monitor) => ({
+      isDroppable:
+        monitor.isDragging() &&
+        CAN_DROP_MAIN_GROUP_DND_TYPES.includes(
+          monitor.getItemType()?.toString() ?? '',
+        ),
+    }));
+
+    const addWindowColumnRef = useRef<HTMLDivElement>(null);
+    dropTargetConnector(addWindowColumnRef);
+
     return (
       <Panel>
         <div
@@ -1301,7 +1326,8 @@ export const QueryBuilderTDSWindowPanel = observer(
           </PanelHeader>
           <PanelContent>
             <PanelDropZone
-              isDragOver={isDragOver}
+              isDragOver={isDragOver && tdsWindowState.isEmpty}
+              isDroppable={isDroppable && tdsWindowState.isEmpty}
               dropTargetConnector={dropTargetConnector}
             >
               {tdsWindowState.isEmpty && (
@@ -1311,16 +1337,43 @@ export const QueryBuilderTDSWindowPanel = observer(
                 />
               )}
               {!tdsWindowState.isEmpty && (
+                <>
+                  <DragPreviewLayer
+                    labelGetter={(
+                      item: QueryBuilderWindowColumnDragSource,
+                    ): string =>
+                      item.columnState.columnName === ''
+                        ? '(unknown)'
+                        : item.columnState.columnName
+                    }
+                    types={[QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE]}
+                  />
+                  <div
+                    data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS}
+                    className="query-builder__olap__columns"
+                  >
+                    {tdsWindowState.windowColumns.map((col) => (
+                      <QueryBuilderWindowColumnEditor
+                        windowColumnState={col}
+                        key={col.uuid}
+                      />
+                    ))}
+                  </div>
+                </>
+              )}
+              {isDroppable && !tdsWindowState.isEmpty && (
                 <div
-                  data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS}
-                  className="query-builder__olap__columns"
+                  ref={addWindowColumnRef}
+                  className="query-builder__olap__free-drop-zone__container"
                 >
-                  {tdsWindowState.windowColumns.map((col) => (
-                    <QueryBuilderWindowColumnEditor
-                      windowColumnState={col}
-                      key={col.uuid}
-                    />
-                  ))}
+                  <PanelEntryDropZonePlaceholder
+                    isDragOver={isDragOver}
+                    isDroppable={isDroppable}
+                    className="query-builder__olap__free-drop-zone"
+                    label="Add new window function column"
+                  >
+                    <></>
+                  </PanelEntryDropZonePlaceholder>
                 </div>
               )}
             </PanelDropZone>

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -68,6 +68,7 @@ import {
   FilterPropertyExpressionStateConditionValueState,
   isCollectionProperty,
   type QueryBuilderFilterValueDropTarget,
+  isExistsNodeChild,
 } from '../../stores/filter/QueryBuilderFilterState.js';
 import { useDrag, useDragLayer, useDrop } from 'react-dnd';
 import {
@@ -830,6 +831,7 @@ const QueryBuilderFilterConditionEditor = observer(
     const queryBuilderState = node.condition.filterState.queryBuilderState;
     const rightConditionValue = node.condition.rightConditionValue;
     const applicationStore = useApplicationStore();
+    const isNodeExistsNodeChild = isExistsNodeChild(node);
 
     // Drag and Drop on filter condition value
     const handleDrop = useCallback(
@@ -845,7 +847,7 @@ const QueryBuilderFilterConditionEditor = observer(
                 type === QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY ||
                 type ===
                   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY) &&
-              node.isExistsNodeChild
+              isNodeExistsNodeChild
             ) {
               throw new UnsupportedOperationError(
                 'Collection filter does not support property for filter condition value.',
@@ -931,8 +933,8 @@ const QueryBuilderFilterConditionEditor = observer(
       [
         applicationStore,
         queryBuilderState,
+        isNodeExistsNodeChild,
         node.condition,
-        node.isExistsNodeChild,
       ],
     );
 

package/src/components/result/QueryBuilderResultPanel.tsx

@@ -44,6 +44,8 @@ import {
   ReportIcon,
   CubesLoadingIndicatorIcon,
   CubesLoadingIndicator,
+  InfoCircleIcon,
+  ShareBoxIcon,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { flowResult } from 'mobx';
@@ -77,6 +79,108 @@ import { QueryBuilderTDSSimpleGridResult } from './tds/QueryBuilderTDSSimpleGrid
 import { getExecutedSqlFromExecutionResult } from './tds/QueryBuilderTDSResultShared.js';
 import { QueryBuilderTDSGridResult } from './tds/QueryBuilderTDSGridResult.js';
 import type { QueryBuilder_LegendApplicationPlugin_Extension } from '../../stores/QueryBuilder_LegendApplicationPlugin_Extension.js';
+import type { QueryBuilderResultState } from '../../stores/QueryBuilderResultState.js';
+
+const PERMISSION_ERRORS = ['permission denied', 'invalid user id or password'];
+
+export const QueryBuilderExecutionErrorPanel = observer(
+  (props: {
+    resultState: QueryBuilderResultState;
+    executionError: string | Error;
+  }) => {
+    const { resultState, executionError } = props;
+    const queryBuilderState = resultState.queryBuilderState;
+    const errorMessage = executionError
+      ? queryBuilderState.applicationStore.notificationService.getErrorMessage(
+          executionError,
+        )
+      : '';
+    const isPermissionDeniedError = () =>
+      Boolean(
+        PERMISSION_ERRORS.find((e) => errorMessage?.toLowerCase().includes(e)),
+      );
+    const openCheckEntitlmentsEditor = (): void => {
+      queryBuilderState.checkEntitlementsState.setShowCheckEntitlementsViewer(
+        true,
+      );
+    };
+
+    return (
+      <>
+        {isPermissionDeniedError() && (
+          <div className="query-builder__result__permission-error">
+            <div className="query-builder__result__permission-error__header">
+              Entitlement / Authorization error - Please
+            </div>
+            <button
+              className="query-builder__result__permission-error__button"
+              disabled={
+                (queryBuilderState.isQuerySupported &&
+                  queryBuilderState.fetchStructureState
+                    .implementation instanceof QueryBuilderTDSState &&
+                  queryBuilderState.fetchStructureState.implementation
+                    .projectionColumns.length === 0) ||
+                !queryBuilderState.canBuildQuery
+              }
+              onClick={openCheckEntitlmentsEditor}
+            >
+              Click Here to Check Entitlements
+            </button>
+          </div>
+        )}
+        <div className="query-builder__result__execution-error">
+          <div className="query-builder__result__execution-error__header">
+            <span style={{ fontWeight: 'bold' }}>Error Execution Query</span>.
+            Please try again later or review options in application`s
+            <span style={{ fontWeight: 'bold' }}> Help</span> menu.
+          </div>
+          <div className="query-builder__result__execution-error__body">
+            {errorMessage}
+          </div>
+        </div>
+      </>
+    );
+  },
+);
+
+export const QueryBuilderEmptyExecutionResultPanel = observer(
+  (props: { queryBuilderState: QueryBuilderState }) => {
+    const { queryBuilderState } = props;
+
+    const openCheckEntitlmentsEditor = (): void => {
+      queryBuilderState.checkEntitlementsState.setShowCheckEntitlementsViewer(
+        true,
+      );
+    };
+
+    return (
+      <div className="query-builder__result__empty-result-warning">
+        <div className="query-builder__result__empty-result-warning__header">
+          Query returned no data
+        </div>
+        <div className="query-builder__result__empty-result-warning__body">
+          If you believe the query should return data, please
+          <button
+            className="query-builder__result__permission-error__button"
+            disabled={
+              (queryBuilderState.isQuerySupported &&
+                queryBuilderState.fetchStructureState.implementation instanceof
+                  QueryBuilderTDSState &&
+                queryBuilderState.fetchStructureState.implementation
+                  .projectionColumns.length === 0) ||
+              !queryBuilderState.canBuildQuery
+            }
+            onClick={openCheckEntitlmentsEditor}
+          >
+            Click Here to Check Entitlements
+          </button>
+          or See Help menu for more options
+        </div>
+      </div>
+    );
+  },
+);
+import { QueryBuilderBaseInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 
 export const QueryBuilderResultValues = observer(
   (props: {
@@ -85,20 +189,28 @@ export const QueryBuilderResultValues = observer(
   }) => {
     const { executionResult, queryBuilderState } = props;
     if (executionResult instanceof TDSExecutionResult) {
-      if (queryBuilderState.config?.TEMPORARY__enableGridEnterpriseMode) {
+      if (executionResult.result.rows.length === 0) {
         return (
-          <QueryBuilderTDSGridResult
+          <QueryBuilderEmptyExecutionResultPanel
             queryBuilderState={queryBuilderState}
-            executionResult={executionResult}
           />
         );
       } else {
-        return (
-          <QueryBuilderTDSSimpleGridResult
-            queryBuilderState={queryBuilderState}
-            executionResult={executionResult}
-          />
-        );
+        if (queryBuilderState.config?.TEMPORARY__enableGridEnterpriseMode) {
+          return (
+            <QueryBuilderTDSGridResult
+              queryBuilderState={queryBuilderState}
+              executionResult={executionResult}
+            />
+          );
+        } else {
+          return (
+            <QueryBuilderTDSSimpleGridResult
+              queryBuilderState={queryBuilderState}
+              executionResult={executionResult}
+            />
+          );
+        }
       }
     } else if (executionResult instanceof RawExecutionResult) {
       const inputValue =
@@ -134,6 +246,7 @@ export const QueryBuilderResultPanel = observer(
     const resultState = queryBuilderState.resultState;
     const queryParametersState = queryBuilderState.parametersState;
     const executionResult = resultState.executionResult;
+    const resultLimit = resultState.getExecutionResultLimit();
     const [showSqlModal, setShowSqlModal] = useState(false);
     const executedSql = executionResult
       ? getExecutedSqlFromExecutionResult(executionResult, true)
@@ -211,6 +324,7 @@ export const QueryBuilderResultPanel = observer(
 
     const runQuery = (): void => {
       resultState.setSelectedCells([]);
+      resultState.setExecutionError(undefined);
       resultState.pressedRunQuery.inProgress();
       if (
         queryParametersState.parameterStates.length &&
@@ -278,8 +392,7 @@ export const QueryBuilderResultPanel = observer(
           })
         : undefined;
       if (_executionResult instanceof TDSExecutionResult) {
-        const rowLength = _executionResult.result.rows.length;
-        return `${rowLength} row(s)${
+        return `${_executionResult.result.rows.length} row(s)${
           queryDuration ? ` in ${queryDuration}` : ''
         }`;
       }
@@ -419,13 +532,62 @@ export const QueryBuilderResultPanel = observer(
                 Running Query...
               </div>
             )}
-
-            <div
-              data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_RESULT_ANALYTICS}
-              className="query-builder__result__analytics"
-            >
-              {resultDescription ?? ''}
-            </div>
+            {resultDescription && resultState.executionTraceId && (
+              <div
+                data-testid={
+                  QUERY_BUILDER_TEST_ID.QUERY_BUILDER_RESULT_ANALYTICS
+                }
+                className="query-builder__result__analytics"
+              >
+                <QueryBuilderBaseInfoTooltip
+                  title="Execution Result Analytics"
+                  data={[
+                    {
+                      label: 'Trace',
+                      value: 'available here',
+                      actionButton: (
+                        <div className="query-builder__tooltip__item__action">
+                          <button
+                            disabled={
+                              !queryBuilderState.config?.zipkinTraceBaseURL
+                            }
+                            title={
+                              queryBuilderState.config?.zipkinTraceBaseURL
+                                ? ''
+                                : 'No zipkin trace URL configured'
+                            }
+                            onClick={() => {
+                              if (
+                                queryBuilderState.config?.zipkinTraceBaseURL
+                              ) {
+                                applicationStore.navigationService.navigator.visitAddress(
+                                  queryBuilderState.config.zipkinTraceBaseURL +
+                                    resultState.executionTraceId,
+                                );
+                              }
+                            }}
+                          >
+                            <ShareBoxIcon />
+                          </button>
+                        </div>
+                      ),
+                    },
+                  ]}
+                >
+                  <div className="editable-value">{resultDescription}</div>
+                </QueryBuilderBaseInfoTooltip>
+              </div>
+            )}
+            {resultDescription && !resultState.executionTraceId && (
+              <div
+                data-testid={
+                  QUERY_BUILDER_TEST_ID.QUERY_BUILDER_RESULT_ANALYTICS
+                }
+                className="query-builder__result__analytics"
+              >
+                {resultDescription}
+              </div>
+            )}
             {executionResult && resultState.checkForStaleResults && (
               <div className="query-builder__result__stale-status">
                 <div className="query-builder__result__stale-status__icon">
@@ -436,6 +598,25 @@ export const QueryBuilderResultPanel = observer(
                 </div>
               </div>
             )}
+            {executionResult &&
+              executionResult instanceof TDSExecutionResult &&
+              resultState.isExecutionResultOverflowing && (
+                <div className="query-builder__result__stale-status">
+                  <div className="query-builder__result__stale-status__icon">
+                    <ExclamationTriangleIcon />
+                  </div>
+                  <div className="query-builder__result__stale-status__label">
+                    Data below is not complete - query produces more rows than
+                    the set grid preview limit
+                  </div>
+                  <div
+                    className="query-builder__result__stale-status__icon"
+                    title={`The preview limit is set to ${resultLimit}. The results in the grid below are being limited by this limit and running query with a higher limit would produce more rows. Export will not apply this limit.`}
+                  >
+                    <InfoCircleIcon />
+                  </div>
+                </div>
+              )}
           </div>
           <div className="panel__header__actions query-builder__result__header__actions">
             {resultState.exportState.isInProgress && (
@@ -638,12 +819,18 @@ export const QueryBuilderResultPanel = observer(
           <CubesLoadingIndicator isLoading={isLoading}>
             <CubesLoadingIndicatorIcon />
           </CubesLoadingIndicator>
-          {!executionResult && !isLoading && (
+          {!executionResult && !isLoading && !resultState.executionError && (
             <BlankPanelContent>
               Build or load a valid query first
             </BlankPanelContent>
           )}
-          {executionResult && !isLoading && (
+          {!isLoading && resultState.executionError && (
+            <QueryBuilderExecutionErrorPanel
+              resultState={resultState}
+              executionError={resultState.executionError}
+            />
+          )}
+          {executionResult && !isLoading && !resultState.executionError && (
             <div className="query-builder__result__values">
               <QueryBuilderResultValues
                 executionResult={executionResult}