Skip to content

Commit 024af22

Browse files
authored
small layout improvements (#1437)
* small layout improvements * fix alerter relative date
1 parent dcb240c commit 024af22

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

frontend/app/src/pages/main/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function Sidebar({ className, memberships, currTenant }: SidebarProps) {
9696
return (
9797
<div
9898
className={cn(
99-
'h-full border-r overflow-y-auto w-full md:w-80 top-16 absolute z-[100] md:relative md:top-0 md:bg-[unset] md:dark:bg-[unset] bg-slate-100 dark:bg-slate-900',
99+
'h-full border-r overflow-y-auto w-full md:min-w-80 md:w-80 top-16 absolute z-[100] md:relative md:top-0 md:bg-[unset] md:dark:bg-[unset] bg-slate-100 dark:bg-slate-900',
100100
className,
101101
)}
102102
>

frontend/app/src/pages/main/v1/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function Sidebar({ className, memberships, currTenant }: SidebarProps) {
103103
return (
104104
<div
105105
className={cn(
106-
'h-full border-r overflow-y-auto w-full md:w-80 top-16 absolute z-[100] md:relative md:top-0 md:bg-[unset] md:dark:bg-[unset] bg-slate-100 dark:bg-slate-900',
106+
'h-full border-r overflow-y-auto w-full md:min-w-80 md:w-80 top-16 absolute z-[100] md:relative md:top-0 md:bg-[unset] md:dark:bg-[unset] bg-slate-100 dark:bg-slate-900',
107107
className,
108108
)}
109109
>

frontend/app/src/pages/onboarding/intro-docs-empty-state.tsx

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const DocExternalLink: React.FC<DocExternalLinkProps> = ({
2222
href={createDocsExternalLink(link)}
2323
className={className}
2424
>
25-
<span className="text-blue-600">{description}</span>
25+
<span className="text-indigo-500">{description}</span>
2626
</a>
2727
);
2828
};
@@ -41,18 +41,16 @@ export const IntroDocsEmptyState: React.FC<IntroDocsEmptyStateProps> = ({
4141
title,
4242
}) => {
4343
return (
44-
<div className="w-full h-full border border-gray rounded-md p-4 flex flex-col justify-between gap-y-12">
45-
<div className="flex flex-col gap-y-4 text-foreground">
46-
{title && <p className="text-lg font-bold">{title}</p>}
47-
<p>
48-
{linkPreambleText}{' '}
49-
<DocExternalLink
50-
link={link}
51-
description={linkText}
52-
className="inline"
53-
/>
54-
</p>
55-
</div>
44+
<div className="w-full h-full flex flex-col gap-y-4 text-foreground py-8">
45+
{title && <p className="text-lg font-bold">{title}</p>}
46+
<p className="text-sm">
47+
{linkPreambleText}{' '}
48+
<DocExternalLink
49+
link={link}
50+
description={linkText}
51+
className="inline"
52+
/>
53+
</p>
5654
</div>
5755
);
5856
};

internal/integrations/alerting/alerter.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,18 @@ func (t *TenantAlertManager) getFailedItems(failedWorkflowRuns *repository.ListW
208208
readableId = workflowRun.Workflow.Name
209209
}
210210

211+
finishedAt := time.Now().UTC()
212+
213+
if workflowRun.WorkflowRun.FinishedAt.Valid && !workflowRun.WorkflowRun.FinishedAt.Time.IsZero() {
214+
finishedAt = workflowRun.WorkflowRun.FinishedAt.Time
215+
}
216+
211217
res = append(res, alerttypes.WorkflowRunFailedItem{
212218
Link: fmt.Sprintf("%s/workflow-runs/%s?tenant=%s", t.serverURL, workflowRunId, tenantId),
213219
WorkflowName: workflowRun.Workflow.Name,
214220
WorkflowRunReadableId: readableId,
215-
RelativeDate: timediff.TimeDiff(workflowRun.WorkflowRun.FinishedAt.Time),
216-
AbsoluteDate: workflowRun.WorkflowRun.FinishedAt.Time.Format("2006-01-02 15:04:05"),
221+
RelativeDate: timediff.TimeDiff(finishedAt),
222+
AbsoluteDate: finishedAt.Format("2006-01-02 15:04:05"),
217223
})
218224
}
219225

0 commit comments

Comments
 (0)