From 37d7df279477a196d447c3c4e2dd2e4903e89ccc Mon Sep 17 00:00:00 2001 From: Bangara Raju Kottedi Date: Fri, 6 Mar 2026 12:39:31 +0530 Subject: [PATCH 1/2] style: format code for better readability and consistency --- src/test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test.ts b/src/test.ts index 620cef3..04def99 100644 --- a/src/test.ts +++ b/src/test.ts @@ -8,12 +8,12 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'; declare const beforeEach: (fn: () => void) => void; getTestBed().initTestEnvironment( - BrowserTestingModule, - platformBrowserTesting() + BrowserTestingModule, + platformBrowserTesting() ); beforeEach(() => { - TestBed.configureTestingModule({ - providers: [provideZonelessChangeDetection(), provideHttpClient(), provideHttpClientTesting()] - }); + TestBed.configureTestingModule({ + providers: [provideZonelessChangeDetection(), provideHttpClient(), provideHttpClientTesting()] + }); }); -- 2.47.3 From 1864d49d6cbbd06079bc779ab9e80fad22bf274c Mon Sep 17 00:00:00 2001 From: Bangara Raju Kottedi Date: Fri, 6 Mar 2026 12:50:57 +0530 Subject: [PATCH 2/2] style: improve code readability and consistency in Jenkinsfile --- Jenkinsfile | 79 ++++++++++++++++++----------------------------------- 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cf2d38..14929ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,7 @@ pipeline { stages { stage('Build & Test') { + agent { label getAgentLabel() } environment { @@ -19,15 +20,11 @@ pipeline { stages { stage('Cleanup Workspace') { - steps { - cleanWs() - } + steps { cleanWs() } } stage('Checkout') { - steps { - checkout scm - } + steps { checkout scm } } stage('Inject Environment File') { @@ -40,22 +37,20 @@ pipeline { } } steps { - configFileProvider( - [configFile( + configFileProvider([ + configFile( fileId: getEnvFileId(), targetLocation: 'src/environments/environment.ts', replaceTokens: true - )] - ) { + ) + ]) { echo "Injected environment for ${env.BRANCH_NAME}" } } } stage('Install Dependencies') { - steps { - sh 'npm ci' - } + steps { sh 'npm ci' } } stage('Run Tests') { @@ -65,6 +60,7 @@ pipeline { branch pattern: "bug/.*", comparator: "REGEXP" branch 'develop' branch 'prod' + changeRequest() } } steps { @@ -77,24 +73,20 @@ pipeline { anyOf { branch 'develop' branch 'prod' + changeRequest() } } steps { - sh ''' - ng build --configuration production --base-href /admin/ - ''' + sh 'ng build --configuration production --base-href /admin/' } } - } } stage('Production Approval') { - when { - branch 'prod' - } + when { branch 'prod' } steps { - input message: "Approve deployment to PRODUCTION?", ok: "Deploy" + input message: 'Approve deployment to PRODUCTION?', ok: 'Deploy' } } @@ -128,18 +120,13 @@ pipeline { """ } } - } } } post { - success { - echo "Deployment successful for ${env.BRANCH_NAME}" - } - failure { - echo "Deployment failed for ${env.BRANCH_NAME}" - } + success { echo "Deployment successful for ${env.BRANCH_NAME}" } + failure { echo "Deployment failed for ${env.BRANCH_NAME}" } } } @@ -148,41 +135,27 @@ pipeline { // def getAgentLabel() { - if (env.BRANCH_NAME == 'prod') { - return 'oracle-prod' - } else { - return 'built-in' - } + return env.BRANCH_NAME == 'prod' ? 'oracle-prod' : 'built-in' } def getEnvFileId() { - if (env.BRANCH_NAME == 'prod') { - return 'admin-prod-properties' - } else { - return 'admin-uat-properties' - } + return env.BRANCH_NAME == 'prod' ? 'admin-prod-properties' : 'admin-uat-properties' } def getDeployPath() { - if (env.BRANCH_NAME == 'prod') { - return "/var/www/bangararaju.kottedi.in/admin" - } else { - return "/var/www/bangararaju.kottedi.in/admin" - } + return env.BRANCH_NAME == 'prod' + ? "/var/www/bangararaju.kottedi.in/admin" + : "/var/www/bangararaju.kottedi.in/admin" } def getHealthUrl() { - if (env.BRANCH_NAME == 'prod') { - return "https://bangararaju.kottedi.in/admin" - } else { - return "https://bangararaju-uat.kottedi.in/admin" - } + return env.BRANCH_NAME == 'prod' + ? "https://bangararaju.kottedi.in/admin" + : "https://bangararaju-uat.kottedi.in/admin" } def getChromeBin() { - if (env.BRANCH_NAME == 'prod') { - return "/snap/bin/chromium" - } else { - return "/usr/bin/chromium" - } + return env.BRANCH_NAME == 'prod' + ? "/snap/bin/chromium" + : "/usr/bin/chromium" } \ No newline at end of file -- 2.47.3