Skip to content

Commit 8293894

Browse files
AbhineetJainAbhineetJain
authored
refactor: update Prettier printWidth to 100 (coder#2684)
1 parent 09722ae commit 8293894

File tree

108 files changed

+786
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+786
-232
lines changed

‎site/.prettierrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"printWidth": 120,
2+
"printWidth": 100,
33
"semi": false,
44
"trailingComma": "all",
55
"overrides": [

‎site/can-ndjson-stream.d.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
declare module "can-ndjson-stream" {
2-
function ndjsonStream<TValueType>(body: ReadableStream<Uint8Array> | null): Promise<ReadableStream<TValueType>>
2+
function ndjsonStream<TValueType>(
3+
body: ReadableStream<Uint8Array> | null,
4+
): Promise<ReadableStream<TValueType>>
35
export default ndjsonStream
46
}

‎site/e2e/playwright.config.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ const config: PlaywrightTestConfig = {
1717
// https://playwright.dev/docs/test-advanced#launching-a-development-web-server-during-the-tests
1818
webServer: {
1919
// Run the coder daemon directly.
20-
command: `go run -tags embed ${path.join(__dirname, "../../cmd/coder/main.go")} server --in-memory`,
20+
command: `go run -tags embed ${path.join(
21+
__dirname,
22+
"../../cmd/coder/main.go",
23+
)} server --in-memory`,
2124
port: 3000,
2225
timeout: 120 * 10000,
2326
reuseExistingServer: false,

‎site/e2e/util.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export const timeout = (timeoutInMilliseconds: number): Promise<void> => {
2222
* @param timeToWaitInMilliseconds The total time to wait for the condition to be `true`.
2323
* @returns
2424
*/
25-
export const waitFor = async (f: () => Promise<boolean>, timeToWaitInMilliseconds = 30000): Promise<void> => {
25+
export const waitFor = async (
26+
f: () => Promise<boolean>,
27+
timeToWaitInMilliseconds = 30000,
28+
): Promise<void> => {
2629
let elapsedTime = 0
2730
const timeToWaitPerIteration = 1000
2831

@@ -58,7 +61,10 @@ interface WaitForClientSideNavigationOpts {
5861
* waitForNavigation waits for load events on the DOM (ex: after a page load
5962
* from the server).
6063
*/
61-
export const waitForClientSideNavigation = async (page: Page, opts: WaitForClientSideNavigationOpts): Promise<void> => {
64+
export const waitForClientSideNavigation = async (
65+
page: Page,
66+
opts: WaitForClientSideNavigationOpts,
67+
): Promise<void> => {
6268
console.info(`--- waitForClientSideNavigation: start`)
6369

6470
await Promise.all([

‎site/htmlTemplates/index.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
<meta property="og:type" content="website" />
1818
<meta property="csp-nonce" content="{{ .CSP.Nonce }}" />
1919
<meta property="csrf-token" content="{{ .CSRF.Token }}" />
20-
<meta id="api-response" data-statuscode="{{ .APIResponse.StatusCode }}" data-message="{{ .APIResponse.Message }}" />
20+
<meta
21+
id="api-response"
22+
data-statuscode="{{ .APIResponse.StatusCode }}"
23+
data-message="{{ .APIResponse.Message }}"
24+
/>
2125
<link rel="mask-icon" href="/static/favicon.svg" color="#000000" crossorigin="use-credentials" />
2226
<link rel="alternate icon" type="image/png" href="/favicon.png" />
2327
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />

‎site/jest.setup.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ CONSOLE_FAIL_TYPES.forEach((logType: string) => {
4646
const consoleAsAny = global.console as any
4747
// eslint-disable-next-line @typescript-eslint/no-explicit-any
4848
consoleAsAny[logType] = (format: string, ...args: any[]): void => {
49-
throw new Error(`Failing due to console.${logType} while running test!\n\n${util.format(format, ...args)}`)
49+
throw new Error(
50+
`Failing due to console.${logType} while running test!\n\n${util.format(format, ...args)}`,
51+
)
5052
}
5153
})
5254

‎site/src/AppRouter.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import { WorkspaceBuildPage } from "./pages/WorkspaceBuildPage/WorkspaceBuildPag
1919
import { WorkspacePage } from "./pages/WorkspacePage/WorkspacePage"
2020
import { WorkspaceSchedulePage } from "./pages/WorkspaceSchedulePage/WorkspaceSchedulePage"
2121

22-
const WorkspaceAppErrorPage = lazy(() => import("./pages/WorkspaceAppErrorPage/WorkspaceAppErrorPage"))
22+
const WorkspaceAppErrorPage = lazy(
23+
() => import("./pages/WorkspaceAppErrorPage/WorkspaceAppErrorPage"),
24+
)
2325
const TerminalPage = lazy(() => import("./pages/TerminalPage/TerminalPage"))
2426
const WorkspacesPage = lazy(() => import("./pages/WorkspacesPage/WorkspacesPage"))
2527
const CreateWorkspacePage = lazy(() => import("./pages/CreateWorkspacePage/CreateWorkspacePage"))

‎site/src/api/api.ts

+72-24
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,22 @@ export const provisioners: TypesGen.ProvisionerDaemon[] = [
2222
},
2323
]
2424

25-
export const login = async (email: string, password: string): Promise<TypesGen.LoginWithPasswordResponse> => {
25+
export const login = async (
26+
email: string,
27+
password: string,
28+
): Promise<TypesGen.LoginWithPasswordResponse> => {
2629
const payload = JSON.stringify({
2730
email,
2831
password,
2932
})
3033

31-
const response = await axios.post<TypesGen.LoginWithPasswordResponse>("/api/v2/users/login", payload, {
32-
headers: { ...CONTENT_TYPE_JSON },
33-
})
34+
const response = await axios.post<TypesGen.LoginWithPasswordResponse>(
35+
"/api/v2/users/login",
36+
payload,
37+
{
38+
headers: { ...CONTENT_TYPE_JSON },
39+
},
40+
)
3441

3542
return response.data
3643
}
@@ -53,7 +60,10 @@ export const checkUserPermissions = async (
5360
userId: string,
5461
params: TypesGen.UserAuthorizationRequest,
5562
): Promise<TypesGen.UserAuthorizationResponse> => {
56-
const response = await axios.post<TypesGen.UserAuthorizationResponse>(`/api/v2/users/${userId}/authorization`, params)
63+
const response = await axios.post<TypesGen.UserAuthorizationResponse>(
64+
`/api/v2/users/${userId}/authorization`,
65+
params,
66+
)
5767
return response.data
5868
}
5969

@@ -83,35 +93,54 @@ export const getTemplate = async (templateId: string): Promise<TypesGen.Template
8393
}
8494

8595
export const getTemplates = async (organizationId: string): Promise<TypesGen.Template[]> => {
86-
const response = await axios.get<TypesGen.Template[]>(`/api/v2/organizations/${organizationId}/templates`)
96+
const response = await axios.get<TypesGen.Template[]>(
97+
`/api/v2/organizations/${organizationId}/templates`,
98+
)
8799
return response.data
88100
}
89101

90-
export const getTemplateByName = async (organizationId: string, name: string): Promise<TypesGen.Template> => {
91-
const response = await axios.get<TypesGen.Template>(`/api/v2/organizations/${organizationId}/templates/${name}`)
102+
export const getTemplateByName = async (
103+
organizationId: string,
104+
name: string,
105+
): Promise<TypesGen.Template> => {
106+
const response = await axios.get<TypesGen.Template>(
107+
`/api/v2/organizations/${organizationId}/templates/${name}`,
108+
)
92109
return response.data
93110
}
94111

95112
export const getTemplateVersion = async (versionId: string): Promise<TypesGen.TemplateVersion> => {
96-
const response = await axios.get<TypesGen.TemplateVersion>(`/api/v2/templateversions/${versionId}`)
113+
const response = await axios.get<TypesGen.TemplateVersion>(
114+
`/api/v2/templateversions/${versionId}`,
115+
)
97116
return response.data
98117
}
99118

100-
export const getTemplateVersionSchema = async (versionId: string): Promise<TypesGen.ParameterSchema[]> => {
101-
const response = await axios.get<TypesGen.ParameterSchema[]>(`/api/v2/templateversions/${versionId}/schema`)
119+
export const getTemplateVersionSchema = async (
120+
versionId: string,
121+
): Promise<TypesGen.ParameterSchema[]> => {
122+
const response = await axios.get<TypesGen.ParameterSchema[]>(
123+
`/api/v2/templateversions/${versionId}/schema`,
124+
)
102125
return response.data
103126
}
104127

105-
export const getTemplateVersionResources = async (versionId: string): Promise<TypesGen.WorkspaceResource[]> => {
106-
const response = await axios.get<TypesGen.WorkspaceResource[]>(`/api/v2/templateversions/${versionId}/resources`)
128+
export const getTemplateVersionResources = async (
129+
versionId: string,
130+
): Promise<TypesGen.WorkspaceResource[]> => {
131+
const response = await axios.get<TypesGen.WorkspaceResource[]>(
132+
`/api/v2/templateversions/${versionId}/resources`,
133+
)
107134
return response.data
108135
}
109136

110137
export const getWorkspace = async (
111138
workspaceId: string,
112139
params?: TypesGen.WorkspaceOptions,
113140
): Promise<TypesGen.Workspace> => {
114-
const response = await axios.get<TypesGen.Workspace>(`/api/v2/workspaces/${workspaceId}`, { params })
141+
const response = await axios.get<TypesGen.Workspace>(`/api/v2/workspaces/${workspaceId}`, {
142+
params,
143+
})
115144
return response.data
116145
}
117146

@@ -128,7 +157,9 @@ export const getWorkspacesURL = (filter?: TypesGen.WorkspaceFilter): string => {
128157
return searchString ? `${basePath}?${searchString}` : basePath
129158
}
130159

131-
export const getWorkspaces = async (filter?: TypesGen.WorkspaceFilter): Promise<TypesGen.Workspace[]> => {
160+
export const getWorkspaces = async (
161+
filter?: TypesGen.WorkspaceFilter,
162+
): Promise<TypesGen.Workspace[]> => {
132163
const url = getWorkspacesURL(filter)
133164
const response = await axios.get<TypesGen.Workspace[]>(url)
134165
return response.data
@@ -139,13 +170,18 @@ export const getWorkspaceByOwnerAndName = async (
139170
workspaceName: string,
140171
params?: TypesGen.WorkspaceOptions,
141172
): Promise<TypesGen.Workspace> => {
142-
const response = await axios.get<TypesGen.Workspace>(`/api/v2/users/${username}/workspace/${workspaceName}`, {
143-
params,
144-
})
173+
const response = await axios.get<TypesGen.Workspace>(
174+
`/api/v2/users/${username}/workspace/${workspaceName}`,
175+
{
176+
params,
177+
},
178+
)
145179
return response.data
146180
}
147181

148-
export const getWorkspaceResources = async (workspaceBuildID: string): Promise<TypesGen.WorkspaceResource[]> => {
182+
export const getWorkspaceResources = async (
183+
workspaceBuildID: string,
184+
): Promise<TypesGen.WorkspaceResource[]> => {
149185
const response = await axios.get<TypesGen.WorkspaceResource[]>(
150186
`/api/v2/workspacebuilds/${workspaceBuildID}/resources`,
151187
)
@@ -167,7 +203,9 @@ export const startWorkspace = postWorkspaceBuild("start")
167203
export const stopWorkspace = postWorkspaceBuild("stop")
168204
export const deleteWorkspace = postWorkspaceBuild("delete")
169205

170-
export const cancelWorkspaceBuild = async (workspaceBuildId: TypesGen.WorkspaceBuild["id"]): Promise<Types.Message> => {
206+
export const cancelWorkspaceBuild = async (
207+
workspaceBuildId: TypesGen.WorkspaceBuild["id"],
208+
): Promise<Types.Message> => {
171209
const response = await axios.patch(`/api/v2/workspacebuilds/${workspaceBuildId}/cancel`)
172210
return response.data
173211
}
@@ -181,7 +219,10 @@ export const createWorkspace = async (
181219
organizationId: string,
182220
workspace: TypesGen.CreateWorkspaceRequest,
183221
): Promise<TypesGen.Workspace> => {
184-
const response = await axios.post<TypesGen.Workspace>(`/api/v2/organizations/${organizationId}/workspaces`, workspace)
222+
const response = await axios.post<TypesGen.Workspace>(
223+
`/api/v2/organizations/${organizationId}/workspaces`,
224+
workspace,
225+
)
185226
return response.data
186227
}
187228

@@ -263,8 +304,12 @@ export const regenerateUserSSHKey = async (userId = "me"): Promise<TypesGen.GitS
263304
return response.data
264305
}
265306

266-
export const getWorkspaceBuilds = async (workspaceId: string): Promise<TypesGen.WorkspaceBuild[]> => {
267-
const response = await axios.get<TypesGen.WorkspaceBuild[]>(`/api/v2/workspaces/${workspaceId}/builds`)
307+
export const getWorkspaceBuilds = async (
308+
workspaceId: string,
309+
): Promise<TypesGen.WorkspaceBuild[]> => {
310+
const response = await axios.get<TypesGen.WorkspaceBuild[]>(
311+
`/api/v2/workspaces/${workspaceId}/builds`,
312+
)
268313
return response.data
269314
}
270315

@@ -279,7 +324,10 @@ export const getWorkspaceBuildByNumber = async (
279324
return response.data
280325
}
281326

282-
export const getWorkspaceBuildLogs = async (buildname: string, before: Date): Promise<TypesGen.ProvisionerJobLog[]> => {
327+
export const getWorkspaceBuildLogs = async (
328+
buildname: string,
329+
before: Date,
330+
): Promise<TypesGen.ProvisionerJobLog[]> => {
283331
const response = await axios.get<TypesGen.ProvisionerJobLog[]>(
284332
`/api/v2/workspacebuilds/${buildname}/logs?before=${before.getTime()}`,
285333
)

‎site/src/api/errors.ts

+13-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ export const isApiError = (err: any): err is ApiError => {
2727
const response = err.response?.data
2828

2929
return (
30-
typeof response.message === "string" && (typeof response.errors === "undefined" || Array.isArray(response.errors))
30+
typeof response.message === "string" &&
31+
(typeof response.errors === "undefined" || Array.isArray(response.errors))
3132
)
3233
}
3334

@@ -40,7 +41,8 @@ export const isApiError = (err: any): err is ApiError => {
4041
* @param error ApiError
4142
* @returns true if the ApiError contains error messages for specific form fields.
4243
*/
43-
export const hasApiFieldErrors = (error: ApiError): boolean => Array.isArray(error.response.data.validations)
44+
export const hasApiFieldErrors = (error: ApiError): boolean =>
45+
Array.isArray(error.response.data.validations)
4446

4547
export const mapApiErrorToFieldErrors = (apiErrorResponse: ApiErrorResponse): FieldErrors => {
4648
const result: FieldErrors = {}
@@ -60,5 +62,12 @@ export const mapApiErrorToFieldErrors = (apiErrorResponse: ApiErrorResponse): Fi
6062
* @param defaultMessage
6163
* @returns error's message if ApiError or Error, else defaultMessage
6264
*/
63-
export const getErrorMessage = (error: Error | ApiError | unknown, defaultMessage: string): string =>
64-
isApiError(error) ? error.response.data.message : error instanceof Error ? error.message : defaultMessage
65+
export const getErrorMessage = (
66+
error: Error | ApiError | unknown,
67+
defaultMessage: string,
68+
): string =>
69+
isApiError(error)
70+
? error.response.data.message
71+
: error instanceof Error
72+
? error.message
73+
: defaultMessage

‎site/src/api/typesGenerated.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,13 @@ export type ParameterSourceScheme = "data" | "none"
512512
export type ParameterTypeSystem = "hcl" | "none"
513513

514514
// From codersdk/provisionerdaemons.go:47:6
515-
export type ProvisionerJobStatus = "canceled" | "canceling" | "failed" | "pending" | "running" | "succeeded"
515+
export type ProvisionerJobStatus =
516+
| "canceled"
517+
| "canceling"
518+
| "failed"
519+
| "pending"
520+
| "running"
521+
| "succeeded"
516522

517523
// From codersdk/organizations.go:14:6
518524
export type ProvisionerStorageMethod = "file"

‎site/src/components/AvatarData/AvatarData.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ export const AvatarData: FC<AvatarDataProps> = ({ title, subtitle, link }) => {
2222
</Avatar>
2323

2424
{link ? (
25-
<Link component={RouterLink} to={link} className={combineClasses([styles.info, styles.link])}>
25+
<Link
26+
component={RouterLink}
27+
to={link}
28+
className={combineClasses([styles.info, styles.link])}
29+
>
2630
<b>{title}</b>
2731
<span>{subtitle}</span>
2832
</Link>

‎site/src/components/BorderedMenu/BorderedMenu.stories.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ export default {
1111

1212
const Template: Story<BorderedMenuProps> = (args: BorderedMenuProps) => (
1313
<BorderedMenu {...args}>
14-
<BorderedMenuRow title="Item 1" description="Here's a description" Icon={BuildingIcon} path="/" />
14+
<BorderedMenuRow
15+
title="Item 1"
16+
description="Here's a description"
17+
Icon={BuildingIcon}
18+
path="/"
19+
/>
1520
<BorderedMenuRow
1621
active
1722
title="Item 2"

‎site/src/components/BorderedMenu/BorderedMenu.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ export const BorderedMenu: FC<BorderedMenuProps> = ({ children, variant, ...rest
1212
const styles = useStyles()
1313

1414
return (
15-
<Popover classes={{ root: styles.root, paper: styles.paperRoot }} data-variant={variant} {...rest}>
15+
<Popover
16+
classes={{ root: styles.root, paper: styles.paperRoot }}
17+
data-variant={variant}
18+
{...rest}
19+
>
1620
{children}
1721
</Popover>
1822
)

‎site/src/components/BuildsTable/BuildsTable.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ export const BuildsTable: FC<BuildsTableProps> = ({ builds, className }) => {
6969
>
7070
<TableCellLink to={buildPageLink}>{build.transition}</TableCellLink>
7171
<TableCellLink to={buildPageLink}>
72-
<span style={{ color: theme.palette.text.secondary }}>{displayWorkspaceBuildDuration(build)}</span>
72+
<span style={{ color: theme.palette.text.secondary }}>
73+
{displayWorkspaceBuildDuration(build)}
74+
</span>
7375
</TableCellLink>
7476
<TableCellLink to={buildPageLink}>
7577
<span style={{ color: theme.palette.text.secondary }}>

‎site/src/components/CodeExample/CodeExample.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ const useStyles = makeStyles((theme) => ({
3737
padding: theme.spacing(0.5),
3838
},
3939
code: {
40-
padding: `${theme.spacing(0.5)}px ${theme.spacing(0.75)}px ${theme.spacing(0.5)}px ${theme.spacing(2)}px`,
40+
padding: `
41+
${theme.spacing(0.5)}px
42+
${theme.spacing(0.75)}px
43+
${theme.spacing(0.5)}px
44+
${theme.spacing(2)}px
45+
`,
4146
whiteSpace: "nowrap",
4247
width: "100%",
4348
overflowX: "auto",

‎site/src/components/ConfirmDialog/ConfirmDialog.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ const CONFIRM_DIALOG_DEFAULTS: Record<ConfirmDialogType, ConfirmDialogTypeConfig
2525
},
2626
}
2727

28-
export interface ConfirmDialogProps extends Omit<DialogActionButtonsProps, "color" | "confirmDialog" | "onCancel"> {
28+
export interface ConfirmDialogProps
29+
extends Omit<DialogActionButtonsProps, "color" | "confirmDialog" | "onCancel"> {
2930
readonly description?: React.ReactNode
3031
/**
3132
* hideCancel hides the cancel button when set true, and shows the cancel

0 commit comments

Comments
 (0)