mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-20 11:08:46 +00:00
Merge branch 'canary' into feat/docker-health-dashboard
This commit is contained in:
@@ -148,7 +148,7 @@ export const ShowDeployment = ({
|
|||||||
<DialogDescription className="flex items-center gap-2">
|
<DialogDescription className="flex items-center gap-2">
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex items-center gap-2">
|
||||||
See all the details of this deployment |{" "}
|
See all the details of this deployment |{" "}
|
||||||
<Badge variant="blank" className="text-xs">
|
<Badge variant="blank" className="text-xs tabular-nums">
|
||||||
{filteredLogs.length} lines
|
{filteredLogs.length} lines
|
||||||
</Badge>
|
</Badge>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ function getServiceInfo(d: DeploymentRow) {
|
|||||||
projectName: app.environment.project.name,
|
projectName: app.environment.project.name,
|
||||||
environmentName: app.environment.name,
|
environmentName: app.environment.name,
|
||||||
serviceId: app.applicationId,
|
serviceId: app.applicationId,
|
||||||
href: `/dashboard/project/${app.environment.project.projectId}/environment/${app.environment.environmentId}/services/application/${app.applicationId}`,
|
href: `/dashboard/project/${app.environment.project.projectId}/environment/${app.environment.environmentId}/services/application/${app.applicationId}?tab=deployments`,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (comp?.environment?.project && comp.environment) {
|
if (comp?.environment?.project && comp.environment) {
|
||||||
@@ -91,7 +91,7 @@ function getServiceInfo(d: DeploymentRow) {
|
|||||||
projectName: comp.environment.project.name,
|
projectName: comp.environment.project.name,
|
||||||
environmentName: comp.environment.name,
|
environmentName: comp.environment.name,
|
||||||
serviceId: comp.composeId,
|
serviceId: comp.composeId,
|
||||||
href: `/dashboard/project/${comp.environment.project.projectId}/environment/${comp.environment.environmentId}/services/compose/${comp.composeId}`,
|
href: `/dashboard/project/${comp.environment.project.projectId}/environment/${comp.environment.environmentId}/services/compose/${comp.composeId}?tab=deployments`,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -53,7 +53,9 @@ export default async function handler(
|
|||||||
return res.status(400).json({ error: "Missing or invalid code" });
|
return res.status(400).json({ error: "Missing or invalid code" });
|
||||||
}
|
}
|
||||||
|
|
||||||
const expiresAt = Math.floor(Date.now() / 1000) + result.expires_in;
|
const expiresAt = result.expires_in
|
||||||
|
? Math.floor(Date.now() / 1000) + result.expires_in
|
||||||
|
: null;
|
||||||
await updateGitlab(gitlab.gitlabId, {
|
await updateGitlab(gitlab.gitlabId, {
|
||||||
accessToken: result.access_token,
|
accessToken: result.access_token,
|
||||||
refreshToken: result.refresh_token,
|
refreshToken: result.refresh_token,
|
||||||
|
|||||||
@@ -44,7 +44,9 @@ export const refreshGitlabToken = async (gitlabProviderId: string) => {
|
|||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
const expiresAt = Math.floor(Date.now() / 1000) + data.expires_in;
|
const expiresAt = data.expires_in
|
||||||
|
? Math.floor(Date.now() / 1000) + data.expires_in
|
||||||
|
: null;
|
||||||
|
|
||||||
await updateGitlab(gitlabProviderId, {
|
await updateGitlab(gitlabProviderId, {
|
||||||
accessToken: data.access_token,
|
accessToken: data.access_token,
|
||||||
|
|||||||
Reference in New Issue
Block a user