Skip to content

Improve labels in preview UI #24981

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
mosabua merged 1 commit into from
Feb 11, 2025
Merged

Improve labels in preview UI #24981

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
2 changes: 1 addition & 1 deletion core/trino-web-ui/src/main/resources/webapp-preview/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const NotFound = () => {
<Typography variant="h3">404</Typography>
<Typography paragraph>The page you’re looking for doesn’t exist.</Typography>
<Button variant="contained" component={Link} href="/">
Back Home
Back home
</Button>
</Grid>
</Grid>
Expand Down
20 changes: 10 additions & 10 deletions core/trino-web-ui/src/main/resources/webapp-preview/src/components/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,49 +149,49 @@ export const Dashboard = () => {
return (
<>
<Box sx={{ pb: 2 }}>
<Typography variant="h4">Cluster Overview</Typography>
<Typography variant="h4">Cluster overview</Typography>
</Box>
<Box>
<Grid container spacing={3}>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard title="Running Queries" values={clusterStats.runningQueries} />
<MetricCard title="Running queries" values={clusterStats.runningQueries} />
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard title="Active Workers" values={clusterStats.activeWorkers} link="/workers" />
<MetricCard title="Active workers" values={clusterStats.activeWorkers} link="/workers" />
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard title="Rows/sec" values={clusterStats.rowInputRate} numberFormatter={formatCount} />
<MetricCard title="rows/s" values={clusterStats.rowInputRate} numberFormatter={formatCount} />
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard title="Queued Queries" values={clusterStats.queuedQueries} />
<MetricCard title="Queued queries" values={clusterStats.queuedQueries} />
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard
title="Runnable Drivers"
title="Runnable drivers"
values={clusterStats.runningDrivers}
numberFormatter={precisionRound}
/>
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard
title="Bytes/sec"
title="bytes/s"
values={clusterStats.byteInputRate}
numberFormatter={formatDataSizeBytes}
/>
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard title="Blocked Queries" values={clusterStats.blockedQueries} />
<MetricCard title="Blocked queries" values={clusterStats.blockedQueries} />
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard
title="Reserved Memory (B)"
title="Reserved memory (B)"
values={clusterStats.reservedMemory}
numberFormatter={formatDataSizeBytes}
/>
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 4 }}>
<MetricCard
title="Worker Parallelism"
title="Worker parallelism"
values={clusterStats.perWorkerCpuTimeRate}
numberFormatter={precisionRound}
/>
Expand Down
2 changes: 1 addition & 1 deletion core/trino-web-ui/src/main/resources/webapp-preview/src/components/DemoComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const DemoComponents = () => {

<Grid sx={{ py: 1 }} size={{ xs: 12 }} container>
<Grid size={{ xs: 3 }}>Link</Grid>
<Link href="https://trino.io">Trino Website</Link>
<Link href="https://trino.io">Trino website</Link>
</Grid>

<Grid sx={{ py: 1 }} size={{ xs: 12 }} container>
Expand Down
4 changes: 2 additions & 2 deletions core/trino-web-ui/src/main/resources/webapp-preview/src/components/QueryHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export const QueryHistory = () => {
return (
<>
<Box sx={{ pb: 2 }}>
<Typography variant="h4">Query History</Typography>
<Typography variant="h4">Query history</Typography>
</Box>
<Typography paragraph>Placeholder for Query History</Typography>
<Typography paragraph>Placeholder for query history</Typography>
</>
)
}
20 changes: 10 additions & 10 deletions core/trino-web-ui/src/main/resources/webapp-preview/src/components/WorkerStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export const WorkerStatus = () => {
return (
<>
<Box sx={{ pb: 2 }}>
<Typography variant="h4">Worker Status</Typography>
<Typography variant="h4">Worker status</Typography>
</Box>

{loading && <CircularProgress />}
Expand All @@ -252,7 +252,7 @@ export const WorkerStatus = () => {
<TableCell>{workerStatus.info.nodeId}</TableCell>
</TableRow>
<TableRow>
<TableCell sx={{ fontWeight: 'bold' }}>Heap Memory</TableCell>
<TableCell sx={{ fontWeight: 'bold' }}>Heap memory</TableCell>
<TableCell>{formatDataSize(workerStatus.info.heapAvailable)}</TableCell>
</TableRow>
<TableRow>
Expand All @@ -272,11 +272,11 @@ export const WorkerStatus = () => {
<TableCell>{workerStatus.info.uptime}</TableCell>
</TableRow>
<TableRow>
<TableCell sx={{ fontWeight: 'bold' }}>External Address</TableCell>
<TableCell sx={{ fontWeight: 'bold' }}>External address</TableCell>
<TableCell>{workerStatus.info.externalAddress}</TableCell>
</TableRow>
<TableRow>
<TableCell sx={{ fontWeight: 'bold' }}>Internal Address</TableCell>
<TableCell sx={{ fontWeight: 'bold' }}>Internal address</TableCell>
<TableCell>{workerStatus.info.internalAddress}</TableCell>
</TableRow>
</TableBody>
Expand All @@ -286,7 +286,7 @@ export const WorkerStatus = () => {
</Grid>

<Box sx={{ pt: 2 }}>
<Typography variant="h6">Resource Utilization</Typography>
<Typography variant="h6">Resource utilization</Typography>
<Divider />
</Box>
<Grid container spacing={3}>
Expand All @@ -296,7 +296,7 @@ export const WorkerStatus = () => {
<TableBody>
<TableRow>
<TableCell sx={{ border: 'none', fontWeight: 'bold' }}>
Process CPU Utilization
Process CPU utilization
</TableCell>
<TableCell rowSpan={2}>
<SparkLineChart
Expand All @@ -319,7 +319,7 @@ export const WorkerStatus = () => {
</TableRow>
<TableRow>
<TableCell sx={{ border: 'none', fontWeight: 'bold' }}>
System CPU Utilization
System CPU utilization
</TableCell>
<TableCell rowSpan={2}>
<SparkLineChart
Expand Down Expand Up @@ -350,7 +350,7 @@ export const WorkerStatus = () => {
<TableBody>
<TableRow>
<TableCell sx={{ border: 'none', fontWeight: 'bold' }}>
Heap Utilization
Heap utilization
</TableCell>
<TableCell rowSpan={2}>
<SparkLineChart
Expand All @@ -373,7 +373,7 @@ export const WorkerStatus = () => {
</TableRow>
<TableRow>
<TableCell sx={{ border: 'none', fontWeight: 'bold' }}>
Non-Heap Memory Used
Non-Heap memory used
</TableCell>
<TableCell rowSpan={2}>
<SparkLineChart
Expand Down Expand Up @@ -401,7 +401,7 @@ export const WorkerStatus = () => {
</Box>
<Grid container spacing={3}>
<Grid size={{ sm: 12, md: 6 }}>
{renderPoolChart('Memory Usage', workerStatus.info.memoryInfo.pool)}
{renderPoolChart('Memory usage', workerStatus.info.memoryInfo.pool)}
</Grid>
<Grid size={{ sm: 12 }}>{renderPoolQueries(workerStatus.info.memoryInfo.pool)}</Grid>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions core/trino-web-ui/src/main/resources/webapp-preview/src/components/WorkersList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ export const WorkersList = () => {
<Table sx={{ minWidth: 650 }} aria-label="simple table">
<TableHead>
<TableRow>
<TableCell>Node Id</TableCell>
<TableCell>Node ID</TableCell>
<TableCell align="right">Node IP</TableCell>
<TableCell align="right">Node Version</TableCell>
<TableCell align="right">Node version</TableCell>
<TableCell align="right">Coordinator</TableCell>
<TableCell align="right">State</TableCell>
</TableRow>
Expand Down
8 changes: 4 additions & 4 deletions core/trino-web-ui/src/main/resources/webapp-preview/src/constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ export const Texts = {
Logout: 'Log Out',
InvalidUsernameOrPassword: 'Invalid username or password',
NotAvailableAuthInfo: 'Authentication information not available',
NotImplementedAuthType: 'The configured authentication type is not implemented for the frontend',
NotImplementedAuthType: 'The configured authentication type is not supported',
},
Api: {
FetchingData: 'Fetching data...',
Stats: {
Name: 'Cluster Statistics',
Name: 'Cluster statistics',
},
},
Error: {
Expand All @@ -54,8 +54,8 @@ export const Texts = {
Drawer: {
Dashboard: 'Dashboard',
Workers: 'Workers',
QueryHistory: 'Query History',
DemoComponents: 'Demo Components',
QueryHistory: 'Query history',
DemoComponents: 'Demo components',
},
},
}
4 changes: 2 additions & 2 deletions core/trino-web-ui/src/main/resources/webapp/src/components/ClusterHUD.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class ClusterHUD extends React.Component {
data-placement="right"
title="Moving average of input rows processed per second"
>
Rows/sec
rows/s
</span>
</div>
</div>
Expand Down Expand Up @@ -308,7 +308,7 @@ export class ClusterHUD extends React.Component {
data-placement="right"
title="Moving average of input bytes processed per second"
>
Bytes/sec
bytes/s
</span>
</div>
</div>
Expand Down