From fe9f8add88ea91ad32dcc13e32fdd9694d27d2eb Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 30 Jun 2025 08:35:20 +0200 Subject: [PATCH 1/4] fixed tatort api route for deletion --- src/routes/(token-based)/list/[vorgang]/+page.svelte | 2 +- src/routes/api/list/{[[vorgang]] => [vorgang]}/+server.ts | 0 src/routes/api/{tatort => list/[vorgang]/[tatort]}/+server.ts | 0 src/routes/api/list/{[[vorgang]] => [vorgang]}/code/+server.ts | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename src/routes/api/list/{[[vorgang]] => [vorgang]}/+server.ts (100%) rename src/routes/api/{tatort => list/[vorgang]/[tatort]}/+server.ts (100%) rename src/routes/api/list/{[[vorgang]] => [vorgang]}/code/+server.ts (100%) diff --git a/src/routes/(token-based)/list/[vorgang]/+page.svelte b/src/routes/(token-based)/list/[vorgang]/+page.svelte index 4b3cde4..0805f70 100644 --- a/src/routes/(token-based)/list/[vorgang]/+page.svelte +++ b/src/routes/(token-based)/list/[vorgang]/+page.svelte @@ -208,7 +208,7 @@ url.pathname += `/${filename}`; try { - const response = await fetch(`api/${url}`, { method: 'DELETE' }); + const response = await fetch(`/api${url.pathname}`, { method: 'DELETE' }); if (response.status == 204) { setTimeout(() => { window.location.reload(); diff --git a/src/routes/api/list/[[vorgang]]/+server.ts b/src/routes/api/list/[vorgang]/+server.ts similarity index 100% rename from src/routes/api/list/[[vorgang]]/+server.ts rename to src/routes/api/list/[vorgang]/+server.ts diff --git a/src/routes/api/tatort/+server.ts b/src/routes/api/list/[vorgang]/[tatort]/+server.ts similarity index 100% rename from src/routes/api/tatort/+server.ts rename to src/routes/api/list/[vorgang]/[tatort]/+server.ts diff --git a/src/routes/api/list/[[vorgang]]/code/+server.ts b/src/routes/api/list/[vorgang]/code/+server.ts similarity index 100% rename from src/routes/api/list/[[vorgang]]/code/+server.ts rename to src/routes/api/list/[vorgang]/code/+server.ts From e9eb2c1163b16a49923304292ce6998be2d22c44 Mon Sep 17 00:00:00 2001 From: Daniel Mann Date: Wed, 2 Jul 2025 07:41:05 +0200 Subject: [PATCH 2/4] Update Jenkinsfile --- Jenkinsfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index eba846e..5e0d151 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,6 +28,24 @@ pipeline { } stages { + stage('Validate Run Parameters') { + steps { + script { + def jobParts = env.JOB_NAME.tokenize('/') + def detectedRepo = jobParts[1] + + echo "Detected Repo: ${detectedRepo}" + echo "Provided REPO_NAME: ${params.REPO_NAME}" + + if (params.REPO_NAME != detectedRepo) { + echo "Skipping build. REPO_NAME '${params.REPO_NAME}' does not match repo '${detectedRepo}'" + currentBuild.result = 'NOT_BUILT' + error("Stopping pipeline as REPO_NAME does not match repository.") + } + } + } + } + stage('Install Dependencies') { steps { script { From b63834eb5121d502f96e9763fd91256cf6a84a69 Mon Sep 17 00:00:00 2001 From: Daniel Mann Date: Wed, 2 Jul 2025 07:52:09 +0200 Subject: [PATCH 3/4] Update Jenkinsfile --- Jenkinsfile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5e0d151..12f7d92 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,5 @@ +@Library('InnoHub-Library') _ + def didRun = false pipeline { @@ -28,20 +30,10 @@ pipeline { } stages { - stage('Validate Run Parameters') { + stage('Validate Repository') { steps { script { - def jobParts = env.JOB_NAME.tokenize('/') - def detectedRepo = jobParts[1] - - echo "Detected Repo: ${detectedRepo}" - echo "Provided REPO_NAME: ${params.REPO_NAME}" - - if (params.REPO_NAME != detectedRepo) { - echo "Skipping build. REPO_NAME '${params.REPO_NAME}' does not match repo '${detectedRepo}'" - currentBuild.result = 'NOT_BUILT' - error("Stopping pipeline as REPO_NAME does not match repository.") - } + checkRepoName(params.REPO_NAME) } } } From f0df67fb86dff560f63a7f01b2517ffb3dfccc20 Mon Sep 17 00:00:00 2001 From: Daniel Mann Date: Wed, 2 Jul 2025 08:12:56 +0200 Subject: [PATCH 4/4] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 12f7d92..2035c83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { stage('Validate Repository') { steps { script { - checkRepoName(params.REPO_NAME) + checkRepoName(params.REPO_NAME, true) //@jared: The "true" means, do not build PR's! } } }