Skip to content

Commit 0c8be2d

Browse files
authored
Merge branch 'main' into astandrik.move-query-templates-to-a-hierarchical-menu-1153
2 parents c9c4e66 + 12010dd commit 0c8be2d

File tree

40 files changed

+512
-178
lines changed

40 files changed

+512
-178
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Node.js CI
33
on:
44
pull_request:
55
branches: ['**']
6+
merge_group:
7+
types: [checks_requested]
68

79
jobs:
810
verify_files:
@@ -38,6 +40,7 @@ jobs:
3840
e2e_tests:
3941
name: Playwright Tests
4042
runs-on: ubuntu-latest
43+
if: ${{github.event.action != 'checks_requested'}}
4144
permissions:
4245
contents: read
4346

@@ -121,6 +124,7 @@ jobs:
121124
bundle_size:
122125
name: Check Bundle Size
123126
runs-on: ubuntu-latest
127+
if: ${{github.event.action != 'checks_requested'}}
124128
outputs:
125129
current_size: ${{ steps.current_size.outputs.size }}
126130
main_size: ${{ steps.main_size.outputs.size }}
@@ -183,7 +187,7 @@ jobs:
183187
deploy_and_update:
184188
name: Deploy and Update PR
185189
needs: [e2e_tests, bundle_size]
186-
if: always() && github.event.pull_request.head.repo.full_name == github.repository
190+
if: ${{always() && github.event.pull_request.head.repo.full_name == github.repository && github.event.action != 'checks_requested'}}
187191
runs-on: ubuntu-latest
188192
permissions:
189193
contents: write

.github/workflows/pr-title.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ on:
77
- synchronize
88
- reopened
99
- edited
10+
merge_group:
11+
types: [checks_requested]
1012

1113
jobs:
1214
verify_title:
1315
name: Verify Title
1416
runs-on: ubuntu-latest
17+
if: ${{github.event.action != 'checks_requested'}}
1518
steps:
1619
- name: Checkout
1720
uses: actions/checkout@v4

CHANGELOG.md

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

3+
## [6.22.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.21.0...v6.22.0) (2024-09-24)
4+
5+
6+
### Features
7+
8+
* add rows limit to query settings ([#1291](https://github.com/ydb-platform/ydb-embedded-ui/issues/1291)) ([1728e61](https://github.com/ydb-platform/ydb-embedded-ui/commit/1728e6162e5be9c5fdc0954595b562873ad6fb9b))
9+
* big query results freeze interface ([#1354](https://github.com/ydb-platform/ydb-embedded-ui/issues/1354)) ([660f89c](https://github.com/ydb-platform/ydb-embedded-ui/commit/660f89cd696f85b2ea61ce31a64e7ef2d70f9283))
10+
* in query results show when it was truncated ([#1309](https://github.com/ydb-platform/ydb-embedded-ui/issues/1309)) ([0434410](https://github.com/ydb-platform/ydb-embedded-ui/commit/043441045d5e9cc463271da505bec6bf04489f5d))
11+
* **Nodes:** add columns setup ([#1320](https://github.com/ydb-platform/ydb-embedded-ui/issues/1320)) ([c9ec3b7](https://github.com/ydb-platform/ydb-embedded-ui/commit/c9ec3b790d461ea150d315bb0f364e979218f788))
12+
* **ObjectSummary:** add link to Schema in Diagnostics ([#1323](https://github.com/ydb-platform/ydb-embedded-ui/issues/1323)) ([deaf519](https://github.com/ydb-platform/ydb-embedded-ui/commit/deaf519c35b7df50919bf12de6fd87fe2a764aa9))
13+
* **ObjectSummary:** add paths and shards limits ([#1326](https://github.com/ydb-platform/ydb-embedded-ui/issues/1326)) ([61c3562](https://github.com/ydb-platform/ydb-embedded-ui/commit/61c3562ea569b217d2fffb5622b38d2054240aeb))
14+
* show vdisks of selected group in a special color ([#1336](https://github.com/ydb-platform/ydb-embedded-ui/issues/1336)) ([5402c86](https://github.com/ydb-platform/ydb-embedded-ui/commit/5402c86a9a07f8999bb084ac2d50ebda54c9adc6))
15+
* **Storage:** add columns setup ([#1321](https://github.com/ydb-platform/ydb-embedded-ui/issues/1321)) ([b53487e](https://github.com/ydb-platform/ydb-embedded-ui/commit/b53487e7a6ad5779dbc02b08eaf4b1a9929021b6))
16+
17+
18+
### Bug Fixes
19+
20+
* **Clusters:** fix columns setup do not save values ([#1316](https://github.com/ydb-platform/ydb-embedded-ui/issues/1316)) ([964122f](https://github.com/ydb-platform/ydb-embedded-ui/commit/964122f5560cff67fcb3562cfa7ee05f33646b5b))
21+
* do not send empty strings in filters ([#1330](https://github.com/ydb-platform/ydb-embedded-ui/issues/1330)) ([5af61ac](https://github.com/ydb-platform/ydb-embedded-ui/commit/5af61acd52202c58815883bcfa179bfcbaabc8c3))
22+
* show structure tab and PDisk/VDisk if disk's new API is absent ([#1338](https://github.com/ydb-platform/ydb-embedded-ui/issues/1338)) ([6213ed7](https://github.com/ydb-platform/ydb-embedded-ui/commit/6213ed7856a80cb2158bc0ff1af79ed160b3b3f1))
23+
* **Storage:** fix additional props not passed ([#1350](https://github.com/ydb-platform/ydb-embedded-ui/issues/1350)) ([e8beb49](https://github.com/ydb-platform/ydb-embedded-ui/commit/e8beb4900685be5c7d7c339364d3941bd25fadda))
24+
* **StorageGroups:** make group id first column ([#1351](https://github.com/ydb-platform/ydb-embedded-ui/issues/1351)) ([73642db](https://github.com/ydb-platform/ydb-embedded-ui/commit/73642db54728fb15be91de64e9ca0eb60ac2a857))
25+
326
## [6.21.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.20.0...v6.21.0) (2024-09-18)
427

528

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.21.0",
3+
"version": "6.22.0",
44
"files": [
55
"dist"
66
],

src/components/DiskStateProgressBar/DiskStateProgressBar.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
background-color: unset;
3636
}
3737

38+
&_inactive {
39+
opacity: 0.5;
40+
}
41+
3842
&_empty {
3943
color: var(--g-color-text-hint);
4044
border-style: dashed;

src/components/DiskStateProgressBar/DiskStateProgressBar.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ interface DiskStateProgressBarProps {
1414
severity?: number;
1515
compact?: boolean;
1616
faded?: boolean;
17+
inactive?: boolean;
1718
empty?: boolean;
1819
content?: React.ReactNode;
1920
className?: string;
@@ -24,13 +25,14 @@ export function DiskStateProgressBar({
2425
severity,
2526
compact,
2627
faded,
28+
inactive,
2729
empty,
2830
content,
2931
className,
3032
}: DiskStateProgressBarProps) {
3133
const [inverted] = useSetting<boolean | undefined>(INVERTED_DISKS_KEY);
3234

33-
const mods: Record<string, boolean | undefined> = {inverted, compact, faded, empty};
35+
const mods: Record<string, boolean | undefined> = {inverted, compact, faded, empty, inactive};
3436

3537
const color = severity !== undefined && getSeverityColor(severity);
3638
if (color) {

src/components/PDiskInfo/PDiskInfo.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {Flex} from '@gravity-ui/uikit';
22

33
import {getPDiskPagePath} from '../../routes';
44
import {selectIsUserAllowedToMakeChanges} from '../../store/reducers/authentication/authentication';
5-
import {useDiskPagesAvailable} from '../../store/reducers/capabilities/hooks';
65
import {valueIsDefined} from '../../utils';
76
import {formatBytes} from '../../utils/bytesParsers';
87
import {cn} from '../../utils/cn';
@@ -191,12 +190,11 @@ export function PDiskInfo<T extends PreparedPDisk>({
191190
className,
192191
}: PDiskInfoProps<T>) {
193192
const isUserAllowedToMakeChanges = useTypedSelector(selectIsUserAllowedToMakeChanges);
194-
const diskPagesAvailable = useDiskPagesAvailable();
195193

196194
const [generalInfo, statusInfo, spaceInfo, additionalInfo] = getPDiskInfo({
197195
pDisk,
198196
nodeId,
199-
withPDiskPageLink: withPDiskPageLink && diskPagesAvailable,
197+
withPDiskPageLink,
200198
isUserAllowedToMakeChanges,
201199
});
202200

src/components/QueryResultTable/Cell/Cell.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
import {hideTooltip, showTooltip} from '../../../store/reducers/tooltip';
3+
import {showTooltip} from '../../../store/reducers/tooltip';
44
import {useTypedDispatch} from '../../../utils/hooks';
55
import {b} from '../QueryResultTable';
66

@@ -14,13 +14,6 @@ export const Cell = React.memo(function Cell(props: CellProps) {
1414

1515
const dispatch = useTypedDispatch();
1616

17-
React.useEffect(
18-
() => () => {
19-
dispatch(hideTooltip());
20-
},
21-
[dispatch],
22-
);
23-
2417
return (
2518
<span
2619
className={b('cell', className)}

src/components/VDisk/VDisk.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export interface VDiskProps {
2121
data?: PreparedVDisk;
2222
nodes?: NodesMap;
2323
compact?: boolean;
24+
inactive?: boolean;
2425
showPopup?: boolean;
2526
onShowPopup?: VoidFunction;
2627
onHidePopup?: VoidFunction;
@@ -31,6 +32,7 @@ export const VDisk = ({
3132
data = {},
3233
nodes,
3334
compact,
35+
inactive,
3436
showPopup,
3537
onShowPopup,
3638
onHidePopup,
@@ -87,6 +89,7 @@ export const VDisk = ({
8789
diskAllocatedPercent={data.AllocatedPercent}
8890
severity={data.Severity}
8991
compact={compact}
92+
inactive={inactive}
9093
className={progressBarClassName}
9194
/>
9295
</InternalLink>

0 commit comments

Comments
 (0)