Skip to content

Commit b9abbf1

Browse files
committed
fix: review fixes
1 parent 1cd8e8b commit b9abbf1

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

src/components/EntityStatus/EntityStatus.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,27 @@
9898
display: inline-block;
9999
overflow: hidden;
100100

101-
width: calc(100% + var(--button-width));
101+
width: 100%;
102102
margin-top: 5px;
103103

104104
white-space: nowrap;
105105
text-overflow: ellipsis;
106106
}
107107

108+
&__wrapper_with-clipboard-button &__link {
109+
width: calc(100% + var(--button-width));
110+
}
111+
112+
&__wrapper_with-info-button &__link {
113+
width: calc(100% + var(--button-width));
114+
}
115+
116+
&__wrapper_with-clipboard-button {
117+
&.entity-status__wrapper_with-info-button .entity-status__link {
118+
width: calc(100% + 2 * var(--button-width));
119+
}
120+
}
121+
108122
&__link_with-left-trim {
109123
text-align: end;
110124
direction: rtl;

src/containers/Storage/StorageGroups/columns/StorageGroupsColumns.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,4 @@
2323

2424
font-weight: 500;
2525
}
26-
27-
&__clipboard-button {
28-
color: var(--g-color-text-secondary);
29-
30-
@include mixins.table-hover-appearing-button();
31-
}
3226
}

src/containers/Storage/StorageGroups/columns/columns.tsx

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {ShieldKeyhole} from '@gravity-ui/icons';
22
import DataTable from '@gravity-ui/react-data-table';
3-
import {ClipboardButton, Icon, Label, Popover, PopoverBehavior} from '@gravity-ui/uikit';
3+
import {Icon, Label, Popover, PopoverBehavior} from '@gravity-ui/uikit';
44

55
import {CellWithPopover} from '../../../../components/CellWithPopover/CellWithPopover';
6-
import {InternalLink} from '../../../../components/InternalLink';
6+
import {EntityStatus} from '../../../../components/EntityStatus/EntityStatus';
77
import {StatusIcon} from '../../../../components/StatusIcon/StatusIcon';
88
import {UsageLabel} from '../../../../components/UsageLabel/UsageLabel';
99
import {getStorageGroupPath} from '../../../../routes';
@@ -147,23 +147,18 @@ const groupIdColumn: StorageGroupsColumn = {
147147
width: 140,
148148
render: ({row}) => {
149149
return row.GroupId ? (
150-
<div className={b('group-id-wrapper')}>
151-
<InternalLink className={b('group-id')} to={getStorageGroupPath(row.GroupId)}>
152-
{row.GroupId}
153-
</InternalLink>
154-
<ClipboardButton
155-
text={String(row.GroupId)}
156-
className={b('clipboard-button')}
157-
size="xs"
158-
view="normal"
159-
/>
160-
</div>
150+
<EntityStatus
151+
name={String(row.GroupId)}
152+
path={getStorageGroupPath(row.GroupId)}
153+
hasClipboardButton
154+
showStatus={false}
155+
/>
161156
) : (
162157
'-'
163158
);
164159
},
165160
sortAccessor: (row) => Number(row.GroupId),
166-
align: DataTable.RIGHT,
161+
align: DataTable.LEFT,
167162
};
168163

169164
const usedColumn: StorageGroupsColumn = {

0 commit comments

Comments
 (0)