Skip to content

Commit 2087072

Browse files
samejrsamejr
committed
Adds TableRow to more tables
1 parent 1243990 commit 2087072

File tree

6 files changed

+135
-123
lines changed
  • apps/webapp/app/routes
    • _app.orgs.$organizationSlug.projects.v3.$projectParam.batches
    • _app.orgs.$organizationSlug.projects.v3.$projectParam.concurrency
    • _app.orgs.$organizationSlug.projects.v3.$projectParam.deployments.$deploymentParam
    • _app.orgs.$organizationSlug.projects.v3.$projectParam.deployments
    • _app.orgs.$organizationSlug.projects.v3.$projectParam.environment-variables
    • _app.orgs.$organizationSlug.projects.v3.$projectParam.schedules

6 files changed

+135
-123
lines changed

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.batches/route.tsx‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -134,36 +134,38 @@ function BatchesTable({ batches, hasFilters, filters }: BatchList) {
134134
return (
135135
<Table className="max-h-full overflow-y-auto">
136136
<TableHeader>
137-
<TableHeaderCell>ID</TableHeaderCell>
138-
<TableHeaderCell>Env</TableHeaderCell>
139-
<TableHeaderCell
140-
tooltip={
141-
<div className="flex flex-col divide-y divide-grid-dimmed">
142-
{allBatchStatuses.map((status) => (
143-
<div
144-
key={status}
145-
className="grid grid-cols-[8rem_1fr] gap-x-2 py-2 first:pt-1 last:pb-1"
146-
>
147-
<div className="mb-0.5 flex items-center gap-1.5 whitespace-nowrap">
148-
<BatchStatusCombo status={status} />
137+
<TableRow>
138+
<TableHeaderCell>ID</TableHeaderCell>
139+
<TableHeaderCell>Env</TableHeaderCell>
140+
<TableHeaderCell
141+
tooltip={
142+
<div className="flex flex-col divide-y divide-grid-dimmed">
143+
{allBatchStatuses.map((status) => (
144+
<div
145+
key={status}
146+
className="grid grid-cols-[8rem_1fr] gap-x-2 py-2 first:pt-1 last:pb-1"
147+
>
148+
<div className="mb-0.5 flex items-center gap-1.5 whitespace-nowrap">
149+
<BatchStatusCombo status={status} />
150+
</div>
151+
<Paragraph variant="extra-small" className="!text-wrap text-text-dimmed">
152+
{descriptionForBatchStatus(status)}
153+
</Paragraph>
149154
</div>
150-
<Paragraph variant="extra-small" className="!text-wrap text-text-dimmed">
151-
{descriptionForBatchStatus(status)}
152-
</Paragraph>
153-
</div>
154-
))}
155-
</div>
156-
}
157-
>
158-
Status
159-
</TableHeaderCell>
160-
<TableHeaderCell>Runs</TableHeaderCell>
161-
<TableHeaderCell>Duration</TableHeaderCell>
162-
<TableHeaderCell>Created</TableHeaderCell>
163-
<TableHeaderCell>Finished</TableHeaderCell>
164-
<TableHeaderCell>
165-
<span className="sr-only">Go to batch</span>
166-
</TableHeaderCell>
155+
))}
156+
</div>
157+
}
158+
>
159+
Status
160+
</TableHeaderCell>
161+
<TableHeaderCell>Runs</TableHeaderCell>
162+
<TableHeaderCell>Duration</TableHeaderCell>
163+
<TableHeaderCell>Created</TableHeaderCell>
164+
<TableHeaderCell>Finished</TableHeaderCell>
165+
<TableHeaderCell>
166+
<span className="sr-only">Go to batch</span>
167+
</TableHeaderCell>
168+
</TableRow>
167169
</TableHeader>
168170
<TableBody>
169171
{batches.length === 0 && !hasFilters ? (

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.concurrency/route.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,12 @@ export default function Page() {
8080
<div className="flex flex-col">
8181
<Table containerClassName="border-t-0">
8282
<TableHeader>
83-
<TableHeaderCell>Environment</TableHeaderCell>
84-
<TableHeaderCell alignment="right">Queued</TableHeaderCell>
85-
<TableHeaderCell alignment="right">Running</TableHeaderCell>
86-
<TableHeaderCell alignment="right">Concurrency limit</TableHeaderCell>
83+
<TableRow>
84+
<TableHeaderCell>Environment</TableHeaderCell>
85+
<TableHeaderCell alignment="right">Queued</TableHeaderCell>
86+
<TableHeaderCell alignment="right">Running</TableHeaderCell>
87+
<TableHeaderCell alignment="right">Concurrency limit</TableHeaderCell>
88+
</TableRow>
8789
</TableHeader>
8890
<TableBody>
8991
<Suspense fallback={<Spinner />}>

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.deployments.$deploymentParam/route.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,10 @@ export default function Page() {
220220
<div className="divide-y divide-charcoal-800 overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
221221
<Table variant="bright">
222222
<TableHeader>
223-
<TableHeaderCell className="px-2">Task</TableHeaderCell>
224-
<TableHeaderCell className="px-2">File path</TableHeaderCell>
223+
<TableRow>
224+
<TableHeaderCell className="px-2">Task</TableHeaderCell>
225+
<TableHeaderCell className="px-2">File path</TableHeaderCell>
226+
</TableRow>
225227
</TableHeader>
226228
<TableBody>
227229
{deployment.tasks.map((t) => {

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.deployments/route.tsx‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -120,37 +120,39 @@ export default function Page() {
120120
<div className="grid max-h-full grid-rows-[1fr_auto]">
121121
<Table containerClassName="border-t-0">
122122
<TableHeader>
123-
<TableHeaderCell>Deploy</TableHeaderCell>
124-
<TableHeaderCell>Env</TableHeaderCell>
125-
<TableHeaderCell>Version</TableHeaderCell>
126-
<TableHeaderCell
127-
tooltip={
128-
<div className="flex flex-col divide-y divide-grid-dimmed">
129-
{deploymentStatuses.map((status) => (
130-
<div
131-
key={status}
132-
className="grid grid-cols-[8rem_1fr] gap-x-2 py-2 first:pt-1 last:pb-1"
133-
>
134-
<div className="mb-0.5 flex items-center gap-1.5 whitespace-nowrap">
135-
<DeploymentStatus status={status} isBuilt={false} />
136-
</div>
137-
<Paragraph
138-
variant="extra-small"
139-
className="!text-wrap text-text-dimmed"
123+
<TableRow>
124+
<TableHeaderCell>Deploy</TableHeaderCell>
125+
<TableHeaderCell>Env</TableHeaderCell>
126+
<TableHeaderCell>Version</TableHeaderCell>
127+
<TableHeaderCell
128+
tooltip={
129+
<div className="flex flex-col divide-y divide-grid-dimmed">
130+
{deploymentStatuses.map((status) => (
131+
<div
132+
key={status}
133+
className="grid grid-cols-[8rem_1fr] gap-x-2 py-2 first:pt-1 last:pb-1"
140134
>
141-
{deploymentStatusDescription(status)}
142-
</Paragraph>
143-
</div>
144-
))}
145-
</div>
146-
}
147-
>
148-
Status
149-
</TableHeaderCell>
150-
<TableHeaderCell>Tasks</TableHeaderCell>
151-
<TableHeaderCell>Deployed at</TableHeaderCell>
152-
<TableHeaderCell>Deployed by</TableHeaderCell>
153-
<TableHeaderCell hiddenLabel>Go to page</TableHeaderCell>
135+
<div className="mb-0.5 flex items-center gap-1.5 whitespace-nowrap">
136+
<DeploymentStatus status={status} isBuilt={false} />
137+
</div>
138+
<Paragraph
139+
variant="extra-small"
140+
className="!text-wrap text-text-dimmed"
141+
>
142+
{deploymentStatusDescription(status)}
143+
</Paragraph>
144+
</div>
145+
))}
146+
</div>
147+
}
148+
>
149+
Status
150+
</TableHeaderCell>
151+
<TableHeaderCell>Tasks</TableHeaderCell>
152+
<TableHeaderCell>Deployed at</TableHeaderCell>
153+
<TableHeaderCell>Deployed by</TableHeaderCell>
154+
<TableHeaderCell hiddenLabel>Go to page</TableHeaderCell>
155+
</TableRow>
154156
</TableHeader>
155157
<TableBody>
156158
{deployments.length > 0 ? (

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.environment-variables/route.tsx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,15 @@ export default function Page() {
214214
)}
215215
<Table containerClassName={cn(environmentVariables.length === 0 && "border-t-0")}>
216216
<TableHeader>
217-
<TableHeaderCell>Key</TableHeaderCell>
218-
{environments.map((environment) => (
219-
<TableHeaderCell key={environment.id}>
220-
<EnvironmentLabel environment={environment} />
221-
</TableHeaderCell>
222-
))}
223-
<TableHeaderCell hiddenLabel>Actions</TableHeaderCell>
217+
<TableRow>
218+
<TableHeaderCell>Key</TableHeaderCell>
219+
{environments.map((environment) => (
220+
<TableHeaderCell key={environment.id}>
221+
<EnvironmentLabel environment={environment} />
222+
</TableHeaderCell>
223+
))}
224+
<TableHeaderCell hiddenLabel>Actions</TableHeaderCell>
225+
</TableRow>
224226
</TableHeader>
225227
<TableBody>
226228
{environmentVariables.length > 0 ? (

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.schedules/route.tsx‎

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -385,62 +385,64 @@ function SchedulesTable({
385385
return (
386386
<Table>
387387
<TableHeader>
388-
<TableHeaderCell>ID</TableHeaderCell>
389-
<TableHeaderCell>Task ID</TableHeaderCell>
390-
<TableHeaderCell
391-
tooltip={
392-
<div className="flex max-w-xs flex-col gap-4 p-1">
393-
<div>
394-
<div className="mb-0.5 flex items-center gap-1.5 text-sm">
395-
<div className={"flex items-center space-x-1"}>
396-
<ScheduleTypeIcon type={"DECLARATIVE"} className="text-sky-500" />
397-
<span className="font-medium">{scheduleTypeName("DECLARATIVE")}</span>
388+
<TableRow>
389+
<TableHeaderCell>ID</TableHeaderCell>
390+
<TableHeaderCell>Task ID</TableHeaderCell>
391+
<TableHeaderCell
392+
tooltip={
393+
<div className="flex max-w-xs flex-col gap-4 p-1">
394+
<div>
395+
<div className="mb-0.5 flex items-center gap-1.5 text-sm">
396+
<div className={"flex items-center space-x-1"}>
397+
<ScheduleTypeIcon type={"DECLARATIVE"} className="text-sky-500" />
398+
<span className="font-medium">{scheduleTypeName("DECLARATIVE")}</span>
399+
</div>
398400
</div>
401+
<Paragraph variant="small" className="!text-wrap text-text-dimmed">
402+
Declarative schedules are defined in a{" "}
403+
<InlineCode variant="extra-small">schedules.task</InlineCode> with the{" "}
404+
<InlineCode variant="extra-small">cron</InlineCode>
405+
property. They sync when you update your{" "}
406+
<InlineCode variant="extra-small">schedules.task</InlineCode> definition and run
407+
the CLI dev or deploy commands.
408+
</Paragraph>
399409
</div>
400-
<Paragraph variant="small" className="!text-wrap text-text-dimmed">
401-
Declarative schedules are defined in a{" "}
402-
<InlineCode variant="extra-small">schedules.task</InlineCode> with the{" "}
403-
<InlineCode variant="extra-small">cron</InlineCode>
404-
property. They sync when you update your{" "}
405-
<InlineCode variant="extra-small">schedules.task</InlineCode> definition and run
406-
the CLI dev or deploy commands.
407-
</Paragraph>
408-
</div>
409-
<div>
410-
<div className="mb-0.5 flex items-center gap-1.5 text-sm">
411-
<div className={"flex items-center space-x-1"}>
412-
<ScheduleTypeIcon type={"IMPERATIVE"} className="text-teal-500" />
413-
<span className="font-medium">{scheduleTypeName("IMPERATIVE")}</span>
410+
<div>
411+
<div className="mb-0.5 flex items-center gap-1.5 text-sm">
412+
<div className={"flex items-center space-x-1"}>
413+
<ScheduleTypeIcon type={"IMPERATIVE"} className="text-teal-500" />
414+
<span className="font-medium">{scheduleTypeName("IMPERATIVE")}</span>
415+
</div>
414416
</div>
417+
<Paragraph variant="small" className="!text-wrap text-text-dimmed">
418+
Imperative schedules are defined here in the dashboard or by using the SDK
419+
functions to create or delete them. They can be created, updated, disabled, and
420+
deleted from the dashboard or using the SDK.
421+
</Paragraph>
415422
</div>
416-
<Paragraph variant="small" className="!text-wrap text-text-dimmed">
417-
Imperative schedules are defined here in the dashboard or by using the SDK
418-
functions to create or delete them. They can be created, updated, disabled, and
419-
deleted from the dashboard or using the SDK.
420-
</Paragraph>
423+
<LinkButton
424+
variant="docs/small"
425+
to={docsPath("v3/tasks-scheduled")}
426+
LeadingIcon={BookOpenIcon}
427+
className="mb-1"
428+
>
429+
View the docs
430+
</LinkButton>
421431
</div>
422-
<LinkButton
423-
variant="docs/small"
424-
to={docsPath("v3/tasks-scheduled")}
425-
LeadingIcon={BookOpenIcon}
426-
className="mb-1"
427-
>
428-
View the docs
429-
</LinkButton>
430-
</div>
431-
}
432-
>
433-
Type
434-
</TableHeaderCell>
435-
<TableHeaderCell>External ID</TableHeaderCell>
436-
<TableHeaderCell>CRON</TableHeaderCell>
437-
<TableHeaderCell hiddenLabel>CRON description</TableHeaderCell>
438-
<TableHeaderCell>Timezone</TableHeaderCell>
439-
<TableHeaderCell>Next run</TableHeaderCell>
440-
<TableHeaderCell>Last run</TableHeaderCell>
441-
<TableHeaderCell>Deduplication key</TableHeaderCell>
442-
<TableHeaderCell>Environments</TableHeaderCell>
443-
<TableHeaderCell>Enabled</TableHeaderCell>
432+
}
433+
>
434+
Type
435+
</TableHeaderCell>
436+
<TableHeaderCell>External ID</TableHeaderCell>
437+
<TableHeaderCell>CRON</TableHeaderCell>
438+
<TableHeaderCell hiddenLabel>CRON description</TableHeaderCell>
439+
<TableHeaderCell>Timezone</TableHeaderCell>
440+
<TableHeaderCell>Next run</TableHeaderCell>
441+
<TableHeaderCell>Last run</TableHeaderCell>
442+
<TableHeaderCell>Deduplication key</TableHeaderCell>
443+
<TableHeaderCell>Environments</TableHeaderCell>
444+
<TableHeaderCell>Enabled</TableHeaderCell>
445+
</TableRow>
444446
</TableHeader>
445447
<TableBody>
446448
{schedules.length === 0 ? (

0 commit comments

Comments
 (0)