Support new types of errors in charts and selectors (#1516)

Co-authored-by: WeblateGravity <[email protected]> Co-authored-by: Weblate <[email protected]> Co-authored-by: Darya Tikhonova <[email protected]> Co-authored-by: Matthew Casserly <[email protected]>
datalens-tech · Oct 2, 2024 · 57af1c6 · 57af1c6
1 parent 6225edb
commit 57af1c6
Show file tree

Hide file tree

Showing 31 changed files with 312 additions and 153 deletions.
diff --git a/src/i18n-keysets/common.errors/en.json b/src/i18n-keysets/common.errors/en.json
@@ -0,0 +1,7 @@
+{
+  "label_error-access-message": "This token cannot be used with the specified parameters",
+  "label_error-invalid-format-token-message": "Invalid token format",
+  "label_error-invalid-token-message": "This token is not suitable for this embed",
+  "label_error-outdated-message": "Embed settings expired",
+  "label_error-token-not-found-message": "The embed has no token"
+}
diff --git a/src/i18n-keysets/common.errors/ru.json b/src/i18n-keysets/common.errors/ru.json
@@ -0,0 +1,7 @@
+{
+  "label_error-access-message": "Невозможно использовать токен с заданными параметрами",
+  "label_error-invalid-format-token-message": "Неверный формат токена",
+  "label_error-invalid-token-message": "Токен не подходит для данного встраивания",
+  "label_error-outdated-message": "Настройки встраивания устарели",
+  "label_error-token-not-found-message": "Во встраивании отсутствует токен"
+}
diff --git a/src/i18n-keysets/dash.error.view/en.json b/src/i18n-keysets/dash.error.view/en.json
@@ -1,4 +1,3 @@
 {
-  "label_error-404-message": "Object not found",
-  "label_error-access-message": "No view rights"
+  "label_error-404-message": "Object not found"
 }
diff --git a/src/i18n-keysets/dash.error.view/ru.json b/src/i18n-keysets/dash.error.view/ru.json
@@ -1,4 +1,3 @@
 {
-  "label_error-404-message": "Объект не найден",
-  "label_error-access-message": "Нет прав на просмотр"
+  "label_error-404-message": "Объект не найден"
 }
diff --git a/src/server/components/charts-engine/components/storage/united-storage/provider.ts b/src/server/components/charts-engine/components/storage/united-storage/provider.ts
@@ -21,7 +21,7 @@ import {
     US_PUBLIC_API_TOKEN_HEADER,
     WORKBOOK_ID_HEADER,
 } from '../../../../../../shared';
-import {TIMEOUT_10_SEC} from '../../../../../../shared/constants';
+import {ErrorCode, TIMEOUT_10_SEC} from '../../../../../../shared/constants';
 import {createErrorHandler} from '../../error-handler';
 import {getDuration} from '../../utils';
 import type {ChartEntryData, DashEntryData, EmbeddingInfo} from '../types';
@@ -42,7 +42,6 @@ axiosRetry(axios, {
 });
 
 const ENTRY_NOT_FOUND = 'ENTRY_NOT_FOUND';
-const ENTRY_FORBIDDEN = 'ENTRY_FORBIDDEN';
 const PASSED_PROPERTIES: (keyof Entry)[] = [
     'entryId',
     'data',
@@ -308,7 +307,7 @@ export class USProvider {
                     throw error;
                 } else if (error.response && error.response.status === 403) {
                     error.description = id;
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {
@@ -382,7 +381,7 @@ export class USProvider {
                     throw error;
                 } else if (error.response && error.response.status === 403) {
                     error.description = key;
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {
@@ -438,7 +437,7 @@ export class USProvider {
                     throw error;
                 } else if (error.response && error.response.status === 403) {
                     error.description = 'embedToken';
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {
@@ -496,7 +495,7 @@ export class USProvider {
                     throw error;
                 } else if (error.response && error.response.status === 403) {
                     error.description = 'embedToken and id';
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {
@@ -581,7 +580,7 @@ export class USProvider {
                     error.status = 404;
                     throw error;
                 } else if (error.response && error.response.status === 403) {
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {
@@ -666,7 +665,7 @@ export class USProvider {
                     error.status = 404;
                     throw error;
                 } else if (error.response && error.response.status === 403) {
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {
@@ -706,7 +705,7 @@ export class USProvider {
                     error.status = 404;
                     throw error;
                 } else if (error.response && error.response.status === 403) {
-                    error.code = ENTRY_FORBIDDEN;
+                    error.code = ErrorCode.EntryForbidden;
                     error.status = 403;
                     throw error;
                 } else {

diff --git a/src/server/components/charts-engine/controllers/embedded-entry.ts b/src/server/components/charts-engine/controllers/embedded-entry.ts
@@ -2,7 +2,7 @@ import type {Request, Response} from '@gravity-ui/expresskit';
 import jwt from 'jsonwebtoken';
 import {isObject} from 'lodash';
 
-import {DL_EMBED_TOKEN_HEADER} from '../../../../shared';
+import {DL_EMBED_TOKEN_HEADER, EntryScope, ErrorCode} from '../../../../shared';
 import {resolveConfig} from '../components/storage';
 import type {EmbedResolveConfigProps, ResolveConfigError} from '../components/storage/base';
 
@@ -16,9 +16,9 @@ export const embeddedEntryController = (req: Request, res: Response) => {
     if (!embedToken) {
         ctx.log('CHARTS_ENGINE_NO_TOKEN');
         res.status(400).send({
-            error: 'You must provide embedToken',
+            code: ErrorCode.InvalidTokenFormat,
+            extra: {message: 'You must provide embedToken', hideRetry: true},
         });
-
         return;
     }
 
@@ -27,10 +27,9 @@ export const embeddedEntryController = (req: Request, res: Response) => {
     if (!payload || typeof payload === 'string' || !('embedId' in payload)) {
         ctx.log('CHARTS_ENGINE_WRONG_TOKEN');
         res.status(400).send({
-            code: 'ERR.CHARTS.WRONG_EMBED_TOKEN',
+            code: ErrorCode.InvalidTokenFormat,
             extra: {message: 'Wrong token format', hideRetry: true},
         });
-
         return;
     }
 
@@ -85,16 +84,26 @@ export const embeddedEntryController = (req: Request, res: Response) => {
         })
         .then(async (response) => {
             if (response && 'entry' in response) {
-                const {
-                    entry: {entryId, scope, data},
-                } = response;
-
-                // Add only necessary fields without personal info like createdBy
-                res.status(200).send({
-                    entryId,
-                    scope,
-                    data,
-                });
+                if (response.entry.scope === EntryScope.Dash) {
+                    const {
+                        entry: {entryId, scope, data},
+                    } = response;
+
+                    // Add only necessary fields without personal info like createdBy
+                    res.status(200).send({
+                        entryId,
+                        scope,
+                        data,
+                    });
+                } else {
+                    res.status(400).send({
+                        code: ErrorCode.InvalidToken,
+                        extra: {
+                            message: 'Invalid token',
+                            hideRetry: true,
+                        },
+                    });
+                }
             }
         })
         .catch((error) => {

diff --git a/src/server/components/charts-engine/controllers/embeds.ts b/src/server/components/charts-engine/controllers/embeds.ts
@@ -1,14 +1,25 @@
 import type {Request, Response} from '@gravity-ui/expresskit';
+import type {AxiosError} from 'axios';
 import jwt from 'jsonwebtoken';
 import {isObject} from 'lodash';
 
 import type {ChartsEngine} from '..';
-import {ControlType, DL_EMBED_TOKEN_HEADER, EntryScope} from '../../../../shared';
+import {
+    ControlType,
+    DL_EMBED_TOKEN_HEADER,
+    EntryScope,
+    ErrorCode,
+    isEnabledServerFeature,
+} from '../../../../shared';
 import {resolveConfig} from '../components/storage';
 import type {EmbedResolveConfigProps, ResolveConfigError} from '../components/storage/base';
 import type {ReducedResolvedConfig} from '../components/storage/types';
 import {getDuration, isDashEntry} from '../components/utils';
 
+const isResponseError = (error: unknown): error is AxiosError<{code: string}> => {
+    return Boolean(isObject(error) && 'response' in error && error.response);
+};
+
 export const embedsController = (chartsEngine: ChartsEngine) => {
     return function chartsRunController(req: Request, res: Response) {
         const {ctx} = req;
@@ -28,7 +39,12 @@ export const embedsController = (chartsEngine: ChartsEngine) => {
         if (!embedToken) {
             ctx.log('CHARTS_ENGINE_NO_TOKEN');
             res.status(400).send({
-                error: 'You must provide embedToken',
+                code: ErrorCode.TokenNotFound,
+                extra: {
+                    message: 'You must provide embedToken',
+                    hideRetry: true,
+                    hideDebugInfo: true,
+                },
             });
 
             return;
@@ -39,7 +55,7 @@ export const embedsController = (chartsEngine: ChartsEngine) => {
         if (!payload || typeof payload === 'string' || !('embedId' in payload)) {
             ctx.log('CHARTS_ENGINE_WRONG_TOKEN');
             res.status(400).send({
-                code: 'ERR.CHARTS.WRONG_EMBED_TOKEN',
+                code: ErrorCode.InvalidToken,
                 extra: {message: 'Wrong token format', hideRetry: true, hideDebugInfo: true},
             });
 
@@ -79,6 +95,22 @@ export const embedsController = (chartsEngine: ChartsEngine) => {
 
         Promise.resolve(configPromise)
             .catch((err: unknown) => {
+                if (
+                    isResponseError(err) &&
+                    (err.response?.data.code === ErrorCode.IncorrectEntry ||
+                        err.response?.data.code === ErrorCode.IncorrectDepsIds)
+                ) {
+                    res.status(409).send({
+                        code: ErrorCode.OutdatedDependencies,
+                        extra: {
+                            message: 'Dependecies of embed are outdated',
+                            hideRetry: true,
+                            hideDebugInfo: true,
+                        },
+                    });
+
+                    return;
+                }
                 const error: ResolveConfigError =
                     isObject(err) && 'message' in err ? (err as Error) : new Error(err as string);
                 const result: {
@@ -164,7 +196,12 @@ export const embedsController = (chartsEngine: ChartsEngine) => {
                     entry = embeddingInfo.entry;
                 } else {
                     return res.status(400).send({
-                        error: 'Invalid config format',
+                        code: ErrorCode.InvalidToken,
+                        extra: {
+                            message: 'Invalid token',
+                            hideRetry: true,
+                            hideDebugInfo: true,
+                        },
                     });
                 }
 
@@ -184,6 +221,16 @@ export const embedsController = (chartsEngine: ChartsEngine) => {
                     });
                 }
 
+                if (
+                    !isEnabledServerFeature(ctx, 'EnableChartEditor') &&
+                    runnerFound.name === 'editor'
+                ) {
+                    ctx.log('CHARTS_ENGINE_EDITOR_DISABLED');
+                    return res.status(400).send({
+                        error: 'ChartEditor is disabled',
+                    });
+                }
+
                 req.body.config = entry;
                 req.body.key = entry.key;
 

diff --git a/src/shared/constants/error-codes.ts b/src/shared/constants/error-codes.ts
@@ -28,12 +28,18 @@ export enum ErrorCode {
     NeedReset = 'NEED_RESET',
     MigrationOrgExists = 'MIGRATION_ORG_EXISTS',
     MigrationDenied = 'MIGRATION_DENIED',
-    AccessServicePermissionDenied = 'ACCESS_SERVICE_PERMISSION_DENIED',
-    AccessServiceUnauthenticated = 'ACCESS_SERVICE_UNAUTHENTICATED',
     EntryIsLocked = 'ERR.US.ENTRY_IS_LOCKED',
     EntryAlreadyExists = 'ERR.US.ENTRY_ALREADY_EXISTS',
     UsUniqViolation = 'ERR.US.DB.UNIQUE_VIOLATION',
     ReadOnlyMode = 'READ_ONLY_MODE_ENABLED',
+    InvalidTokenFormat = 'ERR.CHARTS.INVALID_TOKEN_FORMAT',
+    TokenNotFound = 'ERR.CHARTS.TOKEN_NOT_FOUND',
+    InvalidToken = 'ERR.CHARTS.INVALID_TOKEN',
+    OutdatedDependencies = 'ERR.CHARTS.OUTDATED_DEPENDENCIES',
+    EntryForbidden = 'ERR.US.ENTRY_FORBIDDEN',
+
+    IncorrectEntry = 'INCORRECT_ENTRY_ID_FOR_EMBED',
+    IncorrectDepsIds = 'INCORRECT_DEPS_IDS_FOR_EMBED',
 }
 
 export const ErrorContentTypes = {

diff --git a/src/ui/assets/icons/error-chart.svg b/src/ui/assets/icons/error-chart.svg
diff --git a/src/ui/assets/icons/error-database.svg b/src/ui/assets/icons/error-database.svg
diff --git a/src/ui/assets/icons/error-lock.svg b/src/ui/assets/icons/error-lock.svg
diff --git a/src/ui/components/DashKit/helpers.tsx b/src/ui/components/DashKit/helpers.tsx
@@ -117,6 +117,7 @@ interface DashkitWrapperProps extends DashKitProps {
     // Extended Controls props
     skipReload?: boolean;
     isNewRelations?: boolean;
+    hideErrorDetails?: boolean;
 }
 
 export const DashkitWrapper: React.FC<

diff --git a/src/ui/components/DashKit/plugins/Control/ControlItems/ControlItemSelect.scss b/src/ui/components/DashKit/plugins/Control/ControlItems/ControlItemSelect.scss
@@ -13,8 +13,8 @@
             flex-direction: column;
             align-items: flex-start;
             justify-content: space-around;
-            height: 70px;
-            width: 180px;
+            gap: 12px;
+            padding: 6px;
         }
 
         &_mobile {