fix: rebase

Author: astandrik

src/containers/Drawer/Drawer.scss

@@ -3,7 +3,6 @@ import React from 'react';
 import {Code, Xmark} from '@gravity-ui/icons';
 import {Button, Flex, Icon} from '@gravity-ui/uikit';
 
-import Fullscreen from '../../../../../components/Fullscreen/Fullscreen';
 import type {InfoViewerItem} from '../../../../../components/InfoViewer';
 import {InfoViewer} from '../../../../../components/InfoViewer';
 import {YDBSyntaxHighlighter} from '../../../../../components/SyntaxHighlighter/YDBSyntaxHighlighter';
@@ -45,33 +44,29 @@ export const QueryDetails = ({
                 </div>
             </div>
 
-            <Fullscreen>
-                <Flex direction="column" className={b('content')}>
-                    <InfoViewer info={infoItems} />
+            <Flex direction="column" className={b('content')}>
+                <InfoViewer info={infoItems} />
 
-                    <div className={b('query-content')}>
-                        <div className={b('query-header')}>
-                            <div className={b('query-title')}>
-                                {i18n('query-details.query.title')}
-                            </div>
-                            <Button
-                                view="flat-secondary"
-                                size="m"
-                                onClick={onOpenInEditor}
-                                className={b('editor-button')}
-                            >
-                                <Icon data={Code} size={16} />
-                                {i18n('query-details.open-in-editor')}
-                            </Button>
-                        </div>
-                        <YDBSyntaxHighlighter
-                            language="yql"
-                            text={queryText}
-                            withClipboardButton={{alwaysVisible: true, withLabel: false}}
-                        />
+                <div className={b('query-content')}>
+                    <div className={b('query-header')}>
+                        <div className={b('query-title')}>{i18n('query-details.query.title')}</div>
+                        <Button
+                            view="flat-secondary"
+                            size="m"
+                            onClick={onOpenInEditor}
+                            className={b('editor-button')}
+                        >
+                            <Icon data={Code} size={16} />
+                            {i18n('query-details.open-in-editor')}
+                        </Button>
                     </div>
-                </Flex>
-            </Fullscreen>
+                    <YDBSyntaxHighlighter
+                        language="yql"
+                        text={queryText}
+                        withClipboardButton={{alwaysVisible: true, withLabel: false}}
+                    />
+                </div>
+            </Flex>
         </div>
     );
 };

src/containers/Drawer/Drawer.tsx

@@ -4,6 +4,7 @@ import type {Column} from '@gravity-ui/react-data-table';
 import {TableColumnSetup} from '@gravity-ui/uikit';
 import {isEqual} from 'lodash';
 
+import {DrawerWrapper} from '../../../../components/Drawer';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {Search} from '../../../../components/Search';
@@ -14,7 +15,6 @@ import {cn} from '../../../../utils/cn';
 import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
 import {useSelectedColumns} from '../../../../utils/hooks/useSelectedColumns';
 import {parseQueryErrorToString} from '../../../../utils/query';
-import {Drawer} from '../../../Drawer/Drawer';
 
 import {QueryDetailsDrawerContent} from './QueryDetails/QueryDetailsDrawerContent';
 import {getRunningQueriesColumns} from './columns/columns';
@@ -109,7 +109,7 @@ export const RunningQueriesData = ({
     }, [isDrawerVisible]);
 
     return (
-        <Drawer.ItemWrapper
+        <DrawerWrapper
             isDrawerVisible={isDrawerVisible}
             onCloseDrawer={handleCloseDetails}
             renderDrawerContent={renderDrawerContent}
@@ -153,6 +153,6 @@ export const RunningQueriesData = ({
                     />
                 </TableWithControlsLayout.Table>
             </TableWithControlsLayout>
-        </Drawer.ItemWrapper>
+        </DrawerWrapper>
     );
 };

src/containers/Tenant/Diagnostics/TopQueries/QueryDetails/QueryDetails.tsx

@@ -6,6 +6,7 @@ import {isEqual} from 'lodash';
 
 import type {DateRangeValues} from '../../../../components/DateRange';
 import {DateRange} from '../../../../components/DateRange';
+import {DrawerWrapper} from '../../../../components/Drawer';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {Search} from '../../../../components/Search';
@@ -17,7 +18,6 @@ import {cn} from '../../../../utils/cn';
 import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
 import {useSelectedColumns} from '../../../../utils/hooks/useSelectedColumns';
 import {parseQueryErrorToString} from '../../../../utils/query';
-import {Drawer} from '../../../Drawer/Drawer';
 
 import {QueryDetailsDrawerContent} from './QueryDetails/QueryDetailsDrawerContent';
 import {getTopQueriesColumns} from './columns/columns';
@@ -136,7 +136,7 @@ export const TopQueriesData = ({
     }, [isDrawerVisible]);
 
     return (
-        <Drawer.ItemWrapper
+        <DrawerWrapper
             isDrawerVisible={isDrawerVisible}
             onCloseDrawer={handleCloseDetails}
             renderDrawerContent={renderDrawerContent}
@@ -191,6 +191,6 @@ export const TopQueriesData = ({
                     />
                 </TableWithControlsLayout.Table>
             </TableWithControlsLayout>
-        </Drawer.ItemWrapper>
+        </DrawerWrapper>
     );
 };