From 3deff162bb177153583cdab26856fc5722a229ee Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 13 Feb 2022 13:46:51 +0100 Subject: [PATCH] code cleanup --- src/lib/common.ts | 13 --- src/lib/components/CopyPasswordField.svelte | 3 - src/lib/components/Setting.svelte | 6 -- src/lib/database/destinations.ts | 18 ---- src/lib/database/users.ts | 11 --- src/lib/haproxy/index.ts | 87 ------------------- src/lib/queues/builder.ts | 4 - src/lib/queues/index.ts | 22 ----- src/routes/__layout.svelte | 19 ---- .../configuration/_GitlabRepositories.svelte | 8 -- src/routes/databases/[id]/index.json.ts | 4 +- src/routes/services/[id]/index.json.ts | 21 ----- src/routes/sources/[id]/_Gitlab.svelte | 2 - 13 files changed, 1 insertion(+), 217 deletions(-) diff --git a/src/lib/common.ts b/src/lib/common.ts index 70fd7eeba..b4b6966bc 100644 --- a/src/lib/common.ts +++ b/src/lib/common.ts @@ -67,7 +67,6 @@ export const getTeam = (event) => { }; export const getUserDetails = async (event, isAdminRequired = true) => { - // try { const teamId = getTeam(event); const userId = event.locals.session.data.uid || null; const { permission = 'read' } = await db.prisma.permission.findFirst({ @@ -91,18 +90,6 @@ export const getUserDetails = async (event, isAdminRequired = true) => { } return payload; - // } catch (err) { - // console.log(err); - // return { - // teamId: null, - // userId: null, - // permission: 'read', - // status: 401, - // body: { - // message: 'You do not have permission to do this. \nAsk an admin to modify your permissions.' - // } - // }; - // } }; export function getEngine(engine) { diff --git a/src/lib/components/CopyPasswordField.svelte b/src/lib/components/CopyPasswordField.svelte index 4237f6e8e..ab43f48bd 100644 --- a/src/lib/components/CopyPasswordField.svelte +++ b/src/lib/components/CopyPasswordField.svelte @@ -20,9 +20,6 @@ function showActions(value) { actionsShow = value; - // if (value === false) { - // showPassword = false; - // } } function copyToClipboard() { if (isHttps && navigator.clipboard) { diff --git a/src/lib/components/Setting.svelte b/src/lib/components/Setting.svelte index 4a80e56ae..b26e3e072 100644 --- a/src/lib/components/Setting.svelte +++ b/src/lib/components/Setting.svelte @@ -6,7 +6,6 @@ export let description; export let isPadding = true; export let disabled = false; - // export let disabledReason = '';
  • @@ -14,11 +13,6 @@

    {title}

    -
    { }); }); -// const letsEncryptQueueName = dev ? cuid() : 'letsencrypt_queue' -// const letsEncryptQueue = new Queue(letsEncryptQueueName, connectionOptions) - -// const letsEncryptWorker = new Worker(letsEncryptQueueName, async (job) => await letsencrypt(job), { -// concurrency: 1, -// ...connectionOptions -// }) -// letsEncryptWorker.on('completed', async () => { -// // TODO: Save letsencrypt logs as build logs! -// console.log('[DEBUG] Lets Encrypt job completed') -// }) - -// letsEncryptWorker.on('failed', async (job: Job, failedReason: string) => { -// try { -// await prisma.applicationSettings.updateMany({ where: { applicationId: job.data.id }, data: { forceSSL: false } }) -// } catch (error) { -// console.log(error) -// } -// console.log('[DEBUG] Lets Encrypt job failed') -// console.log(failedReason) -// }) - const buildLogQueueName = dev ? cuid() : 'log_queue'; const buildLogQueue = new Queue(buildLogQueueName, connectionOptions); const buildLogWorker = new Worker(buildLogQueueName, async (job) => await logger(job), { diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index fa9ce0fe3..d8e185a13 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -124,25 +124,6 @@ updateStatus.success = false; updateStatus.loading = false; } - // } else { - // let reachable = false; - // let tries = 0; - // do { - // await asyncSleep(1000); - // try { - // await get(`/undead.json`); - // reachable = true; - // } catch (error) { - // console.log(error); - // reachable = false; - // } - // if (reachable) break; - // tries++; - // } while (!reachable || tries < 120); - // toast.push('New version reachable. Reloading...'); - // await asyncSleep(2000); - // window.location.reload(); - // } } diff --git a/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte b/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte index a97291deb..fb1dd602b 100644 --- a/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte +++ b/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte @@ -142,14 +142,6 @@ return errorNotification('Branch already configured'); } } - // async function saveDeployKey(deployKeyId: number) { - // try { - // await post(updateDeployKeyIdUrl, { deployKeyId }); - // } catch (error) { - // errorNotification(error); - // throw new Error(error); - // } - // } async function checkSSHKey(sshkeyUrl) { try { return await post(sshkeyUrl, {}); diff --git a/src/routes/databases/[id]/index.json.ts b/src/routes/databases/[id]/index.json.ts index 1f08ab7e6..c9867c94f 100644 --- a/src/routes/databases/[id]/index.json.ts +++ b/src/routes/databases/[id]/index.json.ts @@ -25,9 +25,7 @@ export const get: RequestHandler = async (event) => { state = 'running'; } } catch (error) { - // if (!error.stderr.includes('No such object')) { - // console.log(error) - // } + // } } const configuration = generateDatabaseConfiguration(database); diff --git a/src/routes/services/[id]/index.json.ts b/src/routes/services/[id]/index.json.ts index eefed08b0..58f9beaef 100644 --- a/src/routes/services/[id]/index.json.ts +++ b/src/routes/services/[id]/index.json.ts @@ -46,24 +46,3 @@ export const get: RequestHandler = async (event) => { return PrismaErrorHandler(error); } }; - -// export const post: RequestHandler = async (request) => { -// const { teamId, status, body } = await getUserDetails(request); -// if (status === 401) return { status, body } -// const { id } = request.params - -// const name = request.body.get('name') -// const defaultDatabase = request.body.get('defaultDatabase') -// const dbUser = request.body.get('dbUser') -// const dbUserPassword = request.body.get('dbUserPassword') -// const rootUser = request.body.get('rootUser') -// const rootUserPassword = request.body.get('rootUserPassword') -// const version = request.body.get('version') - -// try { -// return await db.updateDatabase({ id, name, defaultDatabase, dbUser, dbUserPassword, rootUser, rootUserPassword, version }) -// } catch (err) { -// return err -// } - -// } diff --git a/src/routes/sources/[id]/_Gitlab.svelte b/src/routes/sources/[id]/_Gitlab.svelte index 4530cc0e0..c95bbb1ba 100644 --- a/src/routes/sources/[id]/_Gitlab.svelte +++ b/src/routes/sources/[id]/_Gitlab.svelte @@ -71,8 +71,6 @@ window.open(`${source.htmlUrl}/groups/${payload.groupName}/-/settings/applications`); break; case 'instance': - // TODO: This is not correct - // window.location.assign(`${source.htmlUrl}/-/profile/applications`); break; default: break;