Skip to content

Commit f7eca7a

Browse files
committed
Merge branch 'master' into UX-1275/template-gallery-basic
2 parents a6c76d9 + e6e1722 commit f7eca7a

5 files changed

Lines changed: 48 additions & 48 deletions

File tree

.github/workflows/frontend-verify.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -135,27 +135,3 @@ jobs:
135135
name: integration-test-results-${{ matrix.shard }}
136136
path: frontend/test-results
137137
retention-days: 2
138-
139-
test-coverage:
140-
needs: ["test-unit", "test-integration"]
141-
timeout-minutes: 10
142-
runs-on: blacksmith-4vcpu-ubuntu-2404
143-
defaults:
144-
run:
145-
working-directory: frontend
146-
steps:
147-
- name: Checkout
148-
uses: actions/checkout@v5
149-
- name: Setup Bun
150-
uses: oven-sh/setup-bun@v2
151-
- name: Install dependencies
152-
run: bun install --frozen-lockfile
153-
- name: Run coverage (unit + integration, merged)
154-
run: bun run test:coverage
155-
- name: Upload merged coverage HTML report
156-
uses: actions/upload-artifact@v4
157-
if: always()
158-
with:
159-
name: coverage-report
160-
path: frontend/coverage-merged/
161-
retention-days: 14

backend/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ require (
222222
go.uber.org/zap v1.27.1 // indirect
223223
go.yaml.in/yaml/v2 v2.4.3 // indirect
224224
go.yaml.in/yaml/v3 v3.0.4 // indirect
225-
golang.org/x/crypto v0.51.0 // indirect
225+
golang.org/x/crypto v0.52.0 // indirect
226226
golang.org/x/mod v0.35.0 // indirect
227-
golang.org/x/sys v0.44.0 // indirect
227+
golang.org/x/sys v0.45.0 // indirect
228228
golang.org/x/time v0.13.0 // indirect
229229
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
230230
gopkg.in/warnings.v0 v0.1.2 // indirect

backend/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
548548
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
549549
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
550550
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
551-
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
552-
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
551+
golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
552+
golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
553553
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
554554
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
555555
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -592,8 +592,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
592592
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
593593
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
594594
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
595-
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
596-
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
595+
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
596+
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
597597
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
598598
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
599599
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

frontend/src/components/pages/topics/quick-info.tsx

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,30 @@ export const TopicQuickInfoStatistic = (p: { topic: Topic }) => {
119119
</>
120120
)}
121121

122-
{cleanupPolicy === 'delete' && (
122+
{cleanupPolicy === 'delete' && retentionMs && retentionBytes && (
123123
<>
124-
<Text as="dt" fontWeight="bold">
125-
Retention:
126-
</Text>
127-
{retentionMs && retentionBytes ? (
124+
<Flex gap={2}>
125+
<Text as="dt" fontWeight="bold">
126+
Retention Time:
127+
</Text>
128128
<Text as="dd">
129-
~
130-
{retentionMs.value === '-1' && retentionBytes.value === '-1' ? (
131-
'Unlimited'
132-
) : (
133-
<>
134-
{formatConfigValue(retentionMs.name, retentionMs.value, 'friendly')} or{' '}
135-
{formatConfigValue(retentionBytes.name, retentionBytes.value, 'friendly')}
136-
{Number.isFinite(Number(retentionBytes.value)) &&
137-
Number(retentionBytes.value) !== -1 &&
138-
' / partition'}
139-
</>
140-
)}
129+
{retentionMs.value !== '-1' && '~'}
130+
{formatConfigValue(retentionMs.name, retentionMs.value, 'friendly')}
141131
</Text>
142-
) : null}
132+
</Flex>
133+
<Box>
134+
<Divider orientation="vertical" />
135+
</Box>
136+
<Flex gap={2}>
137+
<Text as="dt" fontWeight="bold">
138+
Retention Size:
139+
</Text>
140+
<Text as="dd">
141+
{retentionBytes.value !== '-1' && '~'}
142+
{formatConfigValue(retentionBytes.name, retentionBytes.value, 'friendly')}
143+
{Number.isFinite(Number(retentionBytes.value)) && Number(retentionBytes.value) !== -1 && ' / partition'}
144+
</Text>
145+
</Flex>
143146
</>
144147
)}
145148
</Flex>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* Copyright 2026 Redpanda Data, Inc.
3+
*
4+
* Use of this software is governed by the Business Source License
5+
* included in the file https://github.com/redpanda-data/redpanda/blob/dev/licenses/bsl.md
6+
*
7+
* As of the Change Date specified in that file, in accordance with
8+
* the Business Source License, use of this software will be governed
9+
* by the Apache License, Version 2.0
10+
*/
11+
12+
import { createFileRoute } from '@tanstack/react-router';
13+
14+
import { PermissionsListTab } from '../../../components/pages/security/tabs/permissions-list-tab';
15+
16+
export const Route = createFileRoute('/security/permissions/')({
17+
staticData: {
18+
title: 'Security',
19+
},
20+
component: PermissionsListTab,
21+
});

0 commit comments

Comments
 (0)