Merge pull request 'style: format code for better readability and consistency' (#13) from develop into prod

Reviewed-on: #13

Jenkinsfile

@@ -10,6 +10,7 @@ pipeline {
     stages {
 
         stage('Build & Test') {
+
             agent { label getAgentLabel() }
 
             environment {
@@ -19,15 +20,11 @@ pipeline {
             stages {
 
                 stage('Cleanup Workspace') {
-                    steps {
+                    steps { cleanWs() }
-                        cleanWs()
-                    }
                 }
 
                 stage('Checkout') {
-                    steps {
+                    steps { checkout scm }
-                        checkout scm
-                    }
                 }
 
                 stage('Inject Environment File') {
@@ -40,22 +37,20 @@ pipeline {
                         }
                     }
                     steps {
-                        configFileProvider(
+                        configFileProvider([
-                            [configFile(
+                            configFile(
                                 fileId: getEnvFileId(),
                                 targetLocation: 'src/environments/environment.ts',
                                 replaceTokens: true
-                            )]
+                            )
-                        ) {
+                        ]) {
                             echo "Injected environment for ${env.BRANCH_NAME}"
                         }
                     }
                 }
 
                 stage('Install Dependencies') {
-                    steps {
+                    steps { sh 'npm ci' }
-                        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 '''
+                        sh 'ng build --configuration production --base-href /admin/'
-                        ng build --configuration production --base-href /admin/
-                        '''
                     }
                 }
-
             }
         }
 
         stage('Production Approval') {
-            when {
+            when { branch 'prod' }
-                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 {
+        success { echo "Deployment successful for ${env.BRANCH_NAME}" }
-            echo "Deployment successful for ${env.BRANCH_NAME}"
+        failure { echo "Deployment failed 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 env.BRANCH_NAME == 'prod' ? 'oracle-prod' : 'built-in'
-        return 'oracle-prod'
-    } else {
-        return 'built-in'
-    }
 }
 
 def getEnvFileId() {
-    if (env.BRANCH_NAME == 'prod') {
+    return env.BRANCH_NAME == 'prod' ? 'admin-prod-properties' : 'admin-uat-properties'
-        return 'admin-prod-properties'
-    } else {
-        return 'admin-uat-properties'
-    }
 }
 
 def getDeployPath() {
-    if (env.BRANCH_NAME == 'prod') {
+    return env.BRANCH_NAME == 'prod'
-        return "/var/www/bangararaju.kottedi.in/admin"
+        ? "/var/www/bangararaju.kottedi.in/admin"
-    } else {
+        : "/var/www/bangararaju.kottedi.in/admin"
-        return "/var/www/bangararaju.kottedi.in/admin"
-    }
 }
 
 def getHealthUrl() {
-    if (env.BRANCH_NAME == 'prod') {
+    return env.BRANCH_NAME == 'prod'
-        return "https://bangararaju.kottedi.in/admin"
+        ? "https://bangararaju.kottedi.in/admin"
-    } else {
+        : "https://bangararaju-uat.kottedi.in/admin"
-        return "https://bangararaju-uat.kottedi.in/admin"
-    }
 }
 
 def getChromeBin() {
-    if (env.BRANCH_NAME == 'prod') {
+    return env.BRANCH_NAME == 'prod'
-        return "/snap/bin/chromium"
+        ? "/snap/bin/chromium"
-    } else {
+        : "/usr/bin/chromium"
-        return "/usr/bin/chromium"
-    }
 }

src/test.ts

@@ -8,12 +8,12 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
 declare const beforeEach: (fn: () => void) => void;
 
 getTestBed().initTestEnvironment(
-  BrowserTestingModule,
+    BrowserTestingModule,
-  platformBrowserTesting()
+    platformBrowserTesting()
 );
 
 beforeEach(() => {
-  TestBed.configureTestingModule({
+    TestBed.configureTestingModule({
-    providers: [provideZonelessChangeDetection(), provideHttpClient(), provideHttpClientTesting()]
+        providers: [provideZonelessChangeDetection(), provideHttpClient(), provideHttpClientTesting()]
-  });
+    });
 });