Skip to content

Commit f147308

Browse files
astandrikastandrik
authored
Merge branch 'main' into astandrik.add-dimming-to-vdisk-pdisk-pages-1373
2 parents c963a02 + b4f4d72 commit f147308

File tree

12 files changed

+136
-22
lines changed

12 files changed

+136
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
11
# Changelog
22

3+
## [6.23.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.23.0...v6.23.1) (2024-10-03)
4+
5+
6+
### Bug Fixes
7+
8+
* **Cluster:** contatiner should take its parent width ([#1393](https://github.com/ydb-platform/ydb-embedded-ui/issues/1393)) ([a34bb3e](https://github.com/ydb-platform/ydb-embedded-ui/commit/a34bb3e1248a4656887b25118e4d4b153aa485b7))
9+
10+
## [6.23.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.22.0...v6.23.0) (2024-10-02)
11+
12+
13+
### Features
14+
15+
* dim vdisks on the node page that are not on the selected node ([#1369](https://github.com/ydb-platform/ydb-embedded-ui/issues/1369)) ([446019f](https://github.com/ydb-platform/ydb-embedded-ui/commit/446019f06ecd26c775dbf59fc9d5bed0b786f0ca))
16+
* **ExecuteResult:** add row count for all results ([#1368](https://github.com/ydb-platform/ydb-embedded-ui/issues/1368)) ([570507e](https://github.com/ydb-platform/ydb-embedded-ui/commit/570507e911d339fc994df4d0d9ebf7c4e9f0ed94))
17+
* move query templates to a hierarchical menu at query editor ([#1327](https://github.com/ydb-platform/ydb-embedded-ui/issues/1327)) ([960e97f](https://github.com/ydb-platform/ydb-embedded-ui/commit/960e97fcdf1e2d358006abd7811e92c1243f2109))
18+
* **Nodes:** add node name column ([#1385](https://github.com/ydb-platform/ydb-embedded-ui/issues/1385)) ([a4c24e1](https://github.com/ydb-platform/ydb-embedded-ui/commit/a4c24e147b9e09c1675ee6a597b3c8e56f1602d7))
19+
* **PaginatedStorage:** add grouping ([#1364](https://github.com/ydb-platform/ydb-embedded-ui/issues/1364)) ([93dd920](https://github.com/ydb-platform/ydb-embedded-ui/commit/93dd9200a0a299195f7887fa2b04c3b0e5c4d476))
20+
* show running queries ([#1313](https://github.com/ydb-platform/ydb-embedded-ui/issues/1313)) ([acd4a1e](https://github.com/ydb-platform/ydb-embedded-ui/commit/acd4a1ec7e83806aef106168e843f196879d71e7))
21+
* **StorageGroups:** add latency and allocation units columns ([#1390](https://github.com/ydb-platform/ydb-embedded-ui/issues/1390)) ([4cb6fed](https://github.com/ydb-platform/ydb-embedded-ui/commit/4cb6fedc30b969c0e5a38e18415145389e9dc86a))
22+
* use relative entity path in schema actions ([#1366](https://github.com/ydb-platform/ydb-embedded-ui/issues/1366)) ([418d3d8](https://github.com/ydb-platform/ydb-embedded-ui/commit/418d3d8a74256b4eee2e74084a11acc61e819f11))
23+
24+
25+
### Bug Fixes
26+
27+
* always show required columns ([#1374](https://github.com/ydb-platform/ydb-embedded-ui/issues/1374)) ([6cab2df](https://github.com/ydb-platform/ydb-embedded-ui/commit/6cab2df320535cb0c4fdcd163608f677e2c603a6))
28+
* **Diagnostics:** hide graph for column tables ([#1356](https://github.com/ydb-platform/ydb-embedded-ui/issues/1356)) ([4fe1a24](https://github.com/ydb-platform/ydb-embedded-ui/commit/4fe1a24a90e2bf2d86ef9c665ce6cb71d24519ea))
29+
* different measurements look confusing ([#1381](https://github.com/ydb-platform/ydb-embedded-ui/issues/1381)) ([5f26767](https://github.com/ydb-platform/ydb-embedded-ui/commit/5f2676737a6f2733c30562f69b3f80fb06229a7e))
30+
* fix columns width on long rowset ([#1384](https://github.com/ydb-platform/ydb-embedded-ui/issues/1384)) ([f30a38f](https://github.com/ydb-platform/ydb-embedded-ui/commit/f30a38f5801b3a3eef2ca8c44fa980718682e76e))
31+
* **Header:** show cluster name in breadcrumb for PDisk/VDisk pages ([#1357](https://github.com/ydb-platform/ydb-embedded-ui/issues/1357)) ([56839bc](https://github.com/ydb-platform/ydb-embedded-ui/commit/56839bc12bccd3874f7270e2951711f8d3811068))
32+
* **PaginatedStorage:** properly pass ids, display 1 node on Node page ([#1382](https://github.com/ydb-platform/ydb-embedded-ui/issues/1382)) ([e63d22b](https://github.com/ydb-platform/ydb-embedded-ui/commit/e63d22b41d85059f66d311b299b28a330097669a))
33+
* **PDisk:** show node host name in popup ([#1352](https://github.com/ydb-platform/ydb-embedded-ui/issues/1352)) ([12010dd](https://github.com/ydb-platform/ydb-embedded-ui/commit/12010ddd75d90b1e3f30e55916e39481298858b4))
34+
* **Storage:** completely remove usage filter ([#1375](https://github.com/ydb-platform/ydb-embedded-ui/issues/1375)) ([d200b4c](https://github.com/ydb-platform/ydb-embedded-ui/commit/d200b4c0d07060b946fb03d9332895f8b2583d41))
35+
* **StorageNodes:** uniform render type ([#1376](https://github.com/ydb-platform/ydb-embedded-ui/issues/1376)) ([9e25733](https://github.com/ydb-platform/ydb-embedded-ui/commit/9e2573363f3e1c9aa54a5ed47d37821fffcdbc41))
36+
337
## [6.22.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.21.0...v6.22.0) (2024-09-24)
438

539

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ydb-embedded-ui",
3-
"version": "6.22.0",
3+
"version": "6.23.1",
44
"files": [
55
"dist"
66
],

‎src/components/StorageGroupInfo/StorageGroupInfo.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export function StorageGroupInfo({data, className, ...infoViewerProps}: StorageG
3636
State,
3737
MissingDisks,
3838
Available,
39-
LatencyPutTabletLog,
40-
LatencyPutUserData,
41-
LatencyGetFast,
39+
LatencyPutTabletLogMs,
40+
LatencyPutUserDataMs,
41+
LatencyGetFastMs,
4242
} = data || {};
4343

4444
const storageGroupInfoFirstColumn = [];
@@ -122,22 +122,22 @@ export function StorageGroupInfo({data, className, ...infoViewerProps}: StorageG
122122
value: <EntityStatus status={Latency} />,
123123
});
124124
}
125-
if (valueIsDefined(LatencyPutTabletLog)) {
125+
if (valueIsDefined(LatencyPutTabletLogMs)) {
126126
storageGroupInfoSecondColumn.push({
127127
label: storageGroupInfoKeyset('latency-put-tablet-log'),
128-
value: formatToMs(LatencyPutTabletLog),
128+
value: formatToMs(LatencyPutTabletLogMs),
129129
});
130130
}
131-
if (valueIsDefined(LatencyPutUserData)) {
131+
if (valueIsDefined(LatencyPutUserDataMs)) {
132132
storageGroupInfoSecondColumn.push({
133133
label: storageGroupInfoKeyset('latency-put-user-data'),
134-
value: formatToMs(LatencyPutUserData),
134+
value: formatToMs(LatencyPutUserDataMs),
135135
});
136136
}
137-
if (valueIsDefined(LatencyGetFast)) {
137+
if (valueIsDefined(LatencyGetFastMs)) {
138138
storageGroupInfoSecondColumn.push({
139139
label: storageGroupInfoKeyset('latency-get-fast'),
140-
value: formatToMs(LatencyGetFast),
140+
value: formatToMs(LatencyGetFastMs),
141141
});
142142
}
143143
if (valueIsDefined(AllocationUnits)) {

‎src/containers/Cluster/Cluster.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
position: relative;
55

66
overflow: auto;
7+
flex-grow: 1;
78

89
height: 100%;
910
padding: 0 20px;

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

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ import {InternalLink} from '../../../../components/InternalLink';
1010
import {UsageLabel} from '../../../../components/UsageLabel/UsageLabel';
1111
import {VDiskWithDonorsStack} from '../../../../components/VDisk/VDiskWithDonorsStack';
1212
import {getStorageGroupPath} from '../../../../routes';
13+
import {valueIsDefined} from '../../../../utils';
1314
import {cn} from '../../../../utils/cn';
14-
import {stringifyVdiskId} from '../../../../utils/dataFormatters/dataFormatters';
15+
import {EMPTY_DATA_PLACEHOLDER} from '../../../../utils/constants';
16+
import {formatNumber, stringifyVdiskId} from '../../../../utils/dataFormatters/dataFormatters';
1517
import {isSortableStorageProperty} from '../../../../utils/storage';
18+
import {formatToMs, parseUsToMs} from '../../../../utils/timeParsers';
1619
import {bytesToGB, bytesToSpeed} from '../../../../utils/utils';
1720
import {Disks} from '../../Disks/Disks';
1821
import {getDegradedSeverity, getUsageSeverityForStorageGroup, isVdiskActive} from '../../utils';
@@ -183,6 +186,30 @@ const writeColumn: StorageGroupsColumn = {
183186
align: DataTable.RIGHT,
184187
};
185188

189+
const latencyColumn: StorageGroupsColumn = {
190+
name: STORAGE_GROUPS_COLUMNS_IDS.Latency,
191+
header: STORAGE_GROUPS_COLUMNS_TITLES.Latency,
192+
width: 100,
193+
render: ({row}) => {
194+
return valueIsDefined(row.LatencyPutTabletLogMs)
195+
? formatToMs(parseUsToMs(row.LatencyPutTabletLogMs))
196+
: EMPTY_DATA_PLACEHOLDER;
197+
},
198+
align: DataTable.RIGHT,
199+
};
200+
201+
const allocationUnitsColumn: StorageGroupsColumn = {
202+
name: STORAGE_GROUPS_COLUMNS_IDS.AllocationUnits,
203+
header: STORAGE_GROUPS_COLUMNS_TITLES.AllocationUnits,
204+
width: 150,
205+
render: ({row}) => {
206+
return valueIsDefined(row.AllocationUnits)
207+
? formatNumber(row.AllocationUnits)
208+
: EMPTY_DATA_PLACEHOLDER;
209+
},
210+
align: DataTable.RIGHT,
211+
};
212+
186213
const getVDisksColumn = (data?: GetStorageColumnsData): StorageGroupsColumn => ({
187214
name: STORAGE_GROUPS_COLUMNS_IDS.VDisks,
188215
header: STORAGE_GROUPS_COLUMNS_TITLES.VDisks,
@@ -236,7 +263,7 @@ export const getStorageTopGroupsColumns: StorageColumnsGetter = () => {
236263
});
237264
};
238265

239-
export const getStorageGroupsColumns: StorageColumnsGetter = (data?: GetStorageColumnsData) => {
266+
export const getStorageGroupsColumns: StorageColumnsGetter = (data) => {
240267
const columns = [
241268
groupIdColumn,
242269
poolNameColumn,
@@ -249,6 +276,8 @@ export const getStorageGroupsColumns: StorageColumnsGetter = (data?: GetStorageC
249276
usedSpaceFlagColumn,
250277
readColumn,
251278
writeColumn,
279+
latencyColumn,
280+
allocationUnitsColumn,
252281
getVDisksColumn(data),
253282
getDisksColumn(data),
254283
];

‎src/containers/Storage/StorageGroups/columns/constants.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export const STORAGE_GROUPS_COLUMNS_IDS = {
2323
Read: 'Read',
2424
Write: 'Write',
2525
Latency: 'Latency',
26+
AllocationUnits: 'AllocationUnits',
2627
VDisks: 'VDisks',
2728
VDisksPDisks: 'VDisksPDisks',
2829
MissingDisks: 'MissingDisks',
@@ -89,6 +90,9 @@ export const STORAGE_GROUPS_COLUMNS_TITLES = {
8990
get Latency() {
9091
return i18n('latency');
9192
},
93+
get AllocationUnits() {
94+
return i18n('allocation-units');
95+
},
9296
get VDisks() {
9397
return i18n('vdisks');
9498
},

‎src/containers/Storage/StorageGroups/columns/i18n/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"read": "Read",
1616
"write": "Write",
1717
"latency": "Latency",
18+
"allocation-units": "Allocation Units",
1819
"vdisks": "VDisks",
1920
"vdisks-pdisks": "VDisks with PDisks"
2021
}

‎src/store/reducers/storage/types.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ export interface PreparedStorageGroup {
8888
State?: string;
8989
MissingDisks?: string | number;
9090
Available?: string;
91-
LatencyPutTabletLog?: number;
92-
LatencyPutUserData?: number;
93-
LatencyGetFast?: number;
91+
92+
LatencyPutTabletLogMs?: number;
93+
LatencyPutUserDataMs?: number;
94+
LatencyGetFastMs?: number;
9495
}
9596

9697
export interface StorageSortParams {

‎src/store/reducers/storage/utils.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {getColorSeverity, getSeverityColor} from '../../../utils/disks/helpers';
1515
import {preparePDiskData, prepareVDiskData} from '../../../utils/disks/prepareDisks';
1616
import {prepareNodeSystemState} from '../../../utils/nodes';
1717
import {getUsage} from '../../../utils/storage';
18+
import {parseUsToMs} from '../../../utils/timeParsers';
1819

1920
import type {
2021
PreparedStorageGroup,
@@ -247,7 +248,19 @@ export const prepareStorageResponse = (data: TStorageInfo): PreparedStorageRespo
247248
export function prepareGroupsResponse(data: StorageGroupsResponse): PreparedStorageResponse {
248249
const {FoundGroups, TotalGroups, StorageGroups = [], StorageGroupGroups} = data;
249250
const preparedGroups: PreparedStorageGroup[] = StorageGroups.map((group) => {
250-
const {Usage, Read, Write, Used, Limit, MissingDisks, VDisks = [], Overall} = group;
251+
const {
252+
Usage,
253+
Read,
254+
Write,
255+
Used,
256+
Limit,
257+
MissingDisks,
258+
VDisks = [],
259+
Overall,
260+
LatencyPutTabletLog,
261+
LatencyPutUserData,
262+
LatencyGetFast,
263+
} = group;
251264

252265
const vDisks = VDisks.map((disk) => {
253266
const whiteboardVDisk = disk.Whiteboard;
@@ -275,6 +288,11 @@ export function prepareGroupsResponse(data: StorageGroupsResponse): PreparedStor
275288
Write: Number(Write),
276289
Used: Number(Used),
277290
Limit: Number(Limit),
291+
292+
LatencyPutTabletLogMs: parseUsToMs(LatencyPutTabletLog),
293+
LatencyPutUserDataMs: parseUsToMs(LatencyPutUserData),
294+
LatencyGetFastMs: parseUsToMs(LatencyGetFast),
295+
278296
Degraded: Number(MissingDisks),
279297
Overall,
280298

0 commit comments

Comments
 (0)