ydb-embedded-ui 17.0.1 → 17.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/columns.js +1 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/columns.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/CompactTableAction/CompactTableAction.d.ts +5 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/CompactTableAction/CompactTableAction.js +64 -11
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/CompactTableAction/CompactTableAction.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/CompactTableAction/CompactTableAction.scss +3 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/TableInfo.js +9 -7
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/TableInfo.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/hooks/useTableCompaction.d.ts +1 -0
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/hooks/useTableCompaction.js +6 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/hooks/useTableCompaction.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/i18n/en.json +2 -0
- package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/i18n/index.d.ts +1 -1
- package/dist/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/components/StorageTab.js +7 -1
- package/dist/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/components/StorageTab.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/TenantOverview/TabCard/UsageTabCard.d.ts +2 -1
- package/dist/containers/Tenant/Diagnostics/TenantOverview/TabCard/UsageTabCard.js +7 -2
- package/dist/containers/Tenant/Diagnostics/TenantOverview/TabCard/UsageTabCard.js.map +1 -1
- package/dist/containers/Tenant/ObjectGeneral/ObjectGeneral.d.ts +2 -1
- package/dist/containers/Tenant/ObjectGeneral/ObjectGeneral.js +6 -1
- package/dist/containers/Tenant/ObjectGeneral/ObjectGeneral.js.map +1 -1
- package/dist/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.js +17 -8
- package/dist/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.js.map +1 -1
- package/dist/containers/Tenant/Query/NewSQL/NewSQL.js +12 -2
- package/dist/containers/Tenant/Query/NewSQL/NewSQL.js.map +1 -1
- package/dist/containers/Tenant/Tenant.js +6 -3
- package/dist/containers/Tenant/Tenant.js.map +1 -1
- package/dist/services/api/base.d.ts +8 -0
- package/dist/services/api/base.js +35 -2
- package/dist/services/api/base.js.map +1 -1
- package/dist/services/api/codeAssist.d.ts +1 -0
- package/dist/services/api/codeAssist.js +14 -0
- package/dist/services/api/codeAssist.js.map +1 -1
- package/dist/services/api/index.d.ts +2 -1
- package/dist/services/api/index.js +3 -18
- package/dist/services/api/index.js.map +1 -1
- package/dist/services/api/streaming.d.ts +0 -2
- package/dist/services/api/streaming.js +4 -9
- package/dist/services/api/streaming.js.map +1 -1
- package/dist/services/api/viewer.js +7 -2
- package/dist/services/api/viewer.js.map +1 -1
- package/dist/store/reducers/capabilities/hooks.d.ts +1 -0
- package/dist/store/reducers/capabilities/hooks.js +3 -0
- package/dist/store/reducers/capabilities/hooks.js.map +1 -1
- package/dist/store/reducers/operations.js +2 -2
- package/dist/store/reducers/operations.js.map +1 -1
- package/dist/store/reducers/preview.d.ts +2 -1
- package/dist/store/reducers/preview.js.map +1 -1
- package/dist/types/api/query.d.ts +8 -2
- package/dist/utils/tableCompaction.d.ts +1 -0
- package/dist/utils/tableCompaction.js.map +1 -1
- package/package.json +1 -1
- package/dist/utils/hooks/useStartCompaction.d.ts +0 -7
- package/dist/utils/hooks/useStartCompaction.js +0 -22
- package/dist/utils/hooks/useStartCompaction.js.map +0 -1
|
@@ -5,8 +5,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
5
5
|
import React from 'react';
|
|
6
6
|
import { NavigationTree } from 'ydb-ui-components';
|
|
7
7
|
import { getConnectToDBDialog } from '../../../../components/ConnectToDB/ConnectToDBDialog';
|
|
8
|
-
import { useCreateDirectoryFeatureAvailable, useMultiTabQueryEditorEnabled, useTopicDataAvailable, } from '../../../../store/reducers/capabilities/hooks';
|
|
8
|
+
import { useCreateDirectoryFeatureAvailable, useExecuteQueryAndForgetAvailable, useMultiTabQueryEditorEnabled, useTopicDataAvailable, } from '../../../../store/reducers/capabilities/hooks';
|
|
9
9
|
import { useClusterBaseInfo, useClusterWithProxy } from '../../../../store/reducers/cluster/cluster';
|
|
10
|
+
import { operationsApi } from '../../../../store/reducers/operations';
|
|
10
11
|
import { selectIsDirty, selectUserInput } from '../../../../store/reducers/query/query';
|
|
11
12
|
import { schemaApi } from '../../../../store/reducers/schema/schema';
|
|
12
13
|
import { showCreateTableApi } from '../../../../store/reducers/showCreateTable/showCreateTable';
|
|
@@ -17,7 +18,6 @@ import { valueIsDefined } from '../../../../utils';
|
|
|
17
18
|
import { getStringifiedData } from '../../../../utils/dataFormatters/dataFormatters';
|
|
18
19
|
import { useTypedDispatch, useTypedSelector } from '../../../../utils/hooks';
|
|
19
20
|
import { useCompactionFeature } from '../../../../utils/hooks/useCompactionFeature';
|
|
20
|
-
import { useStartCompaction } from '../../../../utils/hooks/useStartCompaction';
|
|
21
21
|
import { getConfirmation } from '../../../../utils/hooks/withConfirmation/useChangeInputWithConfirmation';
|
|
22
22
|
import { canShowTenantMonitoringTab } from '../../../../utils/monitoringVisibility';
|
|
23
23
|
import { findRunningTableCompactionOperation } from '../../../../utils/tableCompaction';
|
|
@@ -53,9 +53,9 @@ export function SchemaTree(props) {
|
|
|
53
53
|
// Compaction feature flag check
|
|
54
54
|
const { compactionEnabled } = useCompactionFeature(database);
|
|
55
55
|
// Use table compaction hook to track all running compactions only while table actions are open
|
|
56
|
-
const { operations: compactionOperations, isFetching: isCompactionFetching } = useTableCompaction(database, '', compactionEnabled && compactionActionsOpen);
|
|
57
|
-
|
|
58
|
-
const
|
|
56
|
+
const { operations: compactionOperations, isFetching: isCompactionFetching, refresh: refreshCompactions, } = useTableCompaction(database, '', compactionEnabled && compactionActionsOpen);
|
|
57
|
+
const executeQueryAndForgetAvailable = useExecuteQueryAndForgetAvailable();
|
|
58
|
+
const [startTableCompaction] = operationsApi.useStartTableCompactionMutation();
|
|
59
59
|
// Check if a specific table has running compaction
|
|
60
60
|
const hasRunningCompaction = React.useCallback((path) => {
|
|
61
61
|
return Boolean(findRunningTableCompactionOperation(compactionOperations, path));
|
|
@@ -117,16 +117,25 @@ export function SchemaTree(props) {
|
|
|
117
117
|
const handleOpenCompactionDialog = React.useCallback((path) => {
|
|
118
118
|
openCompactTableDialog({
|
|
119
119
|
onApply: async ({ cascade, parallel }) => {
|
|
120
|
-
|
|
120
|
+
return startTableCompaction({
|
|
121
121
|
database,
|
|
122
122
|
path,
|
|
123
123
|
cascade,
|
|
124
124
|
parallel,
|
|
125
|
-
|
|
125
|
+
executeAndForget: executeQueryAndForgetAvailable,
|
|
126
|
+
}).unwrap();
|
|
126
127
|
},
|
|
128
|
+
onRefreshCompactions: refreshCompactions,
|
|
127
129
|
hasRunningCompaction: hasRunningCompaction(path),
|
|
130
|
+
executeQueryAndForgetAvailable,
|
|
128
131
|
});
|
|
129
|
-
}, [
|
|
132
|
+
}, [
|
|
133
|
+
database,
|
|
134
|
+
executeQueryAndForgetAvailable,
|
|
135
|
+
startTableCompaction,
|
|
136
|
+
hasRunningCompaction,
|
|
137
|
+
refreshCompactions,
|
|
138
|
+
]);
|
|
130
139
|
const { monitoring: clusterMonitoring } = useClusterBaseInfo();
|
|
131
140
|
const { controlPlane } = useTenantBaseInfo(database);
|
|
132
141
|
const getTreeNodeActions = React.useMemo(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaTree.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,0FAA0F;AAC1F,uGAAuG;AACvG,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAC,oBAAoB,EAAC,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EACH,kCAAkC,EAClC,6BAA6B,EAC7B,qBAAqB,GACxB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAC,kBAAkB,EAAE,mBAAmB,EAAC,MAAM,4CAA4C,CAAC;AACnG,OAAO,EAAC,aAAa,EAAE,eAAe,EAAC,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAC,SAAS,EAAC,MAAM,0CAA0C,CAAC;AACnE,OAAO,EAAC,kBAAkB,EAAC,MAAM,4DAA4D,CAAC;AAC9F,OAAO,EAAC,mBAAmB,EAAC,MAAM,0DAA0D,CAAC;AAC7F,OAAO,EAAC,kBAAkB,EAAC,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAC,iBAAiB,EAAC,MAAM,0CAA0C,CAAC;AAE3E,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAC,kBAAkB,EAAC,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAC,oBAAoB,EAAC,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"SchemaTree.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,20 @@ import i18n from './i18n';
|
|
|
12
12
|
export function NewSQL() {
|
|
13
13
|
const dispatch = useTypedDispatch();
|
|
14
14
|
const isMultiTabEnabled = useMultiTabQueryEditorEnabled();
|
|
15
|
+
const [shouldReturnFocus, setShouldReturnFocus] = React.useState(true);
|
|
15
16
|
const insertTemplate = React.useCallback((input) => {
|
|
17
|
+
setShouldReturnFocus(false);
|
|
16
18
|
insertSnippetToEditor(input);
|
|
17
19
|
}, []);
|
|
18
|
-
const
|
|
20
|
+
const insertTemplateWithConfirmation = useChangeInputWithConfirmation(insertTemplate, isMultiTabEnabled);
|
|
21
|
+
const onTemplateClick = React.useCallback((input) => {
|
|
22
|
+
return insertTemplateWithConfirmation(input);
|
|
23
|
+
}, [insertTemplateWithConfirmation]);
|
|
24
|
+
const handleOpenToggle = React.useCallback((open) => {
|
|
25
|
+
if (open) {
|
|
26
|
+
setShouldReturnFocus(true);
|
|
27
|
+
}
|
|
28
|
+
}, []);
|
|
19
29
|
const actions = bindActions(dispatch, onTemplateClick, isMultiTabEnabled);
|
|
20
30
|
const items = [
|
|
21
31
|
{
|
|
@@ -201,6 +211,6 @@ export function NewSQL() {
|
|
|
201
211
|
],
|
|
202
212
|
},
|
|
203
213
|
];
|
|
204
|
-
return (_jsx(DropdownMenu, { items: items, renderSwitcher: (props) => (_jsxs(Button, { ...props, children: [i18n('button.new-sql'), _jsx(Button.Icon, { children: _jsx(ChevronDown, {}) })] })), popupProps: { placement: 'top' } }));
|
|
214
|
+
return (_jsx(DropdownMenu, { items: items, renderSwitcher: (props) => (_jsxs(Button, { ...props, children: [i18n('button.new-sql'), _jsx(Button.Icon, { children: _jsx(ChevronDown, {}) })] })), onOpenToggle: handleOpenToggle, popupProps: { placement: 'top', returnFocus: shouldReturnFocus } }));
|
|
205
215
|
}
|
|
206
216
|
//# sourceMappingURL=NewSQL.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewSQL.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/NewSQL/NewSQL.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AACvD,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,YAAY,GACf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAC,6BAA6B,EAAC,MAAM,+CAA+C,CAAC;AAC5F,OAAO,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAC,8BAA8B,EAAC,MAAM,yEAAyE,CAAC;AACvH,OAAO,EAAC,qBAAqB,EAAC,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,MAAM,UAAU,MAAM;IAClB,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IACpC,MAAM,iBAAiB,GAAG,6BAA6B,EAAE,CAAC;IAE1D,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAa,EAAE,EAAE;QACvD,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,8BAA8B,CAAC,
|
|
1
|
+
{"version":3,"file":"NewSQL.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/NewSQL/NewSQL.tsx"],"names":[],"mappings":"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"}
|
|
@@ -104,11 +104,14 @@ function TreePagesContent({ path, database, databaseName, useMetaProxy, addition
|
|
|
104
104
|
}
|
|
105
105
|
}, [isLoading]);
|
|
106
106
|
const preloadedData = useTypedSelector((state) => selectSchemaObjectData(state, path, database, databaseName, useMetaProxy));
|
|
107
|
-
const
|
|
108
|
-
const
|
|
107
|
+
const accessError = isAccessError(error) ? error : undefined;
|
|
108
|
+
const showBlockingDescribeError = Boolean(accessError && path === databaseName);
|
|
109
|
+
const describeErrorProps = showBlockingDescribeError
|
|
110
|
+
? uiFactory.clusterOrDatabaseAccessError
|
|
111
|
+
: undefined;
|
|
109
112
|
// Use preloaded data if there is no current item data yet
|
|
110
113
|
const currentPathType = (_c = (_b = (_a = currentItem === null || currentItem === void 0 ? void 0 : currentItem.PathDescription) === null || _a === void 0 ? void 0 : _a.Self) === null || _b === void 0 ? void 0 : _b.PathType) !== null && _c !== void 0 ? _c : (_e = (_d = preloadedData === null || preloadedData === void 0 ? void 0 : preloadedData.PathDescription) === null || _d === void 0 ? void 0 : _d.Self) === null || _e === void 0 ? void 0 : _e.PathType;
|
|
111
114
|
const currentPathSubType = (_h = (_g = (_f = currentItem === null || currentItem === void 0 ? void 0 : currentItem.PathDescription) === null || _f === void 0 ? void 0 : _f.Self) === null || _g === void 0 ? void 0 : _g.PathSubType) !== null && _h !== void 0 ? _h : (_k = (_j = preloadedData === null || preloadedData === void 0 ? void 0 : preloadedData.PathDescription) === null || _j === void 0 ? void 0 : _j.Self) === null || _k === void 0 ? void 0 : _k.PathSubType;
|
|
112
|
-
return (_jsx(LoaderWrapper, { loading: initialLoading, children: _jsx(PageError, { error:
|
|
115
|
+
return (_jsx(LoaderWrapper, { loading: initialLoading, children: _jsx(PageError, { error: showBlockingDescribeError ? error : undefined, ...describeErrorProps, size: "l", illustrationSize: "m", children: _jsxs(SplitPane, { defaultSizePaneKey: DEFAULT_SIZE_TENANT_KEY, defaultSizes: [25, 75], triggerCollapse: summaryVisibilityState.triggerCollapse, triggerExpand: summaryVisibilityState.triggerExpand, minSize: [36, 200], onSplitStartDragAdditional: onSplitStartDragAdditional, children: [_jsx(ObjectSummary, { type: currentPathType, onCollapseSummary: onCollapseSummaryHandler, onExpandSummary: onExpandSummaryHandler, isCollapsed: summaryVisibilityState.collapsed }), _jsx("div", { className: b('main'), children: _jsx(ObjectGeneral, { additionalTenantProps: additionalTenantProps, type: currentPathType, subType: currentPathSubType, diagnosticsAccessError: accessError }) })] }) }) }));
|
|
113
116
|
}
|
|
114
117
|
//# sourceMappingURL=Tenant.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tenant.js","sourceRoot":"","sources":["../../../src/containers/Tenant/Tenant.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Tenant.js","sourceRoot":"","sources":["../../../src/containers/Tenant/Tenant.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,15 @@ export type AxiosOptions = {
|
|
|
7
7
|
withRetries?: boolean;
|
|
8
8
|
timeout?: number;
|
|
9
9
|
};
|
|
10
|
+
export type CsrfTokenGetter = () => string | undefined;
|
|
11
|
+
export declare const CSRF_TOKEN_HEADER_NAME = "X-CSRF-Token";
|
|
12
|
+
export declare function getCsrfTokenFromCookie(cookieString?: string): string;
|
|
13
|
+
export declare function isMutatingRequestMethod(method?: string): boolean;
|
|
10
14
|
export interface BaseAPIParams {
|
|
11
15
|
singleClusterMode: undefined | boolean;
|
|
12
16
|
proxyMeta: undefined | boolean;
|
|
13
17
|
useRelativePath: undefined | boolean;
|
|
18
|
+
csrfTokenGetter: CsrfTokenGetter;
|
|
14
19
|
}
|
|
15
20
|
interface XhrLikeRequest {
|
|
16
21
|
readyState: number;
|
|
@@ -36,9 +41,12 @@ export declare class BaseYdbAPI extends AxiosWrapper {
|
|
|
36
41
|
DEFAULT_RETRIES_COUNT: number;
|
|
37
42
|
singleClusterMode: BaseAPIParams['singleClusterMode'];
|
|
38
43
|
useRelativePath: BaseAPIParams['useRelativePath'];
|
|
44
|
+
protected csrfTokenGetter: CsrfTokenGetter;
|
|
39
45
|
constructor(axiosOptions: AxiosWrapperOptions, baseApiParams: BaseAPIParams);
|
|
40
46
|
getPath(path: string): string;
|
|
41
47
|
getSchemaPath(params?: SchemaPathParam): string | undefined;
|
|
42
48
|
prepareArrayRequestParam(arr: (string | number)[]): string;
|
|
49
|
+
protected getCsrfToken(): string | undefined;
|
|
50
|
+
protected shouldUseCsrfTokenForRequest(method?: string, _url?: string): boolean;
|
|
43
51
|
}
|
|
44
52
|
export {};
|
|
@@ -6,6 +6,23 @@ import { DEV_ENABLE_TRACING_FOR_ALL_REQUESTS } from '../../utils/constants';
|
|
|
6
6
|
import { prepareBackendWithMetaProxy } from '../../utils/parseBalancer';
|
|
7
7
|
import { isRedirectToAuth } from '../../utils/response';
|
|
8
8
|
import { isNeedResetResponse, processNeedReset } from './utils/needReset';
|
|
9
|
+
const CSRF_PROTECTED_METHODS = new Set(['post', 'put', 'delete', 'patch']);
|
|
10
|
+
export const CSRF_TOKEN_HEADER_NAME = 'X-CSRF-Token';
|
|
11
|
+
export function getCsrfTokenFromCookie(cookieString = typeof document === 'undefined' ? '' : document.cookie) {
|
|
12
|
+
var _a, _b;
|
|
13
|
+
return (_b = (_a = cookieString.match(/(?:^|;\s*)csrf_token=([^;]*)/)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : '';
|
|
14
|
+
}
|
|
15
|
+
export function isMutatingRequestMethod(method) {
|
|
16
|
+
return method ? CSRF_PROTECTED_METHODS.has(method.toLowerCase()) : false;
|
|
17
|
+
}
|
|
18
|
+
function setAxiosRequestHeader(headers, headerName, headerValue) {
|
|
19
|
+
if (typeof headers.set === 'function') {
|
|
20
|
+
headers.set(headerName, headerValue);
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const mutableHeaders = headers;
|
|
24
|
+
mutableHeaders[headerName] = headerValue;
|
|
25
|
+
}
|
|
9
26
|
function isRecord(value) {
|
|
10
27
|
return Boolean(value && typeof value === 'object' && !Array.isArray(value));
|
|
11
28
|
}
|
|
@@ -111,16 +128,24 @@ export class BaseYdbAPI extends AxiosWrapper {
|
|
|
111
128
|
this.DEFAULT_RETRIES_COUNT = 0;
|
|
112
129
|
this.singleClusterMode = baseApiParams.singleClusterMode;
|
|
113
130
|
this.useRelativePath = baseApiParams.useRelativePath;
|
|
131
|
+
this.csrfTokenGetter = baseApiParams.csrfTokenGetter;
|
|
114
132
|
axiosRetry(this._axios, {
|
|
115
133
|
retries: this.DEFAULT_RETRIES_COUNT,
|
|
116
134
|
retryDelay: axiosRetry.exponentialDelay,
|
|
117
135
|
});
|
|
118
136
|
// Make possible manually enable tracing for all requests
|
|
119
137
|
// For development purposes
|
|
120
|
-
this._axios.interceptors.request.use(
|
|
138
|
+
this._axios.interceptors.request.use((config) => {
|
|
121
139
|
const enableTracing = readSettingValueFromLS(DEV_ENABLE_TRACING_FOR_ALL_REQUESTS);
|
|
122
140
|
if (enableTracing) {
|
|
123
|
-
config.headers
|
|
141
|
+
setAxiosRequestHeader(config.headers, 'X-Want-Trace', '1');
|
|
142
|
+
}
|
|
143
|
+
// Do not rely on AxiosWrapper.setCSRFToken here: it snapshots the token into defaults
|
|
144
|
+
// and does not cover PATCH requests. The backend may set csrf_token only after
|
|
145
|
+
// an earlier monitoring response, so read it right before every mutating request.
|
|
146
|
+
const csrfToken = this.getCsrfToken();
|
|
147
|
+
if (csrfToken && this.shouldUseCsrfTokenForRequest(config.method, config.url)) {
|
|
148
|
+
setAxiosRequestHeader(config.headers, CSRF_TOKEN_HEADER_NAME, csrfToken);
|
|
124
149
|
}
|
|
125
150
|
return config;
|
|
126
151
|
});
|
|
@@ -163,5 +188,13 @@ export class BaseYdbAPI extends AxiosWrapper {
|
|
|
163
188
|
prepareArrayRequestParam(arr) {
|
|
164
189
|
return arr.join(',');
|
|
165
190
|
}
|
|
191
|
+
getCsrfToken() {
|
|
192
|
+
var _a;
|
|
193
|
+
const defaultToken = (_a = this._axios.defaults.headers.post) === null || _a === void 0 ? void 0 : _a[CSRF_TOKEN_HEADER_NAME];
|
|
194
|
+
return (this.csrfTokenGetter() || (typeof defaultToken === 'string' ? defaultToken : undefined));
|
|
195
|
+
}
|
|
196
|
+
shouldUseCsrfTokenForRequest(method, _url) {
|
|
197
|
+
return isMutatingRequestMethod(method);
|
|
198
|
+
}
|
|
166
199
|
}
|
|
167
200
|
//# sourceMappingURL=base.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/services/api/base.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/services/api/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,5 @@ export declare class CodeAssistAPI extends BaseYdbAPI {
|
|
|
6
6
|
getCodeAssistSuggestions(data: PromptFile[]): Promise<Suggestions>;
|
|
7
7
|
sendCodeAssistTelemetry(data: TelemetryEvent): Promise<any>;
|
|
8
8
|
sendCodeAssistOpenTabs(data: TelemetryOpenTabs): Promise<any>;
|
|
9
|
+
protected shouldUseCsrfTokenForRequest(method?: string, url?: string): boolean;
|
|
9
10
|
}
|
|
@@ -93,5 +93,19 @@ export class CodeAssistAPI extends BaseYdbAPI {
|
|
|
93
93
|
collectRequest: false,
|
|
94
94
|
});
|
|
95
95
|
}
|
|
96
|
+
shouldUseCsrfTokenForRequest(method, url) {
|
|
97
|
+
if (!super.shouldUseCsrfTokenForRequest(method, url)) {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
if (!url || !CODE_ASSISTANT_BACKEND) {
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
try {
|
|
104
|
+
return new URL(url, window.location.origin).origin === window.location.origin;
|
|
105
|
+
}
|
|
106
|
+
catch (_a) {
|
|
107
|
+
return true;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
96
110
|
}
|
|
97
111
|
//# sourceMappingURL=codeAssist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeAssist.js","sourceRoot":"","sources":["../../../src/services/api/codeAssist.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codeAssist.js","sourceRoot":"","sources":["../../../src/services/api/codeAssist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import { AuthAPI } from './auth';
|
|
3
|
+
import type { CsrfTokenGetter } from './base';
|
|
3
4
|
import { CodeAssistAPI } from './codeAssist';
|
|
4
5
|
import { MetaAPI } from './meta';
|
|
5
6
|
import { MetaSettingsAPI } from './metaSettings';
|
|
@@ -18,7 +19,7 @@ interface YdbEmbeddedAPIProps {
|
|
|
18
19
|
proxyMeta: undefined | boolean;
|
|
19
20
|
useRelativePath: undefined | boolean;
|
|
20
21
|
useMetaSettings: undefined | boolean;
|
|
21
|
-
csrfTokenGetter: undefined |
|
|
22
|
+
csrfTokenGetter: undefined | CsrfTokenGetter;
|
|
22
23
|
defaults: undefined | AxiosRequestConfig;
|
|
23
24
|
}
|
|
24
25
|
export declare class YdbEmbeddedAPI {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { codeAssistBackend } from '../../store';
|
|
2
2
|
import { AuthAPI } from './auth';
|
|
3
|
+
import { getCsrfTokenFromCookie } from './base';
|
|
3
4
|
import { CodeAssistAPI } from './codeAssist';
|
|
4
5
|
import { MetaAPI } from './meta';
|
|
5
6
|
import { MetaSettingsAPI } from './metaSettings';
|
|
@@ -12,8 +13,7 @@ import { TabletsAPI } from './tablets';
|
|
|
12
13
|
import { VDiskAPI } from './vdisk';
|
|
13
14
|
import { ViewerAPI } from './viewer';
|
|
14
15
|
export class YdbEmbeddedAPI {
|
|
15
|
-
constructor({ webVersion = false, withCredentials = false, singleClusterMode = true, proxyMeta = false, csrfTokenGetter =
|
|
16
|
-
var _a, _b, _c;
|
|
16
|
+
constructor({ webVersion = false, withCredentials = false, singleClusterMode = true, proxyMeta = false, csrfTokenGetter = getCsrfTokenFromCookie, defaults = {}, useRelativePath = false, useMetaSettings = false, }) {
|
|
17
17
|
const axiosParams = {
|
|
18
18
|
config: {
|
|
19
19
|
withCredentials,
|
|
@@ -24,7 +24,7 @@ export class YdbEmbeddedAPI {
|
|
|
24
24
|
},
|
|
25
25
|
},
|
|
26
26
|
};
|
|
27
|
-
const baseApiParams = { singleClusterMode, proxyMeta, useRelativePath };
|
|
27
|
+
const baseApiParams = { singleClusterMode, proxyMeta, useRelativePath, csrfTokenGetter };
|
|
28
28
|
this.auth = new AuthAPI(axiosParams, baseApiParams);
|
|
29
29
|
if (webVersion) {
|
|
30
30
|
this.meta = new MetaAPI(axiosParams, baseApiParams);
|
|
@@ -43,21 +43,6 @@ export class YdbEmbeddedAPI {
|
|
|
43
43
|
this.tablets = new TabletsAPI(axiosParams, baseApiParams);
|
|
44
44
|
this.vdisk = new VDiskAPI(axiosParams, baseApiParams);
|
|
45
45
|
this.viewer = new ViewerAPI(axiosParams, baseApiParams);
|
|
46
|
-
const token = csrfTokenGetter();
|
|
47
|
-
if (token) {
|
|
48
|
-
this.auth.setCSRFToken(token);
|
|
49
|
-
(_a = this.meta) === null || _a === void 0 ? void 0 : _a.setCSRFToken(token);
|
|
50
|
-
(_b = this.metaSettings) === null || _b === void 0 ? void 0 : _b.setCSRFToken(token);
|
|
51
|
-
(_c = this.codeAssist) === null || _c === void 0 ? void 0 : _c.setCSRFToken(token);
|
|
52
|
-
this.operation.setCSRFToken(token);
|
|
53
|
-
this.pdisk.setCSRFToken(token);
|
|
54
|
-
this.scheme.setCSRFToken(token);
|
|
55
|
-
this.storage.setCSRFToken(token);
|
|
56
|
-
this.streaming.setCSRFToken(token);
|
|
57
|
-
this.tablets.setCSRFToken(token);
|
|
58
|
-
this.vdisk.setCSRFToken(token);
|
|
59
|
-
this.viewer.setCSRFToken(token);
|
|
60
|
-
}
|
|
61
46
|
}
|
|
62
47
|
}
|
|
63
48
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/api/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/api/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAC,sBAAsB,EAAC,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AACrC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AACrC,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAiBnC,MAAM,OAAO,cAAc;IAevB,YAAY,EACR,UAAU,GAAG,KAAK,EAClB,eAAe,GAAG,KAAK,EACvB,iBAAiB,GAAG,IAAI,EACxB,SAAS,GAAG,KAAK,EACjB,eAAe,GAAG,sBAAsB,EACxC,QAAQ,GAAG,EAAE,EACb,eAAe,GAAG,KAAK,EACvB,eAAe,GAAG,KAAK,GACL;QAClB,MAAM,WAAW,GAAwB;YACrC,MAAM,EAAE;gBACJ,eAAe;gBACf,GAAG,QAAQ;gBACX,YAAY,EAAE;oBACV,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY;oBACzB,mBAAmB,EAAE,IAAI;iBAC5B;aACJ;SACJ,CAAC;QACF,MAAM,aAAa,GAAG,EAAC,iBAAiB,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAC,CAAC;QAEvF,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACpD,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YAClB,IAAI,CAAC,YAAY,GAAG,IAAI,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,UAAU,IAAI,iBAAiB,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC5D,CAAC;CACJ"}
|
|
@@ -8,7 +8,5 @@ export interface StreamQueryOptions {
|
|
|
8
8
|
onSessionChunk: (chunk: SessionChunk) => void;
|
|
9
9
|
}
|
|
10
10
|
export declare class StreamingAPI extends BaseYdbAPI {
|
|
11
|
-
private csrfToken?;
|
|
12
|
-
setCSRFToken: (token: string) => void;
|
|
13
11
|
streamQuery<Action extends Actions>(params: StreamQueryParams<Action>, options: StreamQueryOptions): Promise<void>;
|
|
14
12
|
}
|
|
@@ -5,7 +5,7 @@ import { readSettingValueFromLS } from '../../store/reducers/settings/utils';
|
|
|
5
5
|
import { DEV_ENABLE_TRACING_FOR_ALL_REQUESTS } from '../../utils/constants';
|
|
6
6
|
import { EXTRACTABLE_RESPONSE_HEADERS } from '../../utils/errors/extractErrorDetails';
|
|
7
7
|
import { isRedirectToAuth } from '../../utils/response';
|
|
8
|
-
import { BaseYdbAPI } from './base';
|
|
8
|
+
import { BaseYdbAPI, CSRF_TOKEN_HEADER_NAME } from './base';
|
|
9
9
|
import { readPartText } from './streamingPartReader';
|
|
10
10
|
import { isNeedResetResponse, processNeedReset } from './utils/needReset';
|
|
11
11
|
/**
|
|
@@ -40,12 +40,6 @@ function createStreamingResponseError(response, responseData) {
|
|
|
40
40
|
}
|
|
41
41
|
const BOUNDARY = 'boundary';
|
|
42
42
|
export class StreamingAPI extends BaseYdbAPI {
|
|
43
|
-
constructor() {
|
|
44
|
-
super(...arguments);
|
|
45
|
-
this.setCSRFToken = (token) => {
|
|
46
|
-
this.csrfToken = token;
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
43
|
async streamQuery(params, options) {
|
|
50
44
|
var _a;
|
|
51
45
|
const base64 = params.base64;
|
|
@@ -55,8 +49,9 @@ export class StreamingAPI extends BaseYdbAPI {
|
|
|
55
49
|
Accept: 'multipart/form-data',
|
|
56
50
|
'Content-Type': 'application/json',
|
|
57
51
|
});
|
|
58
|
-
|
|
59
|
-
|
|
52
|
+
const csrfToken = this.getCsrfToken();
|
|
53
|
+
if (csrfToken) {
|
|
54
|
+
headers.set(CSRF_TOKEN_HEADER_NAME, csrfToken);
|
|
60
55
|
}
|
|
61
56
|
if (params.tracingLevel) {
|
|
62
57
|
headers.set('X-Trace-Verbosity', String(params.tracingLevel));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../src/services/api/streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EACH,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,iBAAiB,GACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,sBAAsB,EAAC,MAAM,qCAAqC,CAAC;AAQ3E,OAAO,EAAC,mCAAmC,EAAC,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAC,4BAA4B,EAAC,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../src/services/api/streaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,13 +85,18 @@ export class ViewerAPI extends BaseYdbAPI {
|
|
|
85
85
|
}, { concurrentId, requestConfig: { signal } });
|
|
86
86
|
}
|
|
87
87
|
getDescribe({ path, database, timeout }, { concurrentId, signal } = {}) {
|
|
88
|
+
const schemaPath = this.getSchemaPath(path);
|
|
88
89
|
return this.get(this.getPath('/viewer/json/describe'), {
|
|
89
90
|
database,
|
|
90
|
-
path:
|
|
91
|
+
path: schemaPath,
|
|
91
92
|
enums: true,
|
|
92
93
|
partition_stats: false,
|
|
93
94
|
subs: 0,
|
|
94
|
-
}, {
|
|
95
|
+
}, {
|
|
96
|
+
concurrentId: concurrentId || `getDescribe|${database}|${schemaPath}`,
|
|
97
|
+
requestConfig: { signal },
|
|
98
|
+
timeout,
|
|
99
|
+
});
|
|
95
100
|
}
|
|
96
101
|
getSchemaAcl({ path, database, dialect }, { concurrentId, signal } = {}) {
|
|
97
102
|
return this.get(this.getPath('/viewer/json/acl'), {
|