chore(Queries): remove isQueryTrackerAllowed selector [YTFRONT-4463]

ytsaurus · Nov 26, 2024 · c132a20 · c132a20
1 parent 26a6c0a
commit c132a20
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 53 deletions.
diff --git a/packages/ui/src/ui/UIFactory/index.tsx b/packages/ui/src/ui/UIFactory/index.tsx
@@ -426,7 +426,7 @@ export interface UIFactory {
 
     getAclPermissionsSettings(): typeof PERMISSIONS_SETTINGS;
 
-    onChytAliasSqlClick(params: {alias: string; cluster: string}): void;
+    onChytAliasSqlClick?: (params: {alias: string; cluster: string}) => void;
 
     getNavigationExtraTabs(): Array<ExtraTab>;
 

diff --git a/packages/ui/src/ui/containers/AppNavigation/TopRowContent/TopRowContent.tsx b/packages/ui/src/ui/containers/AppNavigation/TopRowContent/TopRowContent.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import {useSelector} from 'react-redux';
 
 import {getGlobalLoadState} from '../../../store/selectors/global';
-import {isQueryTrackerAllowed} from '../../../store/selectors/global/experimental-pages';
 
 import {LOADING_STATUS, Page} from '../../../constants/index';
 import {Route, Switch} from 'react-router';
@@ -30,7 +29,6 @@ import {QueryTrackerTopRowLazy} from '../../../pages/query-tracker/lazy';
 
 export default function TopRowContent() {
     const loadState = useSelector(getGlobalLoadState);
-    const allowQT = useSelector(isQueryTrackerAllowed);
 
     return loadState !== LOADING_STATUS.LOADED ? null : (
         <Switch>
@@ -50,12 +48,10 @@ export default function TopRowContent() {
             <Route path={`/:cluster/${Page.DASHBOARD}`} component={DashboardTopRowLazy} />
             <Route path={`/:cluster/${Page.COMPONENTS}`} component={ComponentsTopRowLazy} />
             <Route path={`/:cluster/${Page.CHYT}`} component={ChytPageTopRowLazy} />
-            {allowQT && (
-                <Route
-                    path={`/:cluster/${Page.QUERIES}`}
-                    component={withLazyLoading(QueryTrackerTopRowLazy)}
-                />
-            )}
+            <Route
+                path={`/:cluster/${Page.QUERIES}`}
+                component={withLazyLoading(QueryTrackerTopRowLazy)}
+            />
             {hasOdinPage() && (
                 <Route
                     path={`/:cluster/${odinPageInfo.pageId}`}

diff --git a/packages/ui/src/ui/containers/ClusterPage/ClusterPage.js b/packages/ui/src/ui/containers/ClusterPage/ClusterPage.js
@@ -37,7 +37,6 @@ import {setSetting} from '../../store/actions/settings';
 import {unmountCluster, updateCluster} from '../../store/actions/cluster-params';
 import {updateTitle} from '../../store/actions/global';
 import {getClusterUiConfig} from '../../store/selectors/global';
-import {isQueryTrackerAllowed} from '../../store/selectors/global/experimental-pages';
 import {getClusterConfig} from '../../utils';
 import {NAMESPACES, SettingName} from '../../../shared/constants/settings';
 import {getClusterPagePaneSizes, getStartingPage} from '../../store/selectors/settings';
@@ -87,7 +86,6 @@ class ClusterPage extends Component {
         trackVisit: PropTypes.func.isRequired,
 
         allowChyt: PropTypes.bool,
-        allowQueryTracker: PropTypes.bool,
     };
 
     state = {
@@ -185,15 +183,7 @@ class ClusterPage extends Component {
     }
 
     renderContent(clusterConfig) {
-        const {
-            cluster,
-            startingPage,
-            isLoaded,
-            hasError,
-            paramsError,
-            allowChyt,
-            allowQueryTracker,
-        } = this.props;
+        const {cluster, startingPage, isLoaded, hasError, paramsError, allowChyt} = this.props;
 
         return isLoaded && !this.isParamsLoading() ? (
             <Fragment>
@@ -223,9 +213,7 @@ class ClusterPage extends Component {
                     {allowChyt && (
                         <Route path={`/:cluster/${Page.CHYT}`} component={ChytPageLazy} />
                     )}
-                    {allowQueryTracker && (
-                        <Route path={`/:cluster/${Page.QUERIES}`} component={QueryTrackerLazy} />
-                    )}
+                    <Route path={`/:cluster/${Page.QUERIES}`} component={QueryTrackerLazy} />
                     {hasOdinPage() && (
                         <Route
                             path={`/:cluster/${odinPageInfo.pageId}`}
@@ -335,7 +323,6 @@ function mapStateToProps(state) {
         clusterPagePaneSizes: getClusterPagePaneSizes(state),
         startingPage: getStartingPage(state),
         paramsCluster,
-        allowQueryTracker: isQueryTrackerAllowed(state),
         allowChyt: Boolean(getClusterUiConfig(state).chyt_controller_base_url),
     };
 }

diff --git a/packages/ui/src/ui/pages/chyt/ChytCliqueActions/ChytCliqueActions.tsx b/packages/ui/src/ui/pages/chyt/ChytCliqueActions/ChytCliqueActions.tsx
@@ -6,7 +6,6 @@ import {Button, DropdownMenu, DropdownMenuItem} from '@gravity-ui/uikit';
 
 import Icon from '../../../components/Icon/Icon';
 import {getCluster} from '../../../store/selectors/global';
-import {isQueryTrackerAllowed} from '../../../store/selectors/global/experimental-pages';
 import {updateQueryDraft} from '../../../pages/query-tracker/module/query/actions';
 import {QueryEngine} from '../../../pages/query-tracker/module/engines';
 import UIFactory from '../../../UIFactory';
@@ -19,12 +18,11 @@ const block = cn('chyt-clique-actions');
 
 export function useCliqueOnSqlAction(openWidget: () => void) {
     const cluster = useSelector(getCluster);
-    const allowQueryTracker = useSelector(isQueryTrackerAllowed);
     const dispatch = useDispatch();
 
     return React.useCallback(
         (alias: string) => {
-            if (allowQueryTracker) {
+            if (!UIFactory.onChytAliasSqlClick) {
                 setTimeout(() => {
                     dispatch(
                         updateQueryDraft({
@@ -39,7 +37,7 @@ export function useCliqueOnSqlAction(openWidget: () => void) {
                 UIFactory.onChytAliasSqlClick({alias, cluster});
             }
         },
-        [cluster, openWidget, allowQueryTracker, dispatch],
+        [cluster, openWidget, dispatch],
     );
 }
 

diff --git a/packages/ui/src/ui/pages/navigation/content/Table/TableOverview/TableOverview.js b/packages/ui/src/ui/pages/navigation/content/Table/TableOverview/TableOverview.js
@@ -19,20 +19,17 @@ import {HEADER_HEIGHT} from '../../../../../constants/index';
 import './TableOverview.scss';
 import EditTableActions from './EditTableActions';
 import DataLensButton from './DatalensButton';
-import {isQueryTrackerAllowed} from '../../../../../store/selectors/global/experimental-pages';
-import {YQLKitButton} from '../../../../../containers/YQLKitButton/YQLKitButton';
 
 const block = cn('navigation-table-overview');
 
 TableOverview.propTypes = {
     // from connect
     isFullScreen: PropTypes.bool.isRequired,
     isSplit: PropTypes.bool.isRequired,
-    allowQueryTracker: PropTypes.bool,
 };
 
 function TableOverview(props) {
-    const {isFullScreen, isSplit, allowQueryTracker} = props;
+    const {isFullScreen, isSplit} = props;
 
     // TODO: add sticky for the Overview in the split mode https://github.com/captivationsoftware/react-sticky/issues/282
     return (
@@ -50,9 +47,7 @@ function TableOverview(props) {
                         <OffsetInput block={block} />
                         {!isFullScreen && <ColumnSelectorButton block={block} />}
                         {!isFullScreen && <SettingsButton block={block} />}
-                        {!isFullScreen && allowQueryTracker && (
-                            <CreateQueryFromTable className={block('query')} />
-                        )}
+                        {!isFullScreen && <CreateQueryFromTable className={block('query')} />}
                         {!isFullScreen && <JupyterButton block={block} />}
                         {!isFullScreen && <DataLensButton className={block('datalens')} />}
                         {!isFullScreen && <TableActions block={block} />}
@@ -72,7 +67,6 @@ const mapStateToProps = (state) => {
     return {
         isFullScreen,
         isSplit,
-        allowQueryTracker: isQueryTrackerAllowed(state),
     };
 };
 

diff --git a/packages/ui/src/ui/store/selectors/global/experimental-pages.ts b/packages/ui/src/ui/store/selectors/global/experimental-pages.ts
@@ -1,20 +1,4 @@
-import {createSelector} from 'reselect';
-
-import {Page} from '../../../../shared/constants/settings';
-
-import UIFactory from '../../../UIFactory';
 import {RootState} from '../../../store/reducers';
-import {isDeveloper} from '../../../store/selectors/global/is-developer';
 
 export const getAllowedExperimentalPages = (state: RootState) =>
     state?.global.allowedExperimentalPages;
-
-export const isQueryTrackerAllowed = createSelector(
-    [isDeveloper, getAllowedExperimentalPages],
-    (isDeveloper, allowedPages) => {
-        const expPages = UIFactory.getExperimentalPages();
-        return (
-            isDeveloper || !expPages.includes(Page.QUERIES) || allowedPages.includes(Page.QUERIES)
-        );
-    },
-);
diff --git a/packages/ui/src/ui/store/selectors/settings/navigation.ts b/packages/ui/src/ui/store/selectors/settings/navigation.ts
@@ -1,7 +1,7 @@
 import {createSelector} from 'reselect';
 
 import UIFactory from '../../../UIFactory';
-import {isDeveloper} from '../../../store/selectors/global';
+import {isDeveloper} from '../../../store/selectors/global/is-developer';
 import {getSettingsData} from './settings-base';
 
 export const getNavigationSqlService = createSelector(