Skip to content
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

some refinements to the status pages #529

Merged
merged 1 commit into from
Oct 18, 2023
Merged

some refinements to the status pages #529

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
11 changes: 8 additions & 3 deletions ui/app/mirrors/edit/[mirrorId]/cdc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { SearchField } from '@/lib/SearchField';
import { Table, TableCell, TableRow } from '@/lib/Table';
import * as Tabs from '@radix-ui/react-tabs';
import moment, { Duration, Moment } from 'moment';
import { useQueryState } from 'next-usequerystate';
import Link from 'next/link';
import { useState } from 'react';
import styled from 'styled-components';
import CDCDetails from './cdcDetails';

Expand Down Expand Up @@ -150,7 +150,9 @@ const SnapshotStatusTable = ({ status }: SnapshotStatusProps) => (
</TableCell>
<TableCell>{clone.completedNumRows}</TableCell>
<TableCell>
<Label>{clone.avgTimePerPartition?.humanize() || 'N/A'}</Label>
<Label>
{clone.avgTimePerPartition?.humanize({ ss: 1 }) || 'N/A'}
</Label>
</TableCell>
</TableRow>
))}
Expand All @@ -175,7 +177,10 @@ type CDCMirrorStatusProps = {
syncStatusChild?: React.ReactNode;
};
export function CDCMirror({ cdc, syncStatusChild }: CDCMirrorStatusProps) {
const [selectedTab, setSelectedTab] = useState<string>('tab1');
const [selectedTab, setSelectedTab] = useQueryState('tab', {
history: 'push',
defaultValue: 'tab1',
});

let snapshot = <></>;
if (cdc.snapshotStatus) {
Expand Down
2 changes: 1 addition & 1 deletion ui/app/mirrors/edit/[mirrorId]/syncStatusTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function TimeWithDurationOrRunning({
return (
<Label>
{moment(endTime).format('YYYY-MM-DD HH:mm:ss')} (
{moment.duration(moment(endTime).diff(startTime)).humanize()})
{moment.duration(moment(endTime).diff(startTime)).humanize({ ss: 1 })})
</Label>
);
} else {
Expand Down
11 changes: 11 additions & 0 deletions ui/app/mirrors/status/qrep/[mirrorId]/qrepStatusTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ function RowPerPartition({
endTime,
numRows,
}: QRepPartitionStatus) {
let duration = 'N/A';
if (startTime && endTime) {
duration = moment
.duration(moment(endTime).diff(moment(startTime)))
.humanize({ ss: 1 });
}

return (
<TableRow key={partitionId}>
<TableCell variant='button'>
Expand All @@ -46,6 +53,9 @@ function RowPerPartition({
<TableCell>
<Label>{runUuid}</Label>
</TableCell>
<TableCell>
<Label>{duration}</Label>
</TableCell>
<TableCell>
<Label>{moment(startTime)?.format('YYYY-MM-DD HH:mm:ss')}</Label>
</TableCell>
Expand Down Expand Up @@ -132,6 +142,7 @@ export default function QRepStatusTable({
</TableCell>
<TableCell as='th'>Partition UUID</TableCell>
<TableCell as='th'>Run UUID</TableCell>
<TableCell as='th'>Duration</TableCell>
<TableCell as='th'>Start Time</TableCell>
<TableCell as='th'>End Time</TableCell>
<TableCell as='th'>Num Rows Synced</TableCell>
Expand Down
1 change: 1 addition & 0 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"material-symbols": "0.11.0",
"moment": "^2.29.4",
"next": "13.5.5",
"next-usequerystate": "^1.8.4",
"prop-types": "^15.8.1",
"protobufjs": "^7.2.5",
"react": "18.2.0",
Expand Down
12 changes: 12 additions & 0 deletions ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8014,6 +8014,11 @@ minizlib@^2.1.1:
minipass "^3.0.0"
yallist "^4.0.0"

mitt@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==

mkdirp-classic@^0.5.2:
version "0.5.3"
resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
Expand Down Expand Up @@ -8094,6 +8099,13 @@ neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==

next-usequerystate@^1.8.4:
version "1.8.4"
resolved "https://registry.yarnpkg.com/next-usequerystate/-/next-usequerystate-1.8.4.tgz#81125aa3dd5a0c6afbc21da8c1f663ee2e0a0350"
integrity sha512-V4xMh87cu950Zy1Jpw/H8GwWxAeAmqnLNJ8hAl5bdEWpyZV4UIKdkJePKMCUy1+h254EXGmY83BuCGJOASJRVg==
dependencies:
mitt "^3.0.1"

[email protected]:
version "13.5.5"
resolved "https://registry.yarnpkg.com/next/-/next-13.5.5.tgz#65addd98a1ae42845d455e08bc491448bb34929b"
Expand Down
Loading