chore: fix for 'npm run test'

ytsaurus · Oct 19, 2023 · be28590 · be28590
1 parent ab8cc09
commit be28590
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 30 deletions.
diff --git a/packages/ui/src/ui/UIFactory.tsx b/packages/ui/src/ui/UIFactory.tsx
@@ -23,7 +23,7 @@ import {YTSubjectSuggest} from './components/ACL/SubjectsControl/YTSubjectSugges
 import RoleActions, {Props as RoleActionsProps} from './components/ACL/RoleActions';
 import OperationDetailMonitorLinks from './pages/operations/OperationDetail/tabs/monitor/OperationDetailsMonitorLinks';
 import {PERMISSIONS_SETTINGS} from './constants/acl';
-import {uiSettings} from './config';
+import {uiSettings} from './config/ui-settings';
 import YT from './config/yt-config';
 
 type HeaderItemOrPage =

diff --git a/packages/ui/src/ui/common/thor/unipika-settings.ts b/packages/ui/src/ui/common/thor/unipika-settings.ts
@@ -1,5 +1,5 @@
 import {createSelector} from 'reselect';
-import {uiSettings} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 import {rumLogError} from '../../rum/rum-counter';
 import {Settings} from '../../components/Yson/StructuredYson/StructuredYsonTypes';
 

diff --git a/packages/ui/src/ui/common/thor/unipika.ts b/packages/ui/src/ui/common/thor/unipika.ts
@@ -10,7 +10,7 @@ import {
     shouldShowDecoded,
     useBinaryAsHex,
 } from '../../store/selectors/settings';
-import {Settings} from '../../components/Yson/StructuredYson/StructuredYsonTypes';
+import type {Settings} from '../../components/Yson/StructuredYson/StructuredYsonTypes';
 import {getUnipikaSettingsFromConfig} from './unipika-settings';
 
 const parseSetting = hammer.utils.parseSetting;

diff --git a/packages/ui/src/ui/common/utils/metrics.ts b/packages/ui/src/ui/common/utils/metrics.ts
@@ -1,4 +1,4 @@
-import {getConfigData} from '../../config';
+import {getConfigData} from '../../config/ui-settings';
 import YT from '../../config/yt-config';
 import {rumLogError} from '../../rum/rum-counter';
 

diff --git a/packages/ui/src/ui/components/Linkify/Linkify.tsx b/packages/ui/src/ui/components/Linkify/Linkify.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {Link} from '@gravity-ui/uikit';
-import {uiSettings} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 
 const {trackerBaseUrl} = uiSettings;
 

diff --git a/packages/ui/src/ui/components/PreloaderErrors/ConnectionErrorRegion.js b/packages/ui/src/ui/components/PreloaderErrors/ConnectionErrorRegion.js
@@ -8,7 +8,8 @@ import withBlockedNavigation from '../../hocs/withBlockedNavigation';
 import Button from '../Button/Button';
 import {getGlobalError} from '../../store/selectors/global';
 import {showErrorPopup} from '../../utils/utils';
-import {isDocsAllowed, uiSettings} from '../../config';
+import {isDocsAllowed} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 import UIFactory from '../../UIFactory';
 
 const b = block('preloader');

diff --git a/packages/ui/src/ui/components/StarTrackLink/StarTrackLink.tsx b/packages/ui/src/ui/components/StarTrackLink/StarTrackLink.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Link from '../Link/Link';
-import {uiSettings} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 
 function StarTrackLink(props: {id: string; emptyContent?: React.ReactNode}) {
     const {id, emptyContent = null, ...rest} = props;

diff --git a/packages/ui/src/ui/config/index.ts b/packages/ui/src/ui/config/index.ts
@@ -1,13 +1,8 @@
 import _ from 'lodash';
-import {ConfigData} from '../../shared/yt-types';
+// TODO: get rid of the import, the file should not import UIFactory
 import UIFactory from '../UIFactory';
 
-export function getConfigData(): ConfigData {
-    return (window as any).__DATA__;
-}
-
-export const uiSettings: Partial<Required<ConfigData>['uiSettings']> =
-    getConfigData()?.uiSettings || {};
+import {getConfigData, uiSettings} from './ui-settings';
 
 export function hasOdinPage() {
     return getConfigData().odinPageEnabled;

diff --git a/packages/ui/src/ui/config/ui-settings.ts b/packages/ui/src/ui/config/ui-settings.ts
@@ -0,0 +1,8 @@
+import type {ConfigData} from '../../shared/yt-types';
+
+export function getConfigData(): ConfigData {
+    return (window as any).__DATA__;
+}
+
+export const uiSettings: Partial<Required<ConfigData>['uiSettings']> =
+    getConfigData()?.uiSettings || {};
diff --git a/packages/ui/src/ui/containers/Host/Host.tsx b/packages/ui/src/ui/containers/Host/Host.tsx
@@ -6,7 +6,7 @@ import {getCluster} from '../../store/selectors/global';
 import Link from '../../components/Link/Link';
 import ClipboardButton from '../../components/ClipboardButton/ClipboardButton';
 import {Tooltip} from '../../components/Tooltip/Tooltip';
-import {uiSettings} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 
 import './Host.scss';
 

diff --git a/packages/ui/src/ui/containers/MaintenancePage/MaintenancePage.js b/packages/ui/src/ui/containers/MaintenancePage/MaintenancePage.js
@@ -15,7 +15,7 @@ import withBlockedNavigation from '../../hocs/withBlockedNavigation';
 import Icon from '../../components/Icon/Icon';
 import Button from '../../components/Button/Button';
 import {Linkify} from '../../components/Linkify/Linkify';
-import {uiSettings} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 
 import './MaintenancePage.scss';
 

diff --git a/packages/ui/src/ui/containers/SettingsPanel/settings-description.tsx b/packages/ui/src/ui/containers/SettingsPanel/settings-description.tsx
@@ -23,7 +23,8 @@ import shieldIcon from '../../../../img/svg/shield-icon.svg';
 import tableIcon from '../../../../img/svg/table-icon.svg';
 import infoIcon from '../../../../img/svg/info-icon.svg';
 import {useClusterFromLocation} from '../../hooks/use-cluster';
-import {docsUrl, uiSettings} from '../../config/index';
+import {docsUrl} from '../../config/index';
+import {uiSettings} from '../../config/ui-settings';
 
 import ypath from '../../common/thor/ypath';
 

diff --git a/packages/ui/src/ui/pages/components/tabs/Versions/VersionCell.tsx b/packages/ui/src/ui/pages/components/tabs/Versions/VersionCell.tsx
@@ -11,7 +11,7 @@ import './VersionCell.scss';
 import {useDispatch} from 'react-redux';
 import {changeVersionStateTypeFilters} from '../../../../store/actions/components/versions/versions_v2';
 import {Tooltip} from '../../../../components/Tooltip/Tooltip';
-import {uiSettings} from '../../../../config';
+import {uiSettings} from '../../../../config/ui-settings';
 
 const block = cn('version-cell');
 

diff --git a/packages/ui/src/ui/pages/navigation/content/Table/DownloadManager/DownloadManager.js b/packages/ui/src/ui/pages/navigation/content/Table/DownloadManager/DownloadManager.js
@@ -36,15 +36,16 @@ import {
 import {getColumns} from '../../../../../store/selectors/navigation/content/table-ts';
 
 import './DownloadManager.scss';
-import {docsUrl, getConfigData} from '../../../../../config';
+import {docsUrl} from '../../../../../config';
+import {uiSettings} from '../../../../../config/ui-settings';
 import SeparatorInput, {prepareSeparatorValue} from './SeparatorInput';
 import UIFactory from '../../../../../UIFactory';
 import {makeDirectDownloadPath} from '../../../../../utils/navigation';
 
 const block = cn('table-download-manager');
 const messageBlock = cn('elements-message');
 
-const EXCEL_BASE_URL = getConfigData()?.uiSettings?.exportTableBaseUrl;
+const EXCEL_BASE_URL = uiSettings?.exportTableBaseUrl;
 
 function checkExcelExporter(cluster) {
     if (!EXCEL_BASE_URL) {

diff --git a/packages/ui/src/ui/pages/navigation/content/Table/TableOverview/ColumnSelectorButton.tsx b/packages/ui/src/ui/pages/navigation/content/Table/TableOverview/ColumnSelectorButton.tsx
@@ -14,7 +14,7 @@ import {getSchemaStrict} from '../../../../../store/selectors/navigation/tabs/sc
 import {Secondary} from '../../../../../components/Text/Text';
 import ColumnsPresetButton from './ColumnsPresetButton';
 import {RootState} from '../../../../../store/reducers';
-import {getConfigData} from '../../../../../config';
+import {getConfigData} from '../../../../../config/ui-settings';
 
 ColumnSelectorButton.propTypes = {
     // from parent

diff --git a/packages/ui/src/ui/pages/navigation/content/Table/TableOverview/DatalensButton.tsx b/packages/ui/src/ui/pages/navigation/content/Table/TableOverview/DatalensButton.tsx
@@ -11,7 +11,8 @@ import {Secondary, Warning} from '../../../../../components/Text/Text';
 import Link from '../../../../../components/Link/Link';
 import {getNavigationPathAttributesLoadState} from '../../../../../store/selectors/navigation/navigation';
 import {LOADING_STATUS} from '../../../../../constants';
-import {docsUrl, uiSettings} from '../../../../../config';
+import {docsUrl} from '../../../../../config';
+import {uiSettings} from '../../../../../config/ui-settings';
 import UIFactory from '../../../../../UIFactory';
 
 export default function DataLensButton({className}: {className: string}) {

diff --git a/.../ui/src/ui/pages/operations/OperationDetail/tabs/monitor/OperationDetailsMonitorLinks.tsx b/.../ui/src/ui/pages/operations/OperationDetail/tabs/monitor/OperationDetailsMonitorLinks.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import cn from 'bem-cn-lite';
 import type {OperationMonitoringTabProps} from '../../../../../UIFactory';
-import {uiSettings} from '../../../../../config';
+import {uiSettings} from '../../../../../config/ui-settings';
 import Icon from '../../../../../components/Icon/Icon';
 import Link from '../../../../../components/Link/Link';
 import Error from '../../../../../components/Error/Error';

diff --git a/packages/ui/src/ui/rum/rum-counter.ts b/packages/ui/src/ui/rum/rum-counter.ts
@@ -133,9 +133,10 @@ export function rumSendFrameworkInited() {
     return RUM.sendTimeMark('3036');
 }
 
-const ENABLE_RUM_DEBUG_2 = -1 !== window.location.search.slice(1).split('&').indexOf('rumdebug=2');
+const ENABLE_RUM_DEBUG_2 =
+    -1 !== window.location?.search?.slice(1).split('&').indexOf('rumdebug=2');
 const ENABLE_RUM_DEBUG =
-    ENABLE_RUM_DEBUG_2 || -1 !== window.location.search.slice(1).split('&').indexOf('rumdebug=1');
+    ENABLE_RUM_DEBUG_2 || -1 !== window.location?.search?.slice(1).split('&').indexOf('rumdebug=1');
 
 const startTime = Date.now();
 

diff --git a/packages/ui/src/ui/store/actions/global/index.ts b/packages/ui/src/ui/store/actions/global/index.ts
@@ -32,7 +32,7 @@ import {YTApiId, ytApiV3Id} from '../../../rum/rum-wrap-api';
 import {getWindowStore} from '../../../store/window-store';
 import {reloadUserSettings} from '../settings';
 import YT from '../../../config/yt-config';
-import {getConfigData} from '../../../config';
+import {getConfigData} from '../../../config/ui-settings';
 
 export function setTheme(theme: 'light' | 'dark' | 'system' | 'light-hc' | 'dark-hc') {
     return {type: GLOBAL_SET_THEME, data: theme};

diff --git a/packages/ui/src/ui/store/selectors/global/index.ts b/packages/ui/src/ui/store/selectors/global/index.ts
@@ -13,7 +13,7 @@ import {getClusterNS} from '../settings';
 import {ClusterConfig} from '../../../../shared/yt-types';
 import {FIX_MY_TYPE} from '../../../types';
 import UIFactory from '../../../UIFactory';
-import {getConfigData, ytApiUseCORS} from '../../../config';
+import {getConfigData} from '../../../config/ui-settings';
 import {isSupportedYtTvmAPIGlobal} from '../thor/support';
 
 export const getGlobalError = (state: RootState) => state.global.error.error;
@@ -54,7 +54,7 @@ export function getClusterConfigByName(clusterName: string): ClusterConfig {
 }
 
 export function isAllowYtTwmApi() {
-    return !ytApiUseCORS() && isSupportedYtTvmAPIGlobal();
+    return !getConfigData().ytApiUseCORS && isSupportedYtTvmAPIGlobal();
 }
 
 export function getClusterProxy(clusterConfig: ClusterConfig): string {

diff --git a/packages/ui/src/ui/store/selectors/settings-ts.ts b/packages/ui/src/ui/store/selectors/settings-ts.ts
@@ -6,7 +6,7 @@ import {AccountUsageViewType} from '../reducers/accounts/usage/accounts-usage-fi
 import {AccountUsageDataItem} from '../../store/reducers/accounts/usage/account-usage-types';
 import {ActiveJobTypesMap} from '../../store/actions/settings/settings';
 import {RootState} from '../../store/reducers';
-import {uiSettings} from '../../config';
+import {uiSettings} from '../../config/ui-settings';
 import _ from 'lodash';
 import {NODE_TYPE} from '../../../shared/constants/system';
 import {ValueOf} from '../../../@types/types';

diff --git a/packages/ui/src/ui/utils/errors/index.ts b/packages/ui/src/ui/utils/errors/index.ts
@@ -1,7 +1,7 @@
 // @ts-expect-error
 import yt from '@ytsaurus/javascript-wrapper/lib/yt';
 
-import {YTError} from '../../types';
+import type {YTError} from '../../types';
 
 export function getErrorWithCode(errors: YTError[], code: number): YTError | undefined {
     const queue: YTError[] = [...errors];