Skip to content

Commit 6dfa762

Browse files
authored
Merge pull request #4104 from nktnet1/typo-fix
fix: typos, grammar, spelling, style & format
2 parents fb7b7cf + 0e3bc44 commit 6dfa762

File tree

79 files changed

+171
-168
lines changed

Some content is hidden

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

79 files changed

+171
-168
lines changed

apps/dokploy/__test__/compose/network/network-root.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ networks:
292292
dokploy-network:
293293
`;
294294

295-
test("It shoudn't add suffix to dokploy-network", () => {
295+
test("It shouldn't add suffix to dokploy-network", () => {
296296
const composeData = parse(composeFile7) as ComposeSpecification;
297297

298298
const suffix = generateRandomHash();

apps/dokploy/__test__/compose/network/network-service.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ services:
195195
- dokploy-network
196196
`;
197197

198-
test("It shoudn't add suffix to dokploy-network in services", () => {
198+
test("It shouldn't add suffix to dokploy-network in services", () => {
199199
const composeData = parse(composeFile7) as ComposeSpecification;
200200

201201
const suffix = generateRandomHash();
@@ -241,10 +241,10 @@ services:
241241
dokploy-network:
242242
aliases:
243243
- apid
244-
244+
245245
`;
246246

247-
test("It shoudn't add suffix to dokploy-network in services multiples cases", () => {
247+
test("It shouldn't add suffix to dokploy-network in services multiples cases", () => {
248248
const composeData = parse(composeFile8) as ComposeSpecification;
249249

250250
const suffix = generateRandomHash();

apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts renamed to apps/dokploy/__test__/compose/service/service-volumes-from.test.ts

File renamed without changes.

apps/dokploy/__test__/env/stack-environment.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getEnviromentVariablesObject } from "@dokploy/server/index";
1+
import { getEnvironmentVariablesObject } from "@dokploy/server/index";
22
import { describe, expect, it } from "vitest";
33

44
const projectEnv = `
@@ -15,15 +15,15 @@ DATABASE_NAME=dev_database
1515
SECRET_KEY=env-secret-123
1616
`;
1717

18-
describe("getEnviromentVariablesObject with environment variables (Stack compose)", () => {
18+
describe("getEnvironmentVariablesObject with environment variables (Stack compose)", () => {
1919
it("resolves environment variables correctly for Stack compose", () => {
2020
const serviceEnv = `
2121
FOO=\${{environment.NODE_ENV}}
2222
BAR=\${{environment.API_URL}}
2323
BAZ=test
2424
`;
2525

26-
const result = getEnviromentVariablesObject(
26+
const result = getEnvironmentVariablesObject(
2727
serviceEnv,
2828
projectEnv,
2929
environmentEnv,
@@ -45,7 +45,7 @@ DATABASE_URL=\${{project.DATABASE_URL}}
4545
SERVICE_PORT=4000
4646
`;
4747

48-
const result = getEnviromentVariablesObject(
48+
const result = getEnvironmentVariablesObject(
4949
serviceEnv,
5050
projectEnv,
5151
environmentEnv,
@@ -72,7 +72,7 @@ PASSWORD=secret123
7272
DATABASE_URL=postgresql://\${{environment.USERNAME}}:\${{environment.PASSWORD}}@\${{environment.HOST}}:\${{environment.PORT}}/mydb
7373
`;
7474

75-
const result = getEnviromentVariablesObject(serviceEnv, "", multiRefEnv);
75+
const result = getEnvironmentVariablesObject(serviceEnv, "", multiRefEnv);
7676

7777
expect(result).toEqual({
7878
DATABASE_URL: "postgresql://postgres:secret123@localhost:5432/mydb",
@@ -85,7 +85,7 @@ UNDEFINED_VAR=\${{environment.UNDEFINED_VAR}}
8585
`;
8686

8787
expect(() =>
88-
getEnviromentVariablesObject(serviceWithUndefined, "", environmentEnv),
88+
getEnvironmentVariablesObject(serviceWithUndefined, "", environmentEnv),
8989
).toThrow("Invalid environment variable: environment.UNDEFINED_VAR");
9090
});
9191

@@ -95,7 +95,7 @@ NODE_ENV=production
9595
API_URL=\${{environment.API_URL}}
9696
`;
9797

98-
const result = getEnviromentVariablesObject(
98+
const result = getEnvironmentVariablesObject(
9999
serviceOverrideEnv,
100100
"",
101101
environmentEnv,
@@ -115,7 +115,7 @@ SERVICE_NAME=my-service
115115
COMPLEX_VAR=\${{SERVICE_NAME}}-\${{environment.NODE_ENV}}-\${{project.ENVIRONMENT}}
116116
`;
117117

118-
const result = getEnviromentVariablesObject(
118+
const result = getEnvironmentVariablesObject(
119119
complexServiceEnv,
120120
projectEnv,
121121
environmentEnv,
@@ -150,7 +150,7 @@ ENV_VAR=\${{environment.API_URL}}
150150
DB_NAME=\${{environment.DATABASE_NAME}}
151151
`;
152152

153-
const result = getEnviromentVariablesObject(
153+
const result = getEnvironmentVariablesObject(
154154
serviceWithConflicts,
155155
conflictingProjectEnv,
156156
conflictingEnvironmentEnv,
@@ -170,7 +170,7 @@ SERVICE_VAR=test
170170
PROJECT_VAR=\${{project.ENVIRONMENT}}
171171
`;
172172

173-
const result = getEnviromentVariablesObject(
173+
const result = getEnvironmentVariablesObject(
174174
serviceWithEmpty,
175175
projectEnv,
176176
"",

apps/dokploy/__test__/permissions/enterprise-only-resources.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { describe, it, expect } from "vitest";
21
import {
32
enterpriseOnlyResources,
43
statements,
54
} from "@dokploy/server/lib/access-control";
5+
import { describe, expect, it } from "vitest";
66

77
const FREE_TIER_RESOURCES = [
88
"organization",

apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ interface Props {
4040
type: "application" | "mariadb" | "mongo" | "mysql" | "postgres" | "redis";
4141
}
4242

43-
const AddRedirectchema = z.object({
43+
const AddRedirectSchema = z.object({
4444
replicas: z.number().min(1, "Replicas must be at least 1"),
4545
registryId: z.string().optional(),
4646
});
4747

48-
type AddCommand = z.infer<typeof AddRedirectchema>;
48+
type AddCommand = z.infer<typeof AddRedirectSchema>;
4949

5050
export const ShowClusterSettings = ({ id, type }: Props) => {
5151
const queryMap = {
@@ -87,7 +87,7 @@ export const ShowClusterSettings = ({ id, type }: Props) => {
8787
: {}),
8888
replicas: data?.replicas || 1,
8989
},
90-
resolver: zodResolver(AddRedirectchema),
90+
resolver: zodResolver(AddRedirectSchema),
9191
});
9292

9393
useEffect(() => {

apps/dokploy/components/dashboard/application/advanced/redirects/handle-redirect.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ import { Separator } from "@/components/ui/separator";
3737
import { Switch } from "@/components/ui/switch";
3838
import { api } from "@/utils/api";
3939

40-
const AddRedirectchema = z.object({
40+
const AddRedirectSchema = z.object({
4141
regex: z.string().min(1, "Regex required"),
4242
permanent: z.boolean().default(false),
4343
replacement: z.string().min(1, "Replacement required"),
4444
});
4545

46-
type AddRedirect = z.infer<typeof AddRedirectchema>;
46+
type AddRedirect = z.infer<typeof AddRedirectSchema>;
4747

4848
// Default presets
4949
const redirectPresets = [
@@ -110,7 +110,7 @@ export const HandleRedirect = ({
110110
regex: "",
111111
replacement: "",
112112
},
113-
resolver: zodResolver(AddRedirectchema),
113+
resolver: zodResolver(AddRedirectSchema),
114114
});
115115

116116
useEffect(() => {
@@ -149,7 +149,7 @@ export const HandleRedirect = ({
149149

150150
const onDialogToggle = (open: boolean) => {
151151
setIsOpen(open);
152-
// commented for the moment because not reseting the form if accidentally closed the dialog can be considered as a feature instead of a bug
152+
// commented for the moment because not resetting the form if accidentally closed the dialog can be considered as a feature instead of a bug
153153
// setPresetSelected("");
154154
// form.reset();
155155
};

apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import copy from "copy-to-clipboard";
12
import {
23
ChevronDown,
34
ChevronUp,
@@ -11,7 +12,6 @@ import {
1112
} from "lucide-react";
1213
import React, { useEffect, useMemo, useState } from "react";
1314
import { toast } from "sonner";
14-
import copy from "copy-to-clipboard";
1515
import { AlertBlock } from "@/components/shared/alert-block";
1616
import { DateTooltip } from "@/components/shared/date-tooltip";
1717
import { DialogAction } from "@/components/shared/dialog-action";

apps/dokploy/components/dashboard/application/environment/show-enviroment.tsx renamed to apps/dokploy/components/dashboard/application/environment/show-environment.tsx

File renamed without changes.

apps/dokploy/components/dashboard/application/logs/show.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
9191
}, [option, services, containers]);
9292

9393
const isLoading = option === "native" ? containersLoading : servicesLoading;
94-
const containersLenght =
94+
const containersLength =
9595
option === "native" ? containers?.length : services?.length;
9696

9797
return (
@@ -167,7 +167,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
167167
</>
168168
)}
169169

170-
<SelectLabel>Containers ({containersLenght})</SelectLabel>
170+
<SelectLabel>Containers ({containersLength})</SelectLabel>
171171
</SelectGroup>
172172
</SelectContent>
173173
</Select>

0 commit comments

Comments
 (0)