From 4f3eb7b3627ee7c2231d9730e9ee664074c7cb6f Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 07:25:16 -0700 Subject: [PATCH 1/7] Generate valid appName on changing name The same can probably also be done at other places. Should probably be solved in a generic way. --- apps/dokploy/components/dashboard/project/add-application.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx index cbe48b6dc..45dd893be 100644 --- a/apps/dokploy/components/dashboard/project/add-application.tsx +++ b/apps/dokploy/components/dashboard/project/add-application.tsx @@ -125,7 +125,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => { placeholder="Frontend" {...field} onChange={(e) => { - const val = e.target.value?.trim() || ""; + const val = e.target.value?.trim().toLowerCase().replace(" ", "-") || ""; form.setValue("appName", `${slug}-${val}`); field.onChange(val); }} From fac984d299ec0c0d8a54e523210fc06f1fd1f7a4 Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 07:35:59 -0700 Subject: [PATCH 2/7] same thing for compose --- apps/dokploy/components/dashboard/project/add-compose.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx index a6697eb60..f48348fec 100644 --- a/apps/dokploy/components/dashboard/project/add-compose.tsx +++ b/apps/dokploy/components/dashboard/project/add-compose.tsx @@ -137,7 +137,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => { placeholder="Frontend" {...field} onChange={(e) => { - const val = e.target.value?.trim() || ""; + const val = e.target.value?.trim().toLowerCase() || ""; form.setValue("appName", `${slug}-${val}`); field.onChange(val); }} From 7f378b12ae72a0591c7bde72ce7943aca5965c3a Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 07:37:23 -0700 Subject: [PATCH 3/7] and for database --- apps/dokploy/components/dashboard/project/add-database.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx index e6b36e63b..9f93aa1fb 100644 --- a/apps/dokploy/components/dashboard/project/add-database.tsx +++ b/apps/dokploy/components/dashboard/project/add-database.tsx @@ -341,7 +341,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => { placeholder="Name" {...field} onChange={(e) => { - const val = e.target.value?.trim() || ""; + const val = e.target.value?.trim().toLowerCase() || ""; form.setValue("appName", `${slug}-${val}`); field.onChange(val); }} From e1ec0aee698608ce908a05e927ad085418cf6725 Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 10:50:46 -0700 Subject: [PATCH 4/7] replaceAll --- apps/dokploy/components/dashboard/project/add-application.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx index 45dd893be..cf1b2ad7e 100644 --- a/apps/dokploy/components/dashboard/project/add-application.tsx +++ b/apps/dokploy/components/dashboard/project/add-application.tsx @@ -125,7 +125,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => { placeholder="Frontend" {...field} onChange={(e) => { - const val = e.target.value?.trim().toLowerCase().replace(" ", "-") || ""; + const val = e.target.value?.trim().toLowerCase().replaceAll(" ", "-") || ""; form.setValue("appName", `${slug}-${val}`); field.onChange(val); }} From 2f9448dde9a6de55c36f8af346df5040b47fa4b4 Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 22:13:30 +0200 Subject: [PATCH 5/7] corrections --- apps/dokploy/components/dashboard/project/add-application.tsx | 4 ++-- apps/dokploy/components/dashboard/project/add-compose.tsx | 4 ++-- apps/dokploy/components/dashboard/project/add-database.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx index cf1b2ad7e..113f7e221 100644 --- a/apps/dokploy/components/dashboard/project/add-application.tsx +++ b/apps/dokploy/components/dashboard/project/add-application.tsx @@ -125,8 +125,8 @@ export const AddApplication = ({ projectId, projectName }: Props) => { placeholder="Frontend" {...field} onChange={(e) => { - const val = e.target.value?.trim().toLowerCase().replaceAll(" ", "-") || ""; - form.setValue("appName", `${slug}-${val}`); + const val = e.target.value?.trim() || ""; + form.setValue("appName", `${slug}-${val.toLowerCase().replaceAll(" ", "-")}`); field.onChange(val); }} /> diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx index f48348fec..cdf6c65a4 100644 --- a/apps/dokploy/components/dashboard/project/add-compose.tsx +++ b/apps/dokploy/components/dashboard/project/add-compose.tsx @@ -137,8 +137,8 @@ export const AddCompose = ({ projectId, projectName }: Props) => { placeholder="Frontend" {...field} onChange={(e) => { - const val = e.target.value?.trim().toLowerCase() || ""; - form.setValue("appName", `${slug}-${val}`); + const val = e.target.value?.trim() || ""; + form.setValue("appName", `${slug}-${val.toLowerCase()}`); field.onChange(val); }} /> diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx index 9f93aa1fb..dd8f0f7bf 100644 --- a/apps/dokploy/components/dashboard/project/add-database.tsx +++ b/apps/dokploy/components/dashboard/project/add-database.tsx @@ -341,8 +341,8 @@ export const AddDatabase = ({ projectId, projectName }: Props) => { placeholder="Name" {...field} onChange={(e) => { - const val = e.target.value?.trim().toLowerCase() || ""; - form.setValue("appName", `${slug}-${val}`); + const val = e.target.value?.trim() || ""; + form.setValue("appName", `${slug}-${val.toLowerCase()}`); field.onChange(val); }} /> From 8f83ecb9ef88b9259b792fb1350dc16ef0884d33 Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 22:20:02 +0200 Subject: [PATCH 6/7] formatting --- .../dokploy/components/dashboard/project/add-application.tsx | 5 ++++- apps/dokploy/components/dashboard/project/add-compose.tsx | 5 ++++- apps/dokploy/components/dashboard/project/add-database.tsx | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx index 113f7e221..32d571554 100644 --- a/apps/dokploy/components/dashboard/project/add-application.tsx +++ b/apps/dokploy/components/dashboard/project/add-application.tsx @@ -126,7 +126,10 @@ export const AddApplication = ({ projectId, projectName }: Props) => { {...field} onChange={(e) => { const val = e.target.value?.trim() || ""; - form.setValue("appName", `${slug}-${val.toLowerCase().replaceAll(" ", "-")}`); + form.setValue( + "appName", + `${slug}-${val.toLowerCase().replaceAll(" ", "-")}` + ); field.onChange(val); }} /> diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx index cdf6c65a4..33ff5d807 100644 --- a/apps/dokploy/components/dashboard/project/add-compose.tsx +++ b/apps/dokploy/components/dashboard/project/add-compose.tsx @@ -138,7 +138,10 @@ export const AddCompose = ({ projectId, projectName }: Props) => { {...field} onChange={(e) => { const val = e.target.value?.trim() || ""; - form.setValue("appName", `${slug}-${val.toLowerCase()}`); + form.setValue( + "appName", + `${slug}-${val.toLowerCase()}` + ); field.onChange(val); }} /> diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx index dd8f0f7bf..6c57f5e23 100644 --- a/apps/dokploy/components/dashboard/project/add-database.tsx +++ b/apps/dokploy/components/dashboard/project/add-database.tsx @@ -342,7 +342,10 @@ export const AddDatabase = ({ projectId, projectName }: Props) => { {...field} onChange={(e) => { const val = e.target.value?.trim() || ""; - form.setValue("appName", `${slug}-${val.toLowerCase()}`); + form.setValue( + "appName", + `${slug}-${val.toLowerCase()}` + ); field.onChange(val); }} /> From 847d6ecab1a06216e61bd9a54a4c934100898531 Mon Sep 17 00:00:00 2001 From: Michiel Crefcoeur Date: Mon, 16 Sep 2024 22:21:12 +0200 Subject: [PATCH 7/7] add trailing comma's --- apps/dokploy/components/dashboard/project/add-application.tsx | 2 +- apps/dokploy/components/dashboard/project/add-compose.tsx | 2 +- apps/dokploy/components/dashboard/project/add-database.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx index 32d571554..b35cb48b4 100644 --- a/apps/dokploy/components/dashboard/project/add-application.tsx +++ b/apps/dokploy/components/dashboard/project/add-application.tsx @@ -128,7 +128,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => { const val = e.target.value?.trim() || ""; form.setValue( "appName", - `${slug}-${val.toLowerCase().replaceAll(" ", "-")}` + `${slug}-${val.toLowerCase().replaceAll(" ", "-")}`, ); field.onChange(val); }} diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx index 33ff5d807..728645201 100644 --- a/apps/dokploy/components/dashboard/project/add-compose.tsx +++ b/apps/dokploy/components/dashboard/project/add-compose.tsx @@ -140,7 +140,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => { const val = e.target.value?.trim() || ""; form.setValue( "appName", - `${slug}-${val.toLowerCase()}` + `${slug}-${val.toLowerCase()}`, ); field.onChange(val); }} diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx index 6c57f5e23..41313646e 100644 --- a/apps/dokploy/components/dashboard/project/add-database.tsx +++ b/apps/dokploy/components/dashboard/project/add-database.tsx @@ -344,7 +344,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => { const val = e.target.value?.trim() || ""; form.setValue( "appName", - `${slug}-${val.toLowerCase()}` + `${slug}-${val.toLowerCase()}`, ); field.onChange(val); }}