Merge pull request #404 from Madhuravas/develop

MOSIP-28596, MOSIP-28610 fixed two issues
mosip · Jul 28, 2023 · 109ec3b · 109ec3b
2 parents bb163a6 + fb4beeb
commit 109ec3b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
@@ -258,7 +258,7 @@ export class RevokevidComponent implements OnInit, OnDestroy {
           // },120000)
         }else{
           this.isLoading = false;
-          console.log("error>>"+response.body['errors'])
+          this.showErrorPopup(response.body['errors'])
         }
       },
       error =>{

diff --git a/...ent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html b/...ent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
@@ -129,7 +129,7 @@
 			<div *ngIf="eidStatus.eventType === 'Update UIN Data'"
 				style="display: flex; justify-content: space-between; width: 100%; margin-top: 1rem;">
 				<div>
-				<button mat-raised-button id="downloadCardWithNewDataBtn" [disabled]="eidStatus.info.downloadLink === 'NA'" *ngIf="eidStatus.eventStatus === 'Success'" (click)="downloadVIDCard(eidStatus.eventId)" class="download-btn"><img
+				<button mat-raised-button id="downloadCardWithNewDataBtn" [disabled]="eidStatus.info.downloadLink === 'NA' || disableDownloadVidBtn" *ngIf="eidStatus.eventStatus === 'Success'" (click)="downloadVIDCard(eidStatus.eventId)" class="download-btn"><img
 						class="save-icon"
 						src="./assets/images/save.png" />{{'trackservicerequest.downloadUINCard' |
 					translate}}</button>
@@ -142,7 +142,7 @@
 			<div *ngIf="eidStatus.eventType === 'Download VID Card' "
 				style="display: flex; justify-content: space-between; width: 100%; margin-top: 1rem;">
 				<div>
-				<button mat-raised-button [disabled]="eidStatus.info.downloadLink === 'NA'" *ngIf="eidStatus.eventStatus === 'Success'" (click)="downloadVIDCard(eidStatus.eventId)" id="downloadCardWithNewDataBtn" class="download-btn"><img
+				<button mat-raised-button [disabled]="eidStatus.info.downloadLink === 'NA' || disableDownloadVidBtn" *ngIf="eidStatus.eventStatus === 'Success'" (click)="downloadVIDCard(eidStatus.eventId)" id="downloadCardWithNewDataBtn" class="download-btn"><img
 						class="save-icon"
 						src="./assets/images/save.png" />{{'trackservicerequest.downloadVIDCard' |
 					translate}}</button>

diff --git a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts
@@ -33,6 +33,7 @@ export class TrackservicerequestComponent implements OnInit, OnDestroy {
   isLoading:boolean = true;
   eventIdValidation:any;
   showWarningMessage:boolean = false;
+  disableDownloadVidBtn:boolean = false;
 
   constructor(private autoLogout: AutoLogoutService,private renderer:Renderer2 ,private dialog: MatDialog, private appConfigService: AppConfigService, private dataStorageService: DataStorageService, private translateService: TranslateService, private router: Router, private route: ActivatedRoute,private auditService: AuditService) {
     this.renderer.listen('window','click',(e:Event) =>{
@@ -175,8 +176,8 @@ export class TrackservicerequestComponent implements OnInit, OnDestroy {
     this.dataStorageService.downloadVidCardStatus(eventId).subscribe(response =>{
      let fileName = ""
      const contentDisposition = response.headers.get('Content-Disposition');
-     console.log(contentDisposition)
      if (contentDisposition) {
+      this.disableDownloadVidBtn = true;
        const fileNameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
        const matches = fileNameRegex.exec(contentDisposition);
        if (matches != null && matches[1]) {

diff --git a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html
@@ -21,10 +21,10 @@ <h3 class="main-heading">{{'viewhistory.title' | translate}}</h3>
 	          <div class="mini-card">
 	            <mat-card-header><span class="label">{{'viewhistory.inputHistory' |translate}}</span></mat-card-header>
 					<span class="input">
-						<button class="dropdown-btn" [matMenuTriggerFor]="basic">{{serviceHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
+						<button id="historyTypeBtn" class="dropdown-btn" [matMenuTriggerFor]="basic">{{serviceHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
 						<mat-menu #basic="matMenu">
 							<ng-container *ngFor="let serviceType of serviceTypeFilter">
-								<button mat-menu-item>
+								<button mat-menu-item >
 									<div (click)="captureValue($event,serviceType.value, 'serviceType', 'dropdown')" class="check-box-card">
 										<input class="check-box" type="checkbox" [checked]="serviceType.label.checked"
 											id="{{serviceType.value}}" />
@@ -61,7 +61,7 @@ <h3 class="main-heading">{{'viewhistory.title' | translate}}</h3>
 	            <mat-card-header><span class="label">{{'viewhistory.inputStatus' | translate}}</span></mat-card-header>
 	            <!-- <mat-card-subtitle style="display: flex;"> -->
 					<span class="input">
-						<button class="dropdown-btn" [matMenuTriggerFor]="basic2">{{statusHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
+						<button class="dropdown-btn" id="statusTypeBtn" [matMenuTriggerFor]="basic2">{{statusHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
 						<mat-menu #basic2="matMenu">
 							<ng-container *ngFor="let status of statusTypeFilter">
 								<button mat-menu-item>