From 03f07dc1a4e482a725ea5546d9b24d37da62a3a3 Mon Sep 17 00:00:00 2001
From: Madhuravas <madhuravasreddy1998@gmail.com>
Date: Tue, 9 Jan 2024 12:40:13 +0530
Subject: [PATCH 1/2] MOSIP-31091 changed get font size type to any from number

Signed-off-by: Madhuravas <madhuravasreddy1998@gmail.com>
---
 resident-ui/src/app/core/services/font-size.service.ts          | 2 +-
 .../booking/center-selection/center-selection.component.ts      | 2 +-
 .../src/app/feature/dashboard/dashboard/dashboard.component.ts  | 2 +-
 .../feature/downloaduin/downloaduin/downloaduin.component.ts    | 2 +-
 resident-ui/src/app/feature/getuin/getuin/getuin.component.ts   | 2 +-
 .../app/feature/uinservices/dashboard/dashboard.component.ts    | 2 +-
 .../app/feature/uinservices/grievance/grievance.component.ts    | 2 +-
 .../uinservices/lockunlockauth/lockunlockauth.component.ts      | 2 +-
 .../uinservices/personalisedcard/personalisedcard.component.ts  | 2 +-
 .../app/feature/uinservices/revokevid/revokevid.component.ts    | 2 +-
 .../uinservices/sharewithpartner/sharewithpartner.component.ts  | 2 +-
 .../trackservicerequest/trackservicerequest.component.ts        | 2 +-
 .../updatedemographic/updatedemographic.component.ts            | 2 +-
 .../feature/uinservices/viewhistory/viewhistory.component.ts    | 2 +-
 resident-ui/src/app/feature/verify/verify/verify.component.ts   | 2 +-
 resident-ui/src/app/shared/dialog/dialog.component.ts           | 2 +-
 resident-ui/src/app/shared/header/header.component.ts           | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/resident-ui/src/app/core/services/font-size.service.ts b/resident-ui/src/app/core/services/font-size.service.ts
index 506dea28..c1044d37 100644
--- a/resident-ui/src/app/core/services/font-size.service.ts
+++ b/resident-ui/src/app/core/services/font-size.service.ts
@@ -14,7 +14,7 @@ export class FontSizeService {
   fontSize: any = this.fontSizesList[this.currentFontSize];
   constructor() { }
 
-  setFontSize(size: number): void {
+  setFontSize(size: any): void {
     if (size == 12) {
       this.fontSize = this.fontSizesList['12px'];
     }
diff --git a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.ts b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.ts
index 9d217df6..6f774247 100644
--- a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.ts
+++ b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.ts
@@ -587,7 +587,7 @@ export class CenterSelectionComponent implements OnInit, OnDestroy {
     }
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts b/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts
index ca7d7041..2040ba4c 100644
--- a/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts
+++ b/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts
@@ -78,7 +78,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
    }    
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.ts b/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.ts
index cea55cc4..5d0570e5 100644
--- a/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.ts
+++ b/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.ts
@@ -243,7 +243,7 @@ export class DownloadUinComponent implements OnInit {
       });
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/getuin/getuin/getuin.component.ts b/resident-ui/src/app/feature/getuin/getuin/getuin.component.ts
index f917762f..947cb287 100644
--- a/resident-ui/src/app/feature/getuin/getuin/getuin.component.ts
+++ b/resident-ui/src/app/feature/getuin/getuin/getuin.component.ts
@@ -249,7 +249,7 @@ export class GetuinComponent implements OnInit {
       });
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts
index 9ee70e2e..2af3c432 100644
--- a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts
+++ b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts
@@ -86,7 +86,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
     }
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
   
diff --git a/resident-ui/src/app/feature/uinservices/grievance/grievance.component.ts b/resident-ui/src/app/feature/uinservices/grievance/grievance.component.ts
index 1dba2701..7b5e9fb5 100644
--- a/resident-ui/src/app/feature/uinservices/grievance/grievance.component.ts
+++ b/resident-ui/src/app/feature/uinservices/grievance/grievance.component.ts
@@ -139,7 +139,7 @@ export class GrievanceComponent implements OnInit {
     }
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts b/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
index 61a43709..ce59aeca 100644
--- a/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
+++ b/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
@@ -340,7 +340,7 @@ export class LockunlockauthComponent implements OnInit, OnDestroy {
     },400)
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
index 652f863c..d9f9e8e3 100644
--- a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
+++ b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
@@ -454,7 +454,7 @@ export class PersonalisedcardComponent implements OnInit, OnDestroy {
     return dialogRef;
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
index 291784a5..e80a1fed 100644
--- a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
+++ b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
@@ -465,7 +465,7 @@ export class RevokevidComponent implements OnInit, OnDestroy {
     this.selectedValue = event.source.value;
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
index 34e3df94..893b3128 100644
--- a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
+++ b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
@@ -598,7 +598,7 @@ export class SharewithpartnerComponent implements OnInit, OnDestroy {
     this.router.navigateByUrl('uinservices/viewhistory');
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts
index b774c2c8..9cfa5f40 100644
--- a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts
+++ b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts
@@ -237,7 +237,7 @@ export class TrackservicerequestComponent implements OnInit, OnDestroy {
     // this.router.navigate(["grievanceRedressal"],{state:{eventId:eventId}})
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
index c195353f..c44211c0 100644
--- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
+++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
@@ -1127,7 +1127,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
     this.matTabLabel = event.tab.textLabel;
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
index c7f06cea..1e1bbeb5 100644
--- a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
+++ b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
@@ -481,7 +481,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
     }, 500)
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/feature/verify/verify/verify.component.ts b/resident-ui/src/app/feature/verify/verify/verify.component.ts
index dfb7bb09..e16c7cc2 100644
--- a/resident-ui/src/app/feature/verify/verify/verify.component.ts
+++ b/resident-ui/src/app/feature/verify/verify/verify.component.ts
@@ -438,7 +438,7 @@ export class VerifyComponent implements OnInit, OnDestroy {
     this.displaySeconds = "00"
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 
diff --git a/resident-ui/src/app/shared/dialog/dialog.component.ts b/resident-ui/src/app/shared/dialog/dialog.component.ts
index dfd13237..d0bfc3d6 100644
--- a/resident-ui/src/app/shared/dialog/dialog.component.ts
+++ b/resident-ui/src/app/shared/dialog/dialog.component.ts
@@ -242,7 +242,7 @@ export class DialogComponent implements OnInit {
   logOut(){
     this.redirectService.redirect(window.location.href);
   }
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
   logOutBtn(){
diff --git a/resident-ui/src/app/shared/header/header.component.ts b/resident-ui/src/app/shared/header/header.component.ts
index 441eed9d..a91a39ae 100644
--- a/resident-ui/src/app/shared/header/header.component.ts
+++ b/resident-ui/src/app/shared/header/header.component.ts
@@ -304,7 +304,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
     ]);
   }
 
-  get fontSize(): number {
+  get fontSize(): any {
     return this.fontSizeService.fontSize;
   }
 

From 503d730c122d4f154ec2a04a843fb115ef91e881 Mon Sep 17 00:00:00 2001
From: syed salman <syedsalman3753@gmail.com>
Date: Thu, 11 Jan 2024 19:15:37 +0530
Subject: [PATCH 2/2] [DSD-4191] fixed build issues

Signed-off-by: syed salman <syedsalman3753@gmail.com>
---
 residenttest/Dockerfile |  3 ++
 residenttest/pom.xml    | 69 ++++++++++++-----------------------------
 2 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/residenttest/Dockerfile b/residenttest/Dockerfile
index 25d8b94a..ff28af7e 100644
--- a/residenttest/Dockerfile
+++ b/residenttest/Dockerfile
@@ -1,5 +1,7 @@
 FROM selenium/standalone-chrome:latest
 
+USER root
+
 ARG SOURCE
 ARG COMMIT_HASH
 ARG COMMIT_ID
@@ -33,6 +35,7 @@ USER ${container_user_uid}:${container_user_gid}
 
 COPY --chown=${container_user_uid}:${container_user} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh
 COPY --chown=${container_user}:${container_user} ./src/main/resources/ ${work_dir}
+COPY --chown=${container_user}:${container_user} ./target/residentui*.jar ${work_dir}
 
 # set working directory
 WORKDIR ${work_dir}
diff --git a/residenttest/pom.xml b/residenttest/pom.xml
index 38234fc0..22495bcd 100644
--- a/residenttest/pom.xml
+++ b/residenttest/pom.xml
@@ -247,55 +247,6 @@
 					<argLine>-Dfile.encoding=UTF-8</argLine>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>make-jar-executable</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<!-- Create a shell script to run the JAR file with executable permission -->
-								<chmod file="${project.build.directory}/*.jar" perm="ugo+rx"/>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>3.0.1</version>
-				<executions>
-					<execution>
-						<id>populate-git-commit-information</id>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-						<configuration>
-							<verbose>true</verbose>
-							<dateFormat>MM/dd/yyyy HH:mm:ss Z</dateFormat>
-							<abbrevLength>8</abbrevLength>
-							<generateGitPropertiesFile>true</generateGitPropertiesFile>
-							<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-						</configuration>
-					</execution>
-				</executions>
-				<configuration>
-					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-				</configuration>
-			</plugin>
-
-
-
-
 			<!-- 			<plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-assembly-plugin</artifactId>
@@ -356,6 +307,26 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<id>make-jar-executable</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<!-- Create a shell script to run the JAR file with executable permission -->
+								<chmod file="${project.build.directory}/*.jar" perm="ugo+rx"/>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>