Skip to content

feat(ObjectSummary): add button to refresh tree #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@
visibility: hidden;
}

&__action-button {
&__actions {
position: absolute;
top: 19px; // centered relative to the heading
right: 5px; // centered relative to the collapsed panel

background-color: var(--g-color-base-background);
}
&__button {
&_hidden {
visibility: hidden;
display: none;
}
}

Expand Down
73 changes: 40 additions & 33 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import {isIndexTableType, isTableType} from '../utils/schema';

import {ObjectTree} from './ObjectTree';
import {SchemaActions} from './SchemaActions';
import {RefreshTreeButton} from './SchemaTree/RefreshTreeButton';
import {TreeKeyProvider} from './UpdateTreeContext';
import i18n from './i18n';
import {b} from './shared';
import {isDomain, transformPath} from './transformPath';
Expand Down Expand Up @@ -83,6 +85,7 @@ export function ObjectSummary({
undefined,
getTenantCommonInfoState,
);

const {summaryTab = TENANT_SUMMARY_TABS_IDS.overview} = useTypedSelector(
(state) => state.tenant,
);
Expand Down Expand Up @@ -419,43 +422,47 @@ export function ObjectSummary({

const renderContent = () => {
return (
<div className={b()}>
<div className={b({hidden: isCollapsed})}>
<SplitPane
direction="vertical"
defaultSizePaneKey={DEFAULT_SIZE_TENANT_SUMMARY_KEY}
onSplitStartDragAdditional={onSplitStartDragAdditional}
triggerCollapse={commonInfoVisibilityState.triggerCollapse}
triggerExpand={commonInfoVisibilityState.triggerExpand}
minSize={[200, 52]}
collapsedSizes={[100, 0]}
>
<ObjectTree tenantName={tenantName} path={path} />
<div className={b('info')}>
<div className={b('sticky-top')}>
<div className={b('info-header')}>
<div className={b('info-title')}>
{renderEntityTypeBadge()}
<div className={b('path-name')}>{relativePath}</div>
</div>
<div className={b('info-controls')}>
{renderCommonInfoControls()}
<TreeKeyProvider>
<div className={b()}>
<div className={b({hidden: isCollapsed})}>
<SplitPane
direction="vertical"
defaultSizePaneKey={DEFAULT_SIZE_TENANT_SUMMARY_KEY}
onSplitStartDragAdditional={onSplitStartDragAdditional}
triggerCollapse={commonInfoVisibilityState.triggerCollapse}
triggerExpand={commonInfoVisibilityState.triggerExpand}
minSize={[200, 52]}
collapsedSizes={[100, 0]}
>
<ObjectTree tenantName={tenantName} path={path} />
<div className={b('info')}>
<div className={b('sticky-top')}>
<div className={b('info-header')}>
<div className={b('info-title')}>
{renderEntityTypeBadge()}
<div className={b('path-name')}>{relativePath}</div>
</div>
<div className={b('info-controls')}>
{renderCommonInfoControls()}
</div>
</div>
{renderTabs()}
</div>
{renderTabs()}
<div className={b('overview-wrapper')}>{renderTabContent()}</div>
</div>
<div className={b('overview-wrapper')}>{renderTabContent()}</div>
</div>
</SplitPane>
</SplitPane>
</div>
<Flex className={b('actions')} gap={0.5}>
{!isCollapsed && <RefreshTreeButton />}
<PaneVisibilityToggleButtons
onCollapse={onCollapseSummary}
onExpand={onExpandSummary}
isCollapsed={isCollapsed}
initialDirection="left"
/>
</Flex>
</div>
<PaneVisibilityToggleButtons
onCollapse={onCollapseSummary}
onExpand={onExpandSummary}
isCollapsed={isCollapsed}
initialDirection="left"
className={b('action-button')}
/>
</div>
</TreeKeyProvider>
);
};

Expand Down
2 changes: 1 addition & 1 deletion src/containers/Tenant/ObjectSummary/ObjectTree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {StringParam, useQueryParam} from 'use-query-params';

import {Loader} from '../../../components/Loader';
import {useGetSchemaQuery} from '../../../store/reducers/schema/schema';
import {SchemaTree} from '../Schema/SchemaTree/SchemaTree';

import {SchemaTree} from './SchemaTree/SchemaTree';
import i18n from './i18n';
import {b} from './shared';

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import {ArrowRotateRight} from '@gravity-ui/icons';
import {ActionTooltip, Button, Icon} from '@gravity-ui/uikit';
import {nanoid} from '@reduxjs/toolkit';

import {useDispatchTreeKey} from '../UpdateTreeContext';

export function RefreshTreeButton() {
const updateTreeKey = useDispatchTreeKey();
return (
<ActionTooltip title="Refresh">
<Button
view="flat-secondary"
onClick={() => {
updateTreeKey(nanoid());
}}
>
<Icon data={ArrowRotateRight} />
</Button>
</ActionTooltip>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {getSchemaControls} from '../../utils/controls';
import {isChildlessPathType, mapPathTypeToNavigationTreeType} from '../../utils/schema';
import {getActions} from '../../utils/schemaActions';
import {CreateDirectoryDialog} from '../CreateDirectoryDialog/CreateDirectoryDialog';
import {useDispatchTreeKey, useTreeKey} from '../UpdateTreeContext';

interface SchemaTreeProps {
rootPath: string;
Expand Down Expand Up @@ -52,7 +53,8 @@ export function SchemaTree(props: SchemaTreeProps) {
const [querySettings, setQueryExecutionSettings] = useQueryExecutionSettings();
const [createDirectoryOpen, setCreateDirectoryOpen] = React.useState(false);
const [parentPath, setParentPath] = React.useState('');
const [schemaTreeKey, setSchemaTreeKey] = React.useState('');
const setSchemaTreeKey = useDispatchTreeKey();
const schemaTreeKey = useTreeKey();

const fetchPath = async (path: string) => {
let schemaData: TEvDescribeSchemeResult | undefined;
Expand Down
35 changes: 35 additions & 0 deletions src/containers/Tenant/ObjectSummary/UpdateTreeContext.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from 'react';

const TreeKeyContext = React.createContext<string | undefined>(undefined);
const TreeKeyDispatchContext = React.createContext<React.Dispatch<string> | undefined>(undefined);

interface TreeKeyProviderProps {
children: React.ReactNode;
}

export function TreeKeyProvider({children}: TreeKeyProviderProps) {
const [key, setKey] = React.useState<string>('');

return (
<TreeKeyContext.Provider value={key}>
<TreeKeyDispatchContext.Provider value={setKey}>
{children}
</TreeKeyDispatchContext.Provider>
</TreeKeyContext.Provider>
);
}

export function useTreeKey() {
const key = React.useContext(TreeKeyContext);
if (key === undefined) {
throw new Error('useTreeKey must be used within a TreeKeyProvider');
}
return key;
}
export function useDispatchTreeKey() {
const updateKey = React.useContext(TreeKeyDispatchContext);
if (updateKey === undefined) {
throw new Error('useDispatchTreeKey must be used within a TreeKeyProvider');
}
return updateKey;
}
57 changes: 30 additions & 27 deletions src/containers/Tenant/utils/paneVisibilityToggleHelpers.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import {ChevronsUp} from '@gravity-ui/icons';
import {Button, Icon} from '@gravity-ui/uikit';
import {ActionTooltip, Button, Icon} from '@gravity-ui/uikit';

import {cn} from '../../../utils/cn';

Expand Down Expand Up @@ -84,32 +84,35 @@ export function PaneVisibilityToggleButtons({
}: ToggleButtonProps) {
return (
<React.Fragment>
<Button
view="flat-secondary"
onClick={onCollapse}
className={b(
{
hidden: isCollapsed,
},
className,
)}
title="Collapse"
>
<Icon data={ChevronsUp} className={b({[initialDirection]: true})} />
</Button>
<Button
view="flat-secondary"
onClick={onExpand}
className={b(
{
hidden: !isCollapsed,
},
className,
)}
title="Expand"
>
<Icon data={ChevronsUp} className={b({[initialDirection]: true}, 'rotate')} />
</Button>
<ActionTooltip title="Collapse">
<Button
view="flat-secondary"
onClick={onCollapse}
className={b(
{
hidden: isCollapsed,
},
className,
)}
>
<Icon data={ChevronsUp} className={b({[initialDirection]: true})} />
</Button>
</ActionTooltip>

<ActionTooltip title="Expand">
<Button
view="flat-secondary"
onClick={onExpand}
className={b(
{
hidden: !isCollapsed,
},
className,
)}
>
<Icon data={ChevronsUp} className={b({[initialDirection]: true}, 'rotate')} />
</Button>
</ActionTooltip>
</React.Fragment>
);
}
Loading