Skip to content

refactor(site): update versions table design #9540

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
merged 2 commits into from
Sep 6, 2023
Merged

refactor(site): update versions table design #9540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69c9076
refactor(site): update versions table design
aslilac Sep 6, 2023
fda1551
🧼
aslilac Sep 6, 2023
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
18 changes: 11 additions & 7 deletions site/src/components/VersionsTable/VersionRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ import { combineClasses } from "utils/combineClasses"
export interface VersionRowProps {
version: TemplateVersion
isActive: boolean
isLatest: boolean
onPromoteClick?: (templateVersionId: string) => void
}

export const VersionRow: React.FC<VersionRowProps> = ({
version,
isActive,
isLatest,
onPromoteClick,
}) => {
const styles = useStyles()
Expand Down Expand Up @@ -68,22 +70,24 @@ export const VersionRow: React.FC<VersionRowProps> = ({
</span>
</Stack>
</Stack>
{isActive ? (
<Pill text="Active version" type="success" />
) : (
onPromoteClick && (

<Stack direction="row" alignItems="center" spacing={2}>
{isActive && <Pill text="Active" type="success" />}
{isLatest && <Pill text="Newest" type="info" />}
{onPromoteClick && (
<Button
className={styles.promoteButton}
disabled={isActive}
onClick={(e) => {
e.preventDefault()
e.stopPropagation()
onPromoteClick(version.id)
}}
>
Promote version
Promote
</Button>
)
)}
)}
</Stack>
</Stack>
</TableCell>
</TimelineEntry>
Expand Down
17 changes: 16 additions & 1 deletion site/src/components/VersionsTable/VersionsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,35 @@ export const VersionsTable: FC<React.PropsWithChildren<VersionsTableProps>> = ({
onPromoteClick,
activeVersionId,
}) => {
const latestVersionId = versions?.reduce(
(latestSoFar, against) => {
if (!latestSoFar) {
return against
}

return new Date(against.updated_at).getTime() >
new Date(latestSoFar.updated_at).getTime()
? against
: latestSoFar
},
undefined as TypesGen.TemplateVersion | undefined,
)?.id

return (
<TableContainer>
<Table data-testid="versions-table">
<TableBody>
{versions ? (
<Timeline
items={versions.slice().reverse()}
items={[...versions].reverse()}
getDate={(version) => new Date(version.created_at)}
row={(version) => (
<VersionRow
onPromoteClick={onPromoteClick}
version={version}
key={version.id}
isActive={activeVersionId === version.id}
isLatest={latestVersionId === version.id}
/>
)}
/>
Expand Down