Merge branch 'main' into CHARTS-10604

datalens-tech · Dec 2, 2024 · fe5bc32 · fe5bc32
2 parents f93805a + 4ce8e03
commit fe5bc32
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 36 deletions.
diff --git a/src/server/components/features/features-list/UseNavigation.ts b/src/server/components/features/features-list/UseNavigation.ts
diff --git a/src/shared/types/feature.ts b/src/shared/types/feature.ts
@@ -14,7 +14,6 @@ export enum Feature {
     EnableAutocreateDataset = 'EnableAutocreateDataset',
     ShowCreateEntryWithMenu = 'ShowCreateEntryWithMenu',
     RevisionsListNoLimit = 'RevisionsListNoLimit',
-    UseNavigation = 'UseNavigation',
     AuthUpdateWithTimeout = 'AuthUpdateWithTimeout',
     UseComponentHeader = 'UseComponentHeader',
     FetchDocumentation = 'FetchDocumentation',

diff --git a/src/ui/components/DashKit/helpers.tsx b/src/ui/components/DashKit/helpers.tsx
@@ -1,5 +1,3 @@
-import {DL} from 'constants/common';
-
 import React from 'react';
 
 import type {ConfigItem, DashKitProps, ItemState} from '@gravity-ui/dashkit';
@@ -10,9 +8,8 @@ import {Icon} from '@gravity-ui/uikit';
 import block from 'bem-cn-lite';
 import {I18n} from 'i18n';
 import type {DashChartRequestContext, StringParams} from 'shared';
-import {DashTabItemControlSourceType, DashTabItemType, Feature} from 'shared';
+import {DashTabItemControlSourceType, DashTabItemType} from 'shared';
 import {DashKitOverlayMenuQa} from 'shared/constants/qa/dash';
-import {Utils} from 'ui';
 import {ExtendedDashKitContext} from 'ui/units/dash/utils/context';
 
 import {getEndpointForNavigation} from '../../libs/DatalensChartkit/modules/navigation';
@@ -58,10 +55,7 @@ export function getEditLink(configItem: ConfigItem, params: StringParams, state:
     }
 
     // does not work properly in DEV mode without navigator
-    const endpoint = getEndpointForNavigation(
-        DL.ENDPOINTS,
-        Utils.isEnabledFeature(Feature.UseNavigation),
-    );
+    const endpoint = getEndpointForNavigation();
 
     const linkParams = removeEmptyParams(params);
 

diff --git a/src/ui/libs/DatalensChartkit/Error/Error.tsx b/src/ui/libs/DatalensChartkit/Error/Error.tsx
@@ -7,7 +7,7 @@ import {I18n, i18n} from 'i18n';
 import isEmpty from 'lodash/isEmpty';
 import uniqBy from 'lodash/uniqBy';
 import {useDispatch} from 'react-redux';
-import {ChartkitMenuDialogsQA, ErrorCode, Feature} from 'shared';
+import {ChartkitMenuDialogsQA, ErrorCode} from 'shared';
 import {isEmbeddedEntry} from 'ui/utils/embedded';
 
 import {DL, Interpolate, Utils} from '../../..';
@@ -169,10 +169,7 @@ const ChartKitError: React.FC<any> = (props) => {
                 iconData = Lock;
                 const entryId = error?.debug?.entryId;
                 if (entryId) {
-                    const endpoint = getEndpointForNavigation(
-                        DL.ENDPOINTS,
-                        Utils.isEnabledFeature(Feature.UseNavigation),
-                    );
+                    const endpoint = getEndpointForNavigation();
                     const text = i18n('component.chartkit-error.codes', code);
                     const href = `${endpoint}/${entryId}`;
 

diff --git a/src/ui/libs/DatalensChartkit/menu/MenuItems.tsx b/src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
@@ -177,9 +177,7 @@ export const getEditMenuItem = ({
                 (dataProvider || chartsDataProvider)?.getGoAwayLink(
                     {loadedData, propsData},
                     {
-                        idPrefix: Utils.isEnabledFeature(Feature.UseNavigation)
-                            ? '/navigation/'
-                            : '/navigate/',
+                        idPrefix: '/navigate/',
                     },
                 ),
             );

diff --git a/src/ui/libs/DatalensChartkit/modules/navigation.ts b/src/ui/libs/DatalensChartkit/modules/navigation.ts
@@ -1,6 +1,3 @@
-export function getEndpointForNavigation(
-    endpoints: Record<string, string>,
-    useNavigation = false,
-): string {
-    return useNavigation ? `${endpoints.charts}/navigation` : '/navigate';
+export function getEndpointForNavigation(): string {
+    return '/navigate';
 }
diff --git a/src/ui/units/dash/modules/helpers.ts b/src/ui/units/dash/modules/helpers.ts
@@ -23,7 +23,7 @@ import type {
     StringParams,
     WorkbookId,
 } from 'shared';
-import {DashTabItemType, Feature, resolveOperation} from 'shared';
+import {DashTabItemType, resolveOperation} from 'shared';
 import {COPIED_WIDGET_STORAGE_KEY, DL, Utils} from 'ui';
 import {registry} from 'ui/registry';
 import {collectWidgetItemIds} from 'ui/utils/copyItems';
@@ -175,9 +175,7 @@ export function addOperationForValue(args: {
 }
 
 export function getChartEditLink(entryId: string) {
-    return Utils.isEnabledFeature(Feature.UseNavigation)
-        ? `${window.DL.endpoints.charts}/navigation/${entryId}`
-        : `/navigate/${entryId}`;
+    return `/navigate/${entryId}`;
 }
 
 export function deepAssign(...args: any) {