Skip to content

fix(PDisk): show node host name in popup #1352

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.

Sign up for GitHub

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
Sep 26, 2024
Merged

fix(PDisk): show node host name in popup #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/containers/Storage/PDisk/PDisk.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import {PDiskPopup} from '../../../components/PDiskPopup/PDiskPopup';
import {VDiskWithDonorsStack} from '../../../components/VDisk/VDiskWithDonorsStack';
import routes, {createHref, getPDiskPagePath} from '../../../routes';
import {useDiskPagesAvailable} from '../../../store/reducers/capabilities/hooks';
import {selectNodesMap} from '../../../store/reducers/nodesList';
import {valueIsDefined} from '../../../utils';
import {cn} from '../../../utils/cn';
import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types';
import {useTypedSelector} from '../../../utils/hooks';
import {STRUCTURE} from '../../Node/NodePages';

import './PDisk.scss';
Expand Down Expand Up @@ -39,6 +41,7 @@ export const PDisk = ({
}: PDiskProps) => {
const [isPopupVisible, setIsPopupVisible] = React.useState(false);

const nodes = useTypedSelector(selectNodesMap);
const diskPagesAvailable = useDiskPagesAvailable();

const anchor = React.useRef(null);
Expand Down Expand Up @@ -115,7 +118,12 @@ export const PDisk = ({
<div className={b('media-type')}>{data.Type}</div>
</InternalLink>
</div>
<PDiskPopup data={data} anchorRef={anchor} open={isPopupVisible || showPopup} />
<PDiskPopup
data={data}
nodes={nodes}
anchorRef={anchor}
open={isPopupVisible || showPopup}
/>
</React.Fragment>
);
};
19 changes: 7 additions & 12 deletions src/containers/Storage/StorageNodes/columns/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import DataTable from '@gravity-ui/react-data-table';

import {NodeHostWrapper} from '../../../../components/NodeHostWrapper/NodeHostWrapper';
import type {AdditionalNodesProps} from '../../../../types/additionalProps';
import {cn} from '../../../../utils/cn';
import {EMPTY_DATA_PLACEHOLDER} from '../../../../utils/constants';
import {isSortableNodesProperty} from '../../../../utils/nodes';
Expand All @@ -14,11 +13,11 @@ import './StorageNodesColumns.scss';

const b = cn('ydb-storage-nodes-columns');

const getStorageNodesColumns = (
additionalNodesProps: AdditionalNodesProps | undefined,
database?: string,
groupId?: string,
) => {
const getStorageNodesColumns = ({
additionalNodesProps,
database,
groupId,
}: GetStorageNodesColumnsParams) => {
const getNodeRef = additionalNodesProps?.getNodeRef;

const columns: StorageNodesColumn[] = [
Expand Down Expand Up @@ -107,12 +106,8 @@ const getStorageNodesColumns = (
return columns;
};

export const getPreparedStorageNodesColumns = ({
additionalNodesProps,
database,
groupId,
}: GetStorageNodesColumnsParams) => {
const rawColumns = getStorageNodesColumns(additionalNodesProps, database, groupId);
export const getPreparedStorageNodesColumns = (params: GetStorageNodesColumnsParams) => {
const rawColumns = getStorageNodesColumns(params);

const sortableColumns = rawColumns.map((column) => ({
...column,
Expand Down
Loading