Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
548e2ed
Add entry zod schemas
Jun 30, 2025
ca6789f
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
Jun 30, 2025
cf9a3b7
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
Jul 2, 2025
7b96f7b
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
Jul 15, 2025
6e16468
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
Jul 17, 2025
0efbbd7
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
Jul 21, 2025
f6b1eb1
Added public-api export
Jul 23, 2025
9f50ea3
Swagger
Jul 31, 2025
0b20b13
Add wizard api hanlers
Aug 4, 2025
d6a4680
Wizard Hierarchy fix
Aug 4, 2025
c7eb299
Wizard update and create
Aug 4, 2025
08a08a1
Fix types and comment
Aug 4, 2025
5356131
Added actions
Aug 6, 2025
fafce39
Dash descriptions
Aug 8, 2025
33915fb
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
Aug 12, 2025
9e87f79
Public api features (#2800)
stepanenkoxx Aug 29, 2025
d6830ef
Merge branch 'main' into CHARTS-11469-schema
stepanenkoxx Sep 3, 2025
8fcbfd2
Split api and public api (#2839)
stepanenkoxx Sep 7, 2025
b88c016
Add packages
stepanenkoxx Sep 8, 2025
2f1bd24
Merge branch 'main' into CHARTS-11469-schema
stepanenkoxx Sep 8, 2025
2242111
Fixes
stepanenkoxx Sep 8, 2025
23e96e0
Fixes
stepanenkoxx Sep 8, 2025
d98cb39
Fixes
stepanenkoxx Sep 8, 2025
f99ffe7
Fixes
stepanenkoxx Sep 9, 2025
eafd00f
Fixes
stepanenkoxx Sep 9, 2025
2c62320
Fixes
stepanenkoxx Sep 9, 2025
f05fe9a
Fixes
stepanenkoxx Sep 10, 2025
c1926b0
Fixes
stepanenkoxx Sep 10, 2025
ef227f1
Fixes
stepanenkoxx Sep 10, 2025
fc03943
Fixes
stepanenkoxx Sep 10, 2025
b71dffb
Fixes
stepanenkoxx Sep 10, 2025
d6bc6ce
Fixes
stepanenkoxx Sep 11, 2025
90f164b
Merge branch 'main' into CHARTS-11469-schema
stepanenkoxx Sep 11, 2025
ee32104
Fixes
stepanenkoxx Sep 11, 2025
4c1a1b4
Fixes
stepanenkoxx Sep 11, 2025
c409620
Fixes
stepanenkoxx Sep 11, 2025
b2c46d8
Fixes
stepanenkoxx Sep 11, 2025
1f6a310
Fixes
stepanenkoxx Sep 11, 2025
d84109f
Fixes
stepanenkoxx Sep 15, 2025
d4a8348
Review fixes
stepanenkoxx Sep 15, 2025
dfacf28
Merge branch 'main' into CHARTS-11469-schema
stepanenkoxx Sep 15, 2025
20c64a6
Remove not ready schemas
stepanenkoxx Sep 15, 2025
4dee5d0
Remove not ready schemas
stepanenkoxx Sep 15, 2025
5c2d0ce
Fix ts
stepanenkoxx Sep 15, 2025
74cc9c0
Fixes
stepanenkoxx Sep 15, 2025
650278d
Revert "Fixes"
stepanenkoxx Sep 15, 2025
6676af3
Revert "Fix ts"
stepanenkoxx Sep 15, 2025
9964995
Revert "Remove not ready schemas"
stepanenkoxx Sep 15, 2025
74a35f3
Revert "Remove not ready schemas"
stepanenkoxx Sep 15, 2025
3095744
Fixes
stepanenkoxx Sep 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/server/app-env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ export {
isDatalensMode,
isFullMode,
isApiMode,
isPublicApiMode,
} from '../../src/server/app-env';
9 changes: 9 additions & 0 deletions api/server/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,12 @@ export {
} from '../../src/server/components/charts-engine';

export {renderHTML} from '../../src/server/components/charts-engine/components/markdown';

export {initPublicApiSwagger} from '../../src/server/components/public-api';

export {PUBLIC_API_PROXY_MAP, PUBLIC_API_ROUTE} from '../../src/server/components/public-api';
export type {
PublicApiRpcMap,
PublicApiConfig,
PublicApiSecuritySchemes,
} from '../../src/server/components/public-api/types';
1 change: 1 addition & 0 deletions api/server/constants.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export {SERVICE_NAME_DATALENS} from '../../src/server/constants';
export {IPV6_AXIOS_OPTIONS} from '../../src/server/constants/axios';
export {PUBLIC_API_ORG_ID_HEADER} from '../../src/server/constants/public-api';
1 change: 1 addition & 0 deletions api/server/controllers.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export {ping} from '../../src/server/controllers/ping';
export {chartsController} from '../../src/server/components/charts-engine/controllers/charts';
export {createPublicApiController} from '../../src/server/controllers';
100 changes: 89 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"author": "DataLens Team <https://github.com/datalens-tech>",
"license": "Apache-2.0",
"dependencies": {
"@asteasolutions/zod-to-openapi": "^7.3.4",
"@braintree/sanitize-url": "^6.0.0",
"@datalens-tech/ui-sandbox-modules": "^0.36.0",
"@datalens-tech/xlsx": "^0.20.1",
Expand Down Expand Up @@ -118,7 +119,9 @@
"request-ip": "^3.3.0",
"request-promise-native": "^1.0.9",
"set-cookie-parser": "^2.7.1",
"workerpool": "^9.1.1"
"swagger-ui-express": "^5.0.1",
"workerpool": "^9.1.1",
"zod": "^3.25.64"
},
"devDependencies": {
"@floating-ui/react": "^0.27.13",
Expand Down Expand Up @@ -181,6 +184,7 @@
"@types/request-ip": "^0.0.41",
"@types/request-promise-native": "^1.0.21",
"@types/set-cookie-parser": "^2.4.10",
"@types/swagger-ui-express": "^4.1.8",
"@types/uuid": "^9.0.8",
"@types/webpack-env": "^1.16.0",
"bem-cn-lite": "^4.0.0",
Expand Down
2 changes: 2 additions & 0 deletions src/server/app-env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ export const isFullMode = mode === AppMode.Full;
export const isDatalensMode = mode === AppMode.Datalens;
export const isChartsMode = mode === AppMode.Charts;
export const isApiMode = mode === AppMode.Api;
export const isPublicApiMode = mode === AppMode.PublicApi;

export const isOpensourceInstallation = appInstallation === AppInstallation.Opensource;
1 change: 1 addition & 0 deletions src/server/components/api-docs/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const CONTENT_TYPE_JSON = 'application/json';
1 change: 1 addition & 0 deletions src/server/components/api-docs/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export type {SecuritySchemeObject} from './types';
14 changes: 14 additions & 0 deletions src/server/components/api-docs/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copied from @asteasolutions/zod-to-openapi
export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head' | 'options' | 'trace';

export type SecuritySchemeType = 'apiKey' | 'http' | 'oauth2' | 'openIdConnect';

export type SecuritySchemeObject = {
type: SecuritySchemeType;
description?: string;
name?: string;
in?: string;
scheme?: string;
bearerFormat?: string;
openIdConnectUrl?: string;
};
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
TRACE_ID_HEADER,
US_PUBLIC_API_TOKEN_HEADER,
WORKBOOK_ID_HEADER,
mapChartsConfigToLatestVersion,
} from '../../../../../../shared';
import {ErrorCode, TIMEOUT_10_SEC} from '../../../../../../shared/constants';
import {createErrorHandler} from '../../error-handler';
Expand Down Expand Up @@ -226,7 +227,7 @@ export type ProviderCreateParams = {
recursion?: boolean;
meta?: Record<string, string>;
includePermissionsInfo?: boolean | string;
workbookId: string;
workbookId: string | null;
name: string;
mode?: EntryUpdateMode;
annotation?: EntryAnnotationArgs;
Expand Down Expand Up @@ -357,6 +358,29 @@ export class USProvider {
});
}

static async retrieveParsedWizardChart(
ctx: AppContext,
props: {
id: string;
storageApiPath?: string;
extraAllowedHeaders?: string[];
unreleased: boolean | string;
includeLinks?: boolean | string;
includePermissionsInfo?: boolean | string;
revId?: string;
headers: Request['headers'];
workbookId?: WorkbookId;
includeServicePlan?: boolean;
includeTenantFeatures?: boolean;
},
) {
const result = await USProvider.retrieveById(ctx, props);

result.data = mapChartsConfigToLatestVersion(JSON.parse(result.data.shared)) as any;

return result;
}

static retrieveByKey(
ctx: AppContext,
{
Expand Down Expand Up @@ -610,7 +634,7 @@ export class USProvider {
recursion: boolean;
links?: unknown;
meta: Record<string, string>;
workbookId: string;
workbookId: string | null;
name: string;
includePermissionsInfo?: boolean;
mode: EntryUpdateMode;
Expand Down
Loading
Loading