ydb-embedded-ui 18.3.2 → 18.4.0

package/dist/containers/VDiskPage/VDiskPage.js

@@ -4,8 +4,6 @@ import { Flex, Icon, Label, Tab, TabList, TabProvider } from '@gravity-ui/uikit'
 import { skipToken } from '@reduxjs/toolkit/query';
 import { isNil } from 'lodash';
 import { Helmet } from 'react-helmet-async';
-import { StringParam, useQueryParams } from 'use-query-params';
-import { z } from 'zod';
 import { EntityPageTitle } from '../../components/EntityPageTitle/EntityPageTitle';
 import { ResponseError } from '../../components/Errors/ResponseError';
 import { EvictVDiskButton, isAllVdiskParamsDefined, } from '../../components/EvictVDiskButton/EvictVDiskButton';
@@ -28,40 +26,15 @@ import { PaginatedStorage } from '../Storage/PaginatedStorage';
 import { VDiskStorageDetails } from './VDiskStorageDetails';
 import { VDiskTablets } from './VDiskTablets';
 import { vDiskPageKeyset } from './i18n';
+import { useVDiskQueryParams } from './useVDiskQueryParams';
 import './VDiskPage.scss';
 const vDiskPageCn = cn('ydb-vdisk-page');
-const VDISK_TABS_IDS = {
-    storage: 'storage',
-    tablets: 'tablets',
-};
-const VDISK_PAGE_TABS = [
-    {
-        id: VDISK_TABS_IDS.storage,
-        get title() {
-            return vDiskPageKeyset('storage');
-        },
-    },
-    {
-        id: VDISK_TABS_IDS.tablets,
-        get title() {
-            return vDiskPageKeyset('tablets');
-        },
-    },
-];
-const vDiskTabSchema = z.nativeEnum(VDISK_TABS_IDS).catch(VDISK_TABS_IDS.storage);
 export function VDiskPage() {
     var _a;
     const dispatch = useTypedDispatch();
     const getVDiskPagePath = useVDiskPagePath();
     const containerRef = React.useRef(null);
-    const [{ nodeId, vDiskId: vDiskIdParam, activeTab, database: databaseParam }] = useQueryParams({
-        nodeId: StringParam,
-        vDiskId: StringParam,
-        activeTab: StringParam,
-        database: StringParam,
-    });
-    const database = databaseParam !== null && databaseParam !== void 0 ? databaseParam : undefined;
-    const vDiskTab = vDiskTabSchema.parse(activeTab);
+    const { nodeId, vDiskId: vDiskIdParam, database, vDiskTab, vDiskTabs } = useVDiskQueryParams();
     const newStorageViewEnabled = useNewStorageViewEnabled();
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const params = React.useMemo(() => {
@@ -139,7 +112,7 @@ export function VDiskPage() {
         return _jsx(VDiskStorageDetails, { data: vDiskData, className: vDiskPageCn('storage-details') });
     };
     const renderTabs = () => {
-        return (_jsx("div", { className: vDiskPageCn('tabs'), children: _jsx(TabProvider, { value: vDiskTab, children: _jsx(TabList, { size: "l", children: VDISK_PAGE_TABS.map(({ id, title }) => {
+        return (_jsx("div", { className: vDiskPageCn('tabs'), children: _jsx(TabProvider, { value: vDiskTab, children: _jsx(TabList, { size: "l", children: vDiskTabs.map(({ id, title }) => {
                         const path = getVDiskPagePath({
                             nodeId: nodeId === null || nodeId === void 0 ? void 0 : nodeId.toString(),
                             vDiskId: vDiskId === null || vDiskId === void 0 ? void 0 : vDiskId.toString(),

package/dist/containers/VDiskPage/VDiskPage.js.map

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

package/dist/containers/VDiskPage/useVDiskQueryParams.d.ts

@@ -0,0 +1,13 @@
+export declare function useVDiskQueryParams(): {
+    nodeId: string | null | undefined;
+    vDiskId: string | null | undefined;
+    database: string | undefined;
+    vDiskTab: "storage" | "tablets";
+    vDiskTabs: ({
+        id: "storage";
+        readonly title: string;
+    } | {
+        id: "tablets";
+        readonly title: string;
+    })[];
+};

package/dist/containers/VDiskPage/useVDiskQueryParams.js

@@ -0,0 +1,55 @@
+import React from 'react';
+import { StringParam, useQueryParams } from 'use-query-params';
+import { z } from 'zod';
+import { useIsViewerUser } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
+import { vDiskPageKeyset } from './i18n';
+const VDISK_TABS_IDS = {
+    storage: 'storage',
+    tablets: 'tablets',
+};
+const VDISK_PAGE_TABS = [
+    {
+        id: VDISK_TABS_IDS.storage,
+        get title() {
+            return vDiskPageKeyset('storage');
+        },
+    },
+    {
+        id: VDISK_TABS_IDS.tablets,
+        get title() {
+            return vDiskPageKeyset('tablets');
+        },
+    },
+];
+const vDiskTabSchema = z.nativeEnum(VDISK_TABS_IDS).catch(VDISK_TABS_IDS.storage);
+export function useVDiskQueryParams() {
+    const [{ nodeId, vDiskId, activeTab, database }, setQueryParams] = useQueryParams({
+        nodeId: StringParam,
+        vDiskId: StringParam,
+        activeTab: StringParam,
+        database: StringParam,
+    });
+    const requestedVDiskTab = vDiskTabSchema.parse(activeTab);
+    const isViewerUser = useIsViewerUser();
+    const { vDiskTab, vDiskTabs } = React.useMemo(() => {
+        var _a, _b;
+        const availableTabs = isViewerUser
+            ? VDISK_PAGE_TABS
+            : VDISK_PAGE_TABS.filter(({ id }) => id !== VDISK_TABS_IDS.tablets);
+        const availableActiveTab = (_b = (_a = availableTabs.find(({ id }) => id === requestedVDiskTab)) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : VDISK_TABS_IDS.storage;
+        return { vDiskTab: availableActiveTab, vDiskTabs: availableTabs };
+    }, [isViewerUser, requestedVDiskTab]);
+    React.useEffect(() => {
+        if (vDiskTab !== requestedVDiskTab) {
+            setQueryParams({ activeTab: vDiskTab }, 'replaceIn');
+        }
+    }, [requestedVDiskTab, setQueryParams, vDiskTab]);
+    return {
+        nodeId,
+        vDiskId,
+        database: database !== null && database !== void 0 ? database : undefined,
+        vDiskTab,
+        vDiskTabs,
+    };
+}
+//# sourceMappingURL=useVDiskQueryParams.js.map

package/dist/containers/VDiskPage/useVDiskQueryParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useVDiskQueryParams.js","sourceRoot":"","sources":["../../../src/containers/VDiskPage/useVDiskQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,eAAe,EAAC,MAAM,iDAAiD,CAAC;AAEhF,OAAO,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AAEvC,MAAM,cAAc,GAAG;IACnB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;CACZ,CAAC;AAEX,MAAM,eAAe,GAAG;IACpB;QACI,EAAE,EAAE,cAAc,CAAC,OAAO;QAC1B,IAAI,KAAK;YACL,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;KACJ;IACD;QACI,EAAE,EAAE,cAAc,CAAC,OAAO;QAC1B,IAAI,KAAK;YACL,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;KACJ;CACJ,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAElF,MAAM,UAAU,mBAAmB;IAC/B,MAAM,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAC,EAAE,cAAc,CAAC,GAAG,cAAc,CAAC;QAC5E,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;;QAC7C,MAAM,aAAa,GAAG,YAAY;YAC9B,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,kBAAkB,GACpB,MAAA,MAAA,aAAa,CAAC,IAAI,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,KAAK,iBAAiB,CAAC,0CAAE,EAAE,mCAAI,cAAc,CAAC,OAAO,CAAC;QAEzF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,EAAE,aAAa,EAAC,CAAC;IACpE,CAAC,EAAE,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAEtC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,QAAQ,KAAK,iBAAiB,EAAE,CAAC;YACjC,cAAc,CAAC,EAAC,SAAS,EAAE,QAAQ,EAAC,EAAE,WAAW,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,EAAE,CAAC,iBAAiB,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC;IAElD,OAAO;QACH,MAAM;QACN,OAAO;QACP,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,SAAS;QAC/B,QAAQ;QACR,SAAS;KACZ,CAAC;AACN,CAAC"}

package/dist/store/reducers/pdisk/utils.js

@@ -4,7 +4,7 @@ import { getSpaceSeverity, setDonorRecipientReferences } from '../../../utils/di
 import { prepareWhiteboardPDiskData, prepareWhiteboardVDiskData, } from '../../../utils/disks/prepareDisks';
 import { prepareNodeSystemState } from '../../../utils/nodes';
 export function preparePDiskDataResponse([pdiskResponse = {}, nodeResponse]) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const rawNode = (_a = nodeResponse.SystemStateInfo) === null || _a === void 0 ? void 0 : _a[0];
     const preparedNode = prepareNodeSystemState(rawNode);
     const { BSC = {}, Whiteboard = {} } = pdiskResponse || {};
@@ -13,8 +13,8 @@ export function preparePDiskDataResponse([pdiskResponse = {}, nodeResponse]) {
     const preparedPDisk = prepareWhiteboardPDiskData({
         ...BSCPDiskData,
         ...WhiteboardPDiskData,
-    });
-    const NodeId = (_b = preparedPDisk.NodeId) !== null && _b !== void 0 ? _b : preparedNode.NodeId;
+    }, (_b = Whiteboard.PDisk) !== null && _b !== void 0 ? _b : null);
+    const NodeId = (_c = preparedPDisk.NodeId) !== null && _c !== void 0 ? _c : preparedNode.NodeId;
     const { LogUsedSize, LogTotalSize, TotalSize: PDiskTotalSize, SystemSize, ExpectedSlotCount, SlotSize, NumActiveSlots, } = preparedPDisk;
     let logSlot;
     if (valueIsDefined(LogTotalSize)) {
@@ -96,7 +96,7 @@ export function preparePDiskDataResponse([pdiskResponse = {}, nodeResponse]) {
         ...preparedPDisk,
         NodeId,
         NodeHost: preparedNode.Host,
-        NodeType: (_c = preparedNode.Roles) === null || _c === void 0 ? void 0 : _c[0],
+        NodeType: (_d = preparedNode.Roles) === null || _d === void 0 ? void 0 : _d[0],
         NodeDC: preparedNode.DC,
         SlotItems: diskSlots,
     };

package/dist/store/reducers/pdisk/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/pdisk/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAE,cAAc,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,sBAAsB,EAAC,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAE,2BAA2B,EAAC,MAAM,8BAA8B,CAAC;AAC3F,OAAO,EACH,0BAA0B,EAC1B,0BAA0B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,sBAAsB,CAAC;AAI5D,MAAM,UAAU,wBAAwB,CAAC,CAAC,aAAa,GAAG,EAAE,EAAE,YAAY,CAGzE;;IACG,MAAM,OAAO,GAAG,MAAA,YAAY,CAAC,eAAe,0CAAG,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,EAAC,GAAG,GAAG,EAAE,EAAE,UAAU,GAAG,EAAE,EAAC,GAAG,aAAa,IAAI,EAAE,CAAC;IAExD,MAAM,EAAC,KAAK,EAAE,mBAAmB,GAAG,EAAE,EAAE,MAAM,EAAE,oBAAoB,GAAG,EAAE,EAAC,GAAG,UAAU,CAAC;IACxF,MAAM,EAAC,KAAK,EAAE,YAAY,GAAG,EAAE,EAAC,GAAG,GAAG,CAAC;IAEvC,MAAM,aAAa,GAAG,0BAA0B,CAAC;QAC7C,GAAG,YAAY;QACf,GAAG,mBAAmB;KACzB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAA,aAAa,CAAC,MAAM,mCAAI,YAAY,CAAC,MAAM,CAAC;IAE3D,MAAM,EACF,WAAW,EACX,YAAY,EACZ,SAAS,EAAE,cAAc,EACzB,UAAU,EACV,iBAAiB,EACjB,QAAQ,EACR,cAAc,GACjB,GAAG,aAAa,CAAC;IAElB,IAAI,OAAoC,CAAC;IAEzC,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QAExE,OAAO,GAAG;YACN,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC;YACzB,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC;YAC3B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,gBAAgB,CAAC,YAAY,CAAC;YACxC,QAAQ,EAAE;gBACN,WAAW;gBACX,YAAY;gBACZ,UAAU;aACb;SACJ,CAAC;IACN,CAAC;IAED,MAAM,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,0BAA0B,CAAC,EAAC,GAAG,IAAI,EAAE,MAAM,EAAC,CAAC,CAChD,CAAC;IAEF,2BAA2B,CAAC,CAAC,EAAE,EAAE,EAAE;QAC/B,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACjC,EAAE,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAE7F,MAAM,WAAW,GAAwB,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;;QAC1E,qFAAqF;QACrF,0EAA0E;QAC1E,sGAAsG;QACtG,MAAM,YAAY,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAE3D,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE5C,uCAAuC;QACvC,4DAA4D;QAC5D,IAAI,IAAI,GAAG,KAAK,EAAE,CAAC;YACf,KAAK,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,OAAO;YACH,QAAQ,EAAE,OAAO;YACjB,EAAE,EAAE,MAAA,aAAa,CAAC,OAAO,0CAAE,OAAO;YAClC,KAAK,EAAE,aAAa,CAAC,eAAe;YACpC,QAAQ,EAAE,YAAY;YACtB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;YACZ,YAAY,EAAE,aAAa,CAAC,gBAAgB;YAE5C,QAAQ,EAAE,aAAa;SAC1B,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,IAAI,UAAU,GAAwB,EAAE,CAAC;IAEzC,qFAAqF;IACrF,gGAAgG;IAChG,MAAM,aAAa,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,WAAW,CAAC,MAAM,CAAC;IAE3D,IAAI,iBAAiB,IAAI,iBAAiB,GAAG,aAAa,EAAE,CAAC;QACzD,MAAM,eAAe,GAAG,iBAAiB,GAAG,aAAa,CAAC;QAE1D,IAAI,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAErC,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YACvB,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACrD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;YAC/C,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,aAAa;gBACT,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,eAAe,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,eAAe,CAAC;QAC5F,CAAC;QAED,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,GAAsB,EAAE;YAC/D,OAAO;gBACH,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,aAAa;gBACpB,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE;oBACN,IAAI,EAAE,aAAa;iBACtB;aACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,SAAS,GAA2B,CAAC,GAAG,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC;IAE1E,IAAI,OAAO,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO;QACH,GAAG,aAAa;QAChB,MAAM;QACN,QAAQ,EAAE,YAAY,CAAC,IAAI;QAC3B,QAAQ,EAAE,MAAA,YAAY,CAAC,KAAK,0CAAG,CAAC,CAAC;QACjC,MAAM,EAAE,YAAY,CAAC,EAAE;QACvB,SAAS,EAAE,SAAS;KACvB,CAAC;AACN,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/pdisk/utils.ts"],"names":[],"mappings":"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"}

package/dist/store/reducers/query/api.d.ts

@@ -1,10 +1,11 @@
 import type { QueryAction, QueryRequestParams, QuerySettings } from '../../../types/store/query';
-import type { QueryStats } from './types';
+import type { QuerySourcePosition, QueryStats } from './types';
 interface SendQueryParams extends QueryRequestParams {
     tabId: string;
     actionType?: QueryAction;
     queryId: string;
     startTime: number;
+    sourcePosition?: QuerySourcePosition;
     historyQueryId?: string;
     querySettings?: Partial<QuerySettings>;
     enableTracingLevel?: boolean;

package/dist/store/reducers/query/api.js

@@ -1,12 +1,13 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TracingLevelNumber } from '../../../types/api/query';
 import { valueIsDefined } from '../../../utils';
 import { QUERY_TECHNICAL_MARK } from '../../../utils/constants';
-import { MAX_QUERY_TIMEOUT_SECONDS, RESOURCE_POOL_NO_OVERRIDE_VALUE, isQueryErrorResponse, parseQueryAPIResponse, } from '../../../utils/query';
+import { MAX_QUERY_TIMEOUT_SECONDS, RESOURCE_POOL_NO_OVERRIDE_VALUE, isExecutionQueryAction, isQueryCancelledError, isQueryErrorResponse, parseQueryAPIResponse, } from '../../../utils/query';
 import { isNumeric } from '../../../utils/utils';
 import { api } from '../api';
 import { prepareQueryData } from './parsers/prepareQueryData';
 import { addStreamingChunks, setQueryResult, setStreamQueryResponse, setStreamSession, } from './slice';
-import { getActionAndSyntaxFromQueryMode, prepareQueryWithPragmas } from './utils';
+import { getActionAndSyntaxFromQueryMode, getEffectiveQueryDataForAction, getEffectiveQuerySettingsForAction, prepareQueryWithPragmasMetadata, } from './utils';
 function getTracingLevelParam(querySettings, enableTracingLevel) {
     if (!enableTracingLevel) {
         return undefined;
@@ -64,30 +65,50 @@ export const queryApi = api.injectEndpoints({
     endpoints: (build) => ({
         useStreamQuery: build.mutation({
             // eslint-disable-next-line complexity
-            queryFn: async ({ tabId, startTime, query, database, querySettings = {}, enableTracingLevel, base64, historyQueryId, }, { signal, dispatch, getState }) => {
-                var _a, _b, _c, _d;
+            queryFn: async ({ tabId, startTime, query, database, querySettings = {}, enableTracingLevel, base64, historyQueryId, sourcePosition, }, { signal, dispatch, getState }) => {
+                var _a, _b, _c, _d, _e, _f;
+                const executionId = uuidv4();
+                const { query: finalQuery, preparedQueryPrefixLineCount } = prepareQueryWithPragmasMetadata(query, querySettings.pragmas);
+                const resultSourcePosition = sourcePosition
+                    ? { ...sourcePosition, preparedQueryPrefixLineCount }
+                    : undefined;
                 dispatch(setQueryResult({
                     tabId,
                     result: {
+                        executionId,
                         type: 'execute',
                         queryId: '',
                         isLoading: true,
                         startTime,
                         streamingStatus: 'preparing',
+                        sourcePosition: resultSourcePosition,
                     },
                 }));
                 const { action, syntax } = getActionAndSyntaxFromQueryMode('execute', querySettings === null || querySettings === void 0 ? void 0 : querySettings.queryMode);
-                const finalQuery = prepareQueryWithPragmas(query, querySettings.pragmas);
-                try {
-                    let streamDataChunkBatch = [];
-                    let batchTimeout = null;
-                    const flushBatch = () => {
-                        if (streamDataChunkBatch.length > 0) {
-                            dispatch(addStreamingChunks({ tabId, chunks: streamDataChunkBatch }));
-                            streamDataChunkBatch = [];
-                        }
+                let streamDataChunkBatch = [];
+                let batchTimeout = null;
+                let isFinalized = false;
+                const flushBatch = () => {
+                    const chunks = streamDataChunkBatch;
+                    streamDataChunkBatch = [];
+                    batchTimeout = null;
+                    if (!isFinalized && chunks.length > 0) {
+                        dispatch(addStreamingChunks({ tabId, executionId, chunks }));
+                    }
+                };
+                const cancelPendingBatch = (discard) => {
+                    if (batchTimeout !== null) {
+                        window.cancelAnimationFrame(batchTimeout);
                         batchTimeout = null;
-                    };
+                    }
+                    if (discard) {
+                        streamDataChunkBatch = [];
+                    }
+                    else {
+                        flushBatch();
+                    }
+                };
+                try {
                     await window.api.streaming.streamQuery({
                         query: finalQuery,
                         database,
@@ -108,59 +129,74 @@ export const queryApi = api.injectEndpoints({
                         signal,
                         // First chunk is session chunk
                         onSessionChunk: (chunk) => {
-                            dispatch(setStreamSession({ tabId, chunk }));
+                            if (!isFinalized) {
+                                dispatch(setStreamSession({ tabId, executionId, chunk }));
+                            }
                         },
                         // Data chunks follow session chunk
                         onStreamDataChunk: (chunk) => {
+                            if (isFinalized) {
+                                return;
+                            }
                             streamDataChunkBatch.push(chunk);
-                            if (!batchTimeout) {
+                            if (batchTimeout === null) {
                                 batchTimeout = window.requestAnimationFrame(flushBatch);
                             }
                         },
                         // Last chunk is query response chunk
                         onQueryResponseChunk: (chunk) => {
-                            dispatch(setStreamQueryResponse({ tabId, chunk }));
+                            if (!isFinalized) {
+                                dispatch(setStreamQueryResponse({ tabId, executionId, chunk }));
+                            }
                         },
                     });
-                    // Flush any remaining chunks
-                    if (batchTimeout) {
-                        window.cancelAnimationFrame(batchTimeout);
-                        flushBatch();
-                    }
+                    const stateBeforeFlush = getState();
+                    const isCurrentBeforeFlush = ((_b = (_a = stateBeforeFlush.query.tabsById[tabId]) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.executionId) === executionId;
+                    // Flush valid remaining chunks, but discard a superseded execution's batch.
+                    cancelPendingBatch(!isCurrentBeforeFlush);
                     const state = getState();
-                    const currentTabResult = (_a = state.query.tabsById[tabId]) === null || _a === void 0 ? void 0 : _a.result;
-                    const queryStats = createExecuteQueryStats((_b = currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.data) !== null && _b !== void 0 ? _b : {}, startTime, 'completed');
+                    const currentTabResult = (_c = state.query.tabsById[tabId]) === null || _c === void 0 ? void 0 : _c.result;
+                    const isCurrentExecution = (currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.executionId) === executionId;
+                    const queryStats = createExecuteQueryStats(isCurrentExecution ? ((_d = currentTabResult.data) !== null && _d !== void 0 ? _d : {}) : {}, startTime, 'completed');
                     return {
                         data: {
                             queryStats,
-                            queryId: currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.queryId,
-                            operationId: currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.operationId,
+                            queryId: isCurrentExecution ? currentTabResult.queryId : undefined,
+                            operationId: isCurrentExecution
+                                ? currentTabResult.operationId
+                                : undefined,
                             historyQueryId,
                         },
                     };
                 }
                 catch (error) {
                     const state = getState();
-                    const currentTabResult = (_c = state.query.tabsById[tabId]) === null || _c === void 0 ? void 0 : _c.result;
-                    const queryStats = createExecuteQueryStats((_d = currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.data) !== null && _d !== void 0 ? _d : {}, startTime, 'failed');
-                    const queryId = (currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.queryId) || '';
+                    const currentTabResult = (_e = state.query.tabsById[tabId]) === null || _e === void 0 ? void 0 : _e.result;
+                    const isCurrentExecution = (currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.executionId) === executionId;
+                    const status = isQueryCancelledError(error) ? 'stopped' : 'failed';
+                    const queryStats = createExecuteQueryStats(isCurrentExecution ? ((_f = currentTabResult.data) !== null && _f !== void 0 ? _f : {}) : {}, startTime, status);
+                    const queryId = isCurrentExecution ? currentTabResult.queryId : '';
                     const err = {
                         error,
                         extra: {
                             queryStats,
                             queryId,
-                            operationId: currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.operationId,
+                            operationId: isCurrentExecution
+                                ? currentTabResult.operationId
+                                : undefined,
                             historyQueryId,
                         },
                     };
-                    if ((currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.startTime) !== startTime) {
+                    if (!isCurrentExecution) {
                         // This query is no longer current, don't update state
                         return { error: err };
                     }
                     dispatch(setQueryResult({
                         tabId,
+                        executionId,
                         result: {
                             ...currentTabResult,
+                            executionId,
                             type: 'execute',
                             error,
                             isLoading: false,
@@ -172,50 +208,65 @@ export const queryApi = api.injectEndpoints({
                     }));
                     return { error: err };
                 }
+                finally {
+                    isFinalized = true;
+                    cancelPendingBatch(true);
+                }
             },
         }),
         useSendQuery: build.mutation({
-            queryFn: async ({ tabId, actionType = 'execute', startTime, query, database, querySettings = {}, enableTracingLevel, queryId, base64, historyQueryId, }, { signal, dispatch, getState }) => {
+            queryFn: async ({ tabId, actionType = 'execute', startTime, query, database, querySettings = {}, enableTracingLevel, queryId, base64, historyQueryId, sourcePosition, }, { signal, dispatch, getState }) => {
                 var _a, _b, _c;
+                const executionId = uuidv4();
+                const effectiveQuerySettings = getEffectiveQuerySettingsForAction(actionType, querySettings);
+                const { query: finalQuery, preparedQueryPrefixLineCount } = prepareQueryWithPragmasMetadata(query, effectiveQuerySettings.pragmas);
+                const resultSourcePosition = sourcePosition
+                    ? { ...sourcePosition, preparedQueryPrefixLineCount }
+                    : undefined;
                 dispatch(setQueryResult({
                     tabId,
                     result: {
+                        executionId,
                         type: actionType,
                         queryId,
                         isLoading: true,
                         startTime,
+                        sourcePosition: resultSourcePosition,
                     },
                 }));
-                const { action, syntax } = getActionAndSyntaxFromQueryMode(actionType, querySettings === null || querySettings === void 0 ? void 0 : querySettings.queryMode);
-                const finalQuery = prepareQueryWithPragmas(query, querySettings.pragmas);
+                const { action, syntax } = getActionAndSyntaxFromQueryMode(actionType, effectiveQuerySettings === null || effectiveQuerySettings === void 0 ? void 0 : effectiveQuerySettings.queryMode);
                 try {
                     const response = await window.api.viewer.sendQuery({
                         query: finalQuery,
                         database,
                         action,
                         syntax,
-                        stats: querySettings.statisticsMode,
-                        tracingLevel: getTracingLevelParam(querySettings, enableTracingLevel),
-                        limit_rows: getLimitRowsParam(querySettings.limitRows),
-                        transaction_mode: getTransactionModeParam(querySettings.transactionMode),
-                        timeout: getTimeoutMsParam(querySettings.timeout),
+                        stats: effectiveQuerySettings.statisticsMode,
+                        tracingLevel: getTracingLevelParam(effectiveQuerySettings, enableTracingLevel),
+                        limit_rows: getLimitRowsParam(effectiveQuerySettings.limitRows),
+                        transaction_mode: getTransactionModeParam(effectiveQuerySettings.transactionMode),
+                        timeout: getTimeoutMsParam(effectiveQuerySettings.timeout),
                         query_id: queryId,
                         base64,
-                        resource_pool: getResourcePoolParam(querySettings.resourcePool),
+                        resource_pool: getResourcePoolParam(effectiveQuerySettings.resourcePool),
                     }, { signal });
                     if (isQueryErrorResponse(response)) {
-                        const queryStats = actionType === 'execute'
-                            ? createExecuteQueryStats({}, startTime, 'failed')
+                        const status = isQueryCancelledError(response) ? 'stopped' : 'failed';
+                        const queryStats = isExecutionQueryAction(actionType)
+                            ? createExecuteQueryStats({}, startTime, status)
                             : {};
                         dispatch(setQueryResult({
                             tabId,
+                            executionId,
                             result: {
+                                executionId,
                                 type: actionType,
                                 error: response,
                                 isLoading: false,
                                 queryId,
                                 startTime,
                                 endTime: Date.now(),
+                                sourcePosition: resultSourcePosition,
                             },
                         }));
                         return {
@@ -229,20 +280,24 @@ export const queryApi = api.injectEndpoints({
                             },
                         };
                     }
-                    const data = prepareQueryData(response);
-                    data.traceId = (_a = response === null || response === void 0 ? void 0 : response._meta) === null || _a === void 0 ? void 0 : _a.traceId;
-                    const queryStats = actionType === 'execute'
+                    const preparedData = prepareQueryData(response);
+                    preparedData.traceId = (_a = response === null || response === void 0 ? void 0 : response._meta) === null || _a === void 0 ? void 0 : _a.traceId;
+                    const data = getEffectiveQueryDataForAction(actionType, preparedData);
+                    const queryStats = isExecutionQueryAction(actionType)
                         ? createExecuteQueryStats(data, startTime, 'completed')
                         : {};
                     dispatch(setQueryResult({
                         tabId,
+                        executionId,
                         result: {
+                            executionId,
                             type: actionType,
                             data,
                             isLoading: false,
                             queryId,
                             startTime,
                             endTime: Date.now(),
+                            sourcePosition: resultSourcePosition,
                         },
                     }));
                     return { data: { queryStats, queryId, historyQueryId } };
@@ -250,8 +305,10 @@ export const queryApi = api.injectEndpoints({
                 catch (error) {
                     const state = getState();
                     const currentTabResult = (_b = state.query.tabsById[tabId]) === null || _b === void 0 ? void 0 : _b.result;
-                    const queryStats = actionType === 'execute'
-                        ? createExecuteQueryStats((_c = currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.data) !== null && _c !== void 0 ? _c : {}, startTime, 'failed')
+                    const isCurrentExecution = (currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.executionId) === executionId;
+                    const status = isQueryCancelledError(error) ? 'stopped' : 'failed';
+                    const queryStats = isExecutionQueryAction(actionType)
+                        ? createExecuteQueryStats(isCurrentExecution ? ((_c = currentTabResult.data) !== null && _c !== void 0 ? _c : {}) : {}, startTime, status)
                         : {};
                     const err = {
                         error,
@@ -261,14 +318,16 @@ export const queryApi = api.injectEndpoints({
                             historyQueryId,
                         },
                     };
-                    if ((currentTabResult === null || currentTabResult === void 0 ? void 0 : currentTabResult.startTime) !== startTime) {
+                    if (!isCurrentExecution) {
                         // This query is no longer current, don't update state
                         return { error: err };
                     }
                     dispatch(setQueryResult({
                         tabId,
+                        executionId,
                         result: {
                             ...currentTabResult,
+                            executionId,
                             type: actionType,
                             error,
                             isLoading: false,

package/dist/store/reducers/query/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/store/reducers/query/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/store/reducers/query/api.ts"],"names":[],"mappings":"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"}

package/dist/store/reducers/query/parsers/preparePlanData.js

@@ -46,7 +46,14 @@ export function preparePlanData(rawPlan, stats) {
     if (planFromStats) {
         try {
             const planWithStats = JSON.parse(planFromStats);
-            return { ...preparePlan(planWithStats), pristine: planWithStats };
+            return {
+                ...preparePlan(planWithStats),
+                pristine: planWithStats,
+                simplifiedPlan: {
+                    plan: prepareSimplifiedPlan([planWithStats]),
+                    pristine: planWithStats,
+                },
+            };
         }
         catch (_d) {
             return {};