Skip to content

Commit 2b5c4f2

Browse files
kacpersawkacpersaw
committed
Reformat code
1 parent 6803ace commit 2b5c4f2

File tree

3 files changed

+43
-26
lines changed

3 files changed

+43
-26
lines changed

‎site/src/modules/workspaces/WorkspaceBuildData/WorkspaceBuildData.tsx

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
2-
import Tooltip from "@mui/material/Tooltip";
32
import Skeleton from "@mui/material/Skeleton";
3+
import Tooltip from "@mui/material/Tooltip";
44
import type { WorkspaceBuild } from "api/typesGenerated";
55
import { BuildIcon } from "components/BuildIcon/BuildIcon";
6+
import { InfoIcon } from "lucide-react";
67
import { createDayString } from "utils/createDayString";
78
import {
89
getDisplayInitiatorBuildReason,
910
getDisplayWorkspaceBuildInitiatedBy,
1011
getDisplayWorkspaceBuildStatus,
1112
} from "utils/workspace";
12-
import { InfoIcon } from "lucide-react";
1313

1414
export const WorkspaceBuildData = ({ build }: { build: WorkspaceBuild }) => {
1515
const theme = useTheme();
@@ -42,16 +42,17 @@ export const WorkspaceBuildData = ({ build }: { build: WorkspaceBuild }) => {
4242
<span css={{ fontWeight: 500 }}>
4343
{getDisplayWorkspaceBuildInitiatedBy(build)}
4444
</span>
45-
{getDisplayInitiatorBuildReason(build.reason) && build.transition === 'start' && (
46-
<Tooltip title={getDisplayInitiatorBuildReason(build.reason)}>
47-
<InfoIcon
48-
css={(theme) => ({
49-
color: theme.palette.info.light,
50-
})}
51-
className="size-icon-xs -mt-px"
52-
/>
53-
</Tooltip>
54-
)}
45+
{getDisplayInitiatorBuildReason(build.reason) &&
46+
build.transition === "start" && (
47+
<Tooltip title={getDisplayInitiatorBuildReason(build.reason)}>
48+
<InfoIcon
49+
css={(theme) => ({
50+
color: theme.palette.info.light,
51+
})}
52+
className="size-icon-xs -mt-px"
53+
/>
54+
</Tooltip>
55+
)}
5556
</div>
5657
<div
5758
css={{

‎site/src/pages/AuditPage/AuditLogRow/AuditLogRow.tsx

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import { type FC, useState } from "react";
1515
import { Link as RouterLink } from "react-router-dom";
1616
import type { ThemeRole } from "theme/roles";
1717
import userAgentParser from "ua-parser-js";
18+
import { getDisplayInitiatorBuildReason } from "utils/workspace";
1819
import { AuditLogDescription } from "./AuditLogDescription/AuditLogDescription";
1920
import { AuditLogDiff } from "./AuditLogDiff/AuditLogDiff";
2021
import {
2122
determineGroupDiff,
2223
determineIdPSyncMappingDiff,
2324
} from "./AuditLogDiff/auditUtils";
24-
import { getDisplayInitiatorBuildReason } from "utils/workspace";
2525

2626
const httpStatusColor = (httpStatus: number): ThemeRole => {
2727
// Treat server errors (500) as errors
@@ -183,12 +183,19 @@ export const AuditLogRow: FC<AuditLogRowProps> = ({
183183
</Link>
184184
</div>
185185
)}
186-
{getDisplayInitiatorBuildReason(auditLog.additional_fields?.build_reason) && auditLog.action === 'start' && (
187-
<div>
188-
<h4 css={styles.auditLogInfoHeader}>Reason:</h4>
189-
<div>{getDisplayInitiatorBuildReason(auditLog.additional_fields?.build_reason)}</div>
190-
</div>
191-
)}
186+
{getDisplayInitiatorBuildReason(
187+
auditLog.additional_fields?.build_reason,
188+
) &&
189+
auditLog.action === "start" && (
190+
<div>
191+
<h4 css={styles.auditLogInfoHeader}>Reason:</h4>
192+
<div>
193+
{getDisplayInitiatorBuildReason(
194+
auditLog.additional_fields?.build_reason,
195+
)}
196+
</div>
197+
</div>
198+
)}
192199
</div>
193200
}
194201
>
@@ -220,12 +227,19 @@ export const AuditLogRow: FC<AuditLogRowProps> = ({
220227
</strong>
221228
</span>
222229
)}
223-
{getDisplayInitiatorBuildReason(auditLog.additional_fields?.build_reason) && auditLog.action === 'start' && (
224-
<span css={styles.auditLogInfo}>
225-
<span>Reason: </span>
226-
<strong>{getDisplayInitiatorBuildReason(auditLog.additional_fields?.build_reason)}</strong>
227-
</span>
228-
)}
230+
{getDisplayInitiatorBuildReason(
231+
auditLog.additional_fields?.build_reason,
232+
) &&
233+
auditLog.action === "start" && (
234+
<span css={styles.auditLogInfo}>
235+
<span>Reason: </span>
236+
<strong>
237+
{getDisplayInitiatorBuildReason(
238+
auditLog.additional_fields?.build_reason,
239+
)}
240+
</strong>
241+
</span>
242+
)}
229243
</Stack>
230244
)}
231245
</Stack>

‎site/src/utils/workspace.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ export const getDisplayWorkspaceBuildInitiatedBy = (
9292
return undefined;
9393
};
9494

95-
export const getDisplayInitiatorBuildReason = (buildReason: string): string | undefined => {
95+
export const getDisplayInitiatorBuildReason = (
96+
buildReason: string,
97+
): string | undefined => {
9698
switch (buildReason) {
9799
case "initiator":
98100
return "API";

0 commit comments

Comments
 (0)