Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: PR deployments view

Browse Source
This commit is contained in:
Andras Bacsai 2022-05-19 13:44:45 +02:00
parent ebdd3601b3
commit b01f5f47b3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/routes/applications/[id]/previews/index.json.ts
View File

@ -17,7 +17,7 @@ export const get: RequestHandler = async (event) => {
const destinationDocker = await db.getDestinationByApplicationId({ id, teamId }); const destinationDocker = await db.getDestinationByApplicationId({ id, teamId });
const docker = dockerInstance({ destinationDocker }); const docker = dockerInstance({ destinationDocker });
const listContainers = await docker.engine.listContainers({ const listContainers = await docker.engine.listContainers({
filters: { network: [destinationDocker.network] } filters: { network: [destinationDocker.network], name: [id] }
}); });
const containers = listContainers.filter((container) => { const containers = listContainers.filter((container) => {
return ( return (
@ -30,11 +30,7 @@ export const get: RequestHandler = async (event) => {
JSON.parse(Buffer.from(container.Labels['coolify.configuration'], 'base64').toString()) JSON.parse(Buffer.from(container.Labels['coolify.configuration'], 'base64').toString())
) )
.filter((container) => { .filter((container) => {
return ( return container.pullmergeRequestId && container.applicationId === id;
container.type !== 'manual' &&
container.type !== 'webhook_commit' &&
container.applicationId === id
);
}); });
return { return {
body: { body: {

10
src/routes/applications/[id]/previews/index.svelte
View File

@ -31,6 +31,7 @@
import { errorNotification } from '$lib/form'; import { errorNotification } from '$lib/form';
import { toast } from '@zerodevx/svelte-toast'; import { toast } from '@zerodevx/svelte-toast';
import { t } from '$lib/translations'; import { t } from '$lib/translations';
import { goto } from '$app/navigation';
const { id } = $page.params; const { id } = $page.params;
async function refreshSecrets() { async function refreshSecrets() {
@ -39,11 +40,18 @@
} }
async function redeploy(container) { async function redeploy(container) {
try { try {
await post(`/applications/${id}/deploy.json`, { const { buildId } = await post(`/applications/${id}/deploy.json`, {
pullmergeRequestId: container.pullmergeRequestId, pullmergeRequestId: container.pullmergeRequestId,
branch: container.branch branch: container.branch
}); });
toast.push('Application redeployed queued.'); toast.push('Application redeployed queued.');
if ($page.url.pathname.startsWith(`/applications/${id}/logs/build`)) {
return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`);
} else {
return await goto(`/applications/${id}/logs/build?buildId=${buildId}`, {
replaceState: true
});
}
} catch ({ error }) { } catch ({ error }) {
return errorNotification(error); return errorNotification(error);
} }