Merge pull request #1907 from Dokploy/1878-dokploy-application-settings-not-linked-resulting-in-progress-lost-on-save

Siumauricio · web-flow · commit 21e46f538284 · 2025-05-16T23:23:20.000-06:00
fix: update dependencies in save provider components to use optional …
diff --git a/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx b/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx
@@ -86,7 +86,7 @@ export const ShowDeployments = ({
 							<span>Webhook URL: </span>
 							<div className="flex flex-row items-center gap-2">
 								<span className="break-all text-muted-foreground">
-									{`${url}/api/deploy${type === 'compose' ? '/compose' : ''}/${refreshToken}`}
+									{`${url}/api/deploy${type === "compose" ? "/compose" : ""}/${refreshToken}`}
 								</span>
 								{(type === "application" || type === "compose") && (
 									<RefreshToken id={id} type={type} />
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx
@@ -136,7 +136,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules || false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.applicationId, form]);
 
 	const onSubmit = async (data: BitbucketProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx
@@ -53,7 +53,7 @@ export const SaveDockerProvider = ({ applicationId }: Props) => {
 				registryURL: data.registryUrl || "",
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.applicationId, form]);
 
 	const onSubmit = async (values: DockerProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-gitea-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-gitea-provider.tsx
@@ -158,7 +158,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules || false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.applicationId, form]);
 
 	const onSubmit = async (data: GiteaProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx
@@ -134,7 +134,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.applicationId, form]);
 
 	const onSubmit = async (data: GithubProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx
@@ -141,7 +141,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.applicationId, form]);
 
 	const onSubmit = async (data: GitlabProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx
@@ -136,7 +136,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.composeId, form]);
 
 	const onSubmit = async (data: BitbucketProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx
@@ -142,7 +142,7 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.composeId, form]);
 
 	const onSubmit = async (data: GiteaProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx
@@ -134,7 +134,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.composeId, form]);
 
 	const onSubmit = async (data: GithubProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx
@@ -142,7 +142,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data, form]);
+	}, [form.reset, data?.composeId, form]);
 
 	const onSubmit = async (data: GitlabProvider) => {
 		await mutateAsync({
diff --git a/apps/dokploy/pages/_error.tsx b/apps/dokploy/pages/_error.tsx
@@ -80,7 +80,11 @@ export default function Custom404({ statusCode, error }: Props) {
 				<footer className="mt-auto text-center py-5">
 					<div className="max-w-[85rem] mx-auto px-4 sm:px-6 lg:px-8">
 						<p className="text-sm text-gray-500">
-							<Link href="https://github.com/Dokploy/dokploy/issues" target="_blank"  className="underline hover:text-primary transition-colors" >
+							<Link
+								href="https://github.com/Dokploy/dokploy/issues"
+								target="_blank"
+								className="underline hover:text-primary transition-colors"
+							>
 								Submit Log in issue on Github
 							</Link>
 						</p>

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {`
`136`	`136`	`enableSubmodules: data.enableSubmodules \|\| false,`
`137`	`137`	`});`
`138`	`138`	`}`
`139`		`- }, [form.reset, data, form]);`
	`139`	`+ }, [form.reset, data?.applicationId, form]);`
`140`	`140`
`141`	`141`	`const onSubmit = async (data: BitbucketProvider) => {`
`142`	`142`	`await mutateAsync({`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export const SaveDockerProvider = ({ applicationId }: Props) => {`
`53`	`53`	`registryURL: data.registryUrl \|\| "",`
`54`	`54`	`});`
`55`	`55`	`}`
`56`		`- }, [form.reset, data, form]);`
	`56`	`+ }, [form.reset, data?.applicationId, form]);`
`57`	`57`
`58`	`58`	`const onSubmit = async (values: DockerProvider) => {`
`59`	`59`	`await mutateAsync({`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {`
`158`	`158`	`enableSubmodules: data.enableSubmodules \|\| false,`
`159`	`159`	`});`
`160`	`160`	`}`
`161`		`- }, [form.reset, data, form]);`
	`161`	`+ }, [form.reset, data?.applicationId, form]);`
`162`	`162`
`163`	`163`	`const onSubmit = async (data: GiteaProvider) => {`
`164`	`164`	`await mutateAsync({`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {`
`134`	`134`	`enableSubmodules: data.enableSubmodules ?? false,`
`135`	`135`	`});`
`136`	`136`	`}`
`137`		`- }, [form.reset, data, form]);`
	`137`	`+ }, [form.reset, data?.applicationId, form]);`
`138`	`138`
`139`	`139`	`const onSubmit = async (data: GithubProvider) => {`
`140`	`140`	`await mutateAsync({`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {`
`141`	`141`	`enableSubmodules: data.enableSubmodules ?? false,`
`142`	`142`	`});`
`143`	`143`	`}`
`144`		`- }, [form.reset, data, form]);`
	`144`	`+ }, [form.reset, data?.applicationId, form]);`
`145`	`145`
`146`	`146`	`const onSubmit = async (data: GitlabProvider) => {`
`147`	`147`	`await mutateAsync({`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {`
`142`	`142`	`enableSubmodules: data.enableSubmodules ?? false,`
`143`	`143`	`});`
`144`	`144`	`}`
`145`		`- }, [form.reset, data, form]);`
	`145`	`+ }, [form.reset, data?.composeId, form]);`
`146`	`146`
`147`	`147`	`const onSubmit = async (data: GiteaProvider) => {`
`148`	`148`	`await mutateAsync({`