Latest changes from dev to release 1201

.github/workflows/push_trigger.yml

@@ -47,7 +47,8 @@ jobs:
       - name: Build image
         run: |
           cd "./${{env.SERVICE_LOCATION}}"
-          docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }}
+          # docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }}
+          docker build . --build-arg SOURCE=mosip --build-arg COMMIT_HASH=$(git rev-parse HEAD) --build-arg COMMIT_ID=$(git rev-parse --short HEAD) --build-arg BUILD_TIME=${{steps.date.outputs.date}} --file Dockerfile --tag ${{ env.SERVICE_NAME }}     
 
       - name: Log into registry
         run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin

resident-ui/src/app/app-routing.module.ts

@@ -9,7 +9,8 @@ const routes: Routes = [
   { path: 'regcenter', loadChildren: 'src/app/feature/booking/booking.module#BookingModule'},
   { path: 'verify', loadChildren:'src/app/feature/verify/verify.module#VerifyModule'},
   { path: 'uinservices', loadChildren:'src/app/feature/uinservices/uinservices.module#UinservicesModule'},
-  { path:'downloadMyUin', loadChildren:'src/app/feature/downloaduin/downloaduin.module#DownloadUinModule'}
+  { path:'downloadMyUin', loadChildren:'src/app/feature/downloaduin/downloaduin.module#DownloadUinModule'},
+  {path:'error', loadChildren:'src/app/feature/error/error.module#ErrorModule'}
 ];
 
 @NgModule({

resident-ui/src/app/app.component.ts

@@ -18,6 +18,8 @@ export class AppComponent {
   title = 'resident-ui';
   subscriptions: Subscription[] = [];
   previousUrl: string;
+  primaryLangCode: string = localStorage.getItem("langCode");
+  sitealignment;
 
   constructor(
     private appConfigService: AppConfigService,
@@ -28,7 +30,13 @@ export class AppComponent {
     private dataStorageService: DataStorageService
   ) {
     this.appConfigService.getConfig();
-
+    if (this.primaryLangCode === "ara") {
+      localStorage.setItem('direction','rtl')
+    }else{
+      localStorage.setItem('direction','ltr')
+    }
+    this.sitealignment = localStorage.getItem('direction');
+    document.body.dir = this.sitealignment;
   }
 
   // @HostListener('window:popstate', ['$event'])
@@ -62,12 +70,19 @@ export class AppComponent {
             this.router.navigate(['uinservices/dashboard']); 
           }
         }else{
-          this.router.navigate(['dashboard']);
+          if(window.location.href.includes('error=invalid_transaction')){
+            this.router.navigate(['error']);
+          }else{
+            this.router.navigate(['dashboard']);
+          };
         }
       }else{
         this.router.navigate(['dashboard']);
       }
     });
+    if(window.location.href.includes('error=invalid_transaction')){
+      this.router.navigate(['error']);
+    }
 
     if(!localStorage.getItem("langCode")){
       localStorage.setItem("langCode", "eng");

resident-ui/src/app/core/services/breakpoint.service.ts

@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class BreakpointService {
+
+  constructor(private breakpointObserver: BreakpointObserver) {}
+  isBreakpointActive(): Observable<any> {
+    return this.breakpointObserver.observe([Breakpoints.XSmall,
+    Breakpoints.Small,
+    Breakpoints.Medium,
+    Breakpoints.Large,
+    Breakpoints.XLarge,]).pipe(
+      map(result => {
+        if (result.matches) {
+          if (result.breakpoints[Breakpoints.XSmall]) {
+            return "extraSmall"
+          }
+          if (result.breakpoints[Breakpoints.Small]) {
+            return "small"
+          }
+          if (result.breakpoints[Breakpoints.Medium]) {
+            return "medium"
+          }
+          if (result.breakpoints[Breakpoints.Large]) {
+            return "large"
+          }
+          if (result.breakpoints[Breakpoints.XLarge]) {
+            return "ExtraLarge"
+          }
+        }
+      })
+    );
+  }
+}
+

resident-ui/src/app/core/services/data-storage.service.ts

@@ -216,7 +216,7 @@ export class DataStorageService {
   }
 
   shareInfo(request: any) {
-    return this.httpClient.post(this.BASE_URL + '/share-credential', request, { observe: 'response', responseType: 'blob' as 'json' });
+    return this.httpClient.post(this.BASE_URL + '/share-credential', request, { observe: 'response' });
   }
 
   downloadAcknowledgement(eventId: string) {
@@ -334,6 +334,10 @@ export class DataStorageService {
     return this.httpClient.post(this.BASE_URL + '/documents/'+transactionID+'?docCatCode='+docCatCode+'&docTypCode='+docTypCode+'&langCode='+localStorage.getItem("langCode")+'&referenceId='+referenceId, request);
   }
 
+  deleteUploadedFile(docId:string, transactionID:string){
+    return this.httpClient.delete(this.BASE_URL + '/documents/'+docId + "?transactionId=" + transactionID)
+  }
+
   isAuthenticated(){
     return this.httpClient.get(this.BASE_URL+'/authorize/admin/validateToken');
   }

resident-ui/src/app/core/services/httpinterceptor.ts

@@ -88,13 +88,8 @@ export class AuthInterceptor implements HttpInterceptor {
         err => {
           this.ngOnInit();
           if (err instanceof HttpErrorResponse) {
-            if (err.status === 401) {
-              if (this.router.url.includes('uinservices')) {
-                this.redirectService.redirect(window.location.href);
-                this.showMessage()
-              } else {
-                this.router.navigateByUrl(`dashboard`);
-              }
+            if (err.status === 401 && err.statusText === "Unauthorized") {
+
             }else if (err.status === 403 && err.statusText === "Forbidden") {
               this.showMessage()
             } else if (err.status === 413) {

resident-ui/src/app/core/services/loginredirect.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { v4 as uuid } from 'uuid';
 import { AppConfigService } from 'src/app/app-config.service';
+import defaultJson from "src/assets/i18n/default.json";
 
 @Injectable()
 export class LoginRedirectService {
@@ -13,7 +14,7 @@ export class LoginRedirectService {
     if(url.split("#")[1] === "/dashboard"){
       constructurl = url.replace("/dashboard", "/uinservices/dashboard");
     }
-    window.location.href = `${this.appService.getConfig().baseUrl}${this.appService.getConfig().login}` + btoa(constructurl)+"?state="+stateParam;
+    window.location.href = `${this.appService.getConfig().baseUrl}${this.appService.getConfig().login}v2/` + btoa(constructurl)+"?state="+stateParam+"&ui_locales="+defaultJson["keyboardMapping"][localStorage.getItem("langCode")];
     localStorage.setItem("redirectURL", constructurl)
   }
 

resident-ui/src/app/feature/booking/center-selection/center-selection.component.css

@@ -439,6 +439,9 @@ input[type="radio"] {
   height: 38px !important;
   border: 1px solid black;
   width: 160px;
+  outline: #909090 solid 1px!important;
+  border-radius: 5px;
+  color: #fff!important;
 }
 
 .mat-select-value{
@@ -450,9 +453,9 @@ input[type="radio"] {
   height: auto !important;
 } */
 
-::ng-deep .cdk-overlay-connected-position-bounding-box{
+/* ::ng-deep .cdk-overlay-connected-position-bounding-box{
   right: auto !important;
-} 
+}  */
 
 ::ng-deep #cdk-overlay-0{
   right: auto !important;

resident-ui/src/app/feature/booking/center-selection/center-selection.component.html

@@ -76,7 +76,7 @@
                 name="search"
                 class="search-input"
                 [(ngModel)]="searchText"
-                (keyup)="searchInput()"
+                (input)="searchInput()"
               />
               <!-- <button
                 matTooltip="{{ 'helpText.magnifying_glass' | translate }}"

resident-ui/src/app/feature/booking/center-selection/center-selection.component.ts

@@ -1,5 +1,5 @@
-import { Component, OnInit, OnDestroy } from "@angular/core";
-import { MatDialog } from "@angular/material";
+import { Component, OnInit, OnDestroy, ViewChild } from "@angular/core";
+import { MatDialog, MatPaginator,MatPaginatorIntl } from "@angular/material";
 import { DataStorageService } from "src/app/core/services/data-storage.service";
 import { RegistrationCentre } from "./registration-center-details.model";
 import { Router, ActivatedRoute } from "@angular/router";
@@ -11,12 +11,15 @@ import { Subscription } from "rxjs";
 import { saveAs } from 'file-saver';
 import { AuditService } from "src/app/core/services/audit.service";
 
+
 @Component({
   selector: "app-center-selection",
   templateUrl: "./center-selection.component.html",
   styleUrls: ["./center-selection.component.css"]
 })
 export class CenterSelectionComponent implements OnInit, OnDestroy {
+  // @ViewChild(MatPaginator) paginator: MatPaginator;
+
   REGISTRATION_CENTRES: RegistrationCentre[] = [];
   searchClick: boolean = false;
   isWorkingDaysAvailable = false;
@@ -69,9 +72,10 @@ export class CenterSelectionComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private translate: TranslateService,
     private activatedRoute: ActivatedRoute,
-    private auditService: AuditService
+    private auditService: AuditService,
+    private paginator: MatPaginatorIntl
   ) {
-    this.translate.use(this.langCode);
+    this.translate.use(this.langCode); 
   }
 
   async ngOnInit() {
@@ -94,7 +98,7 @@ export class CenterSelectionComponent implements OnInit, OnDestroy {
     //this.openDialog();
     this.recommendedCenterLocCode = 5;
     const subs = this.dataService
-      .getLocationHierarchyLevel("eng")
+      .getLocationHierarchyLevel(this.langCode)
       .subscribe((response) => {
         //get all location types from db
         this.allLocationTypes = response[appConstants.RESPONSE]["locationHierarchyLevels"];
@@ -149,6 +153,12 @@ export class CenterSelectionComponent implements OnInit, OnDestroy {
       this.errorlabels = response["error"];
       this.apiErrorCodes = response[appConstants.API_ERROR_CODES];
       this.popupMessages = response;
+      this.paginator.itemsPerPageLabel = response['paginatorIntl'].itemsPerPageLabel;
+      const originalGetRangeLabel = this.paginator.getRangeLabel;
+        this.paginator.getRangeLabel = (page: number, size: number, len: number) => {
+          return originalGetRangeLabel(page, size, len)
+              .replace('of', response['paginatorIntl'].of);
+      }; 
     });
   }
   /**

resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.css

@@ -7,7 +7,6 @@
 }
 .mat-card-subtitle {
   cursor: pointer;
-  text-align: left;
   font-size: 14px;
   letter-spacing: 0px;
   color: #000000;

resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.html

@@ -1,7 +1,7 @@
-<div class="main-div" *ngIf="menuItems">
+<div class="main-div" *ngIf="menuItems" dir="{{sitealignment}}">
   <mat-grid-list #grid [cols]="cols" rowHeight="200px" gutterSize="5px">
     <mat-grid-tile colspan="1" rowspan="2">
-    <div class="item1 item-card" id="dashboardCard1" (click)="onItemSelected(menuItems[0].displayName)">
+    <div class="item1 item-card" id="dashboardCard1" (click)="onItemSelected('UIN Services')">
       <mat-card>
         <div class="title">
           <span class="icon"><img mat-card-xs-image class="dashboard-icons" [src]='menuItems[0].icon' /></span>
@@ -11,25 +11,23 @@
             <br/>
 
           </mat-card-title>
-          <mat-card-title class="mat-card-title" [id]="menuItems[0].displayName" *ngIf="menuItems[0].route"
-            (click)="onItemSelected(menuItems[0].route)">{{
-            menuItems[0].displayName | translate }}</mat-card-title>
+          <mat-card-title class="mat-card-title" [id]="menuItems[0].displayName" *ngIf="menuItems[0].route">
+            {{ menuItems[0].displayName | translate }}</mat-card-title>
         </div>
         <mat-card-subtitle class="display-description">{{menuItems[0].displaydescription}}</mat-card-subtitle>
         <mat-card-subtitle class="display-description" style="margin-bottom: 0px;">{{menuItems[0].availableServicesDescription}}</mat-card-subtitle>
         <mat-card-header>
           <ul  class="uin-service-list">
-          <li *ngFor="let subMenu of menuItems[0].subMenus"
-            (click)="onItemSelected(subMenu.route)" >{{
-            subMenu.displayName | translate }}</li>
+          <li *ngFor="let subMenu of menuItems[0].subMenus">
+            {{ subMenu.displayName | translate }}</li>
           </ul>
           <div style="flex-grow: 1"></div>
         </mat-card-header>
       </mat-card>
     </div>
     </mat-grid-tile>
     <mat-grid-tile colspan="1" rowspan="1">
-    <div class="item2 item-card" id="dashboardCard2" (click)="onItemSelected(menuItems[1].displayName)">
+    <div class="item2 item-card" id="dashboardCard2" (click)="onItemSelected('Get Information')">
       <mat-card>
         <div class="title">
           <span class="icon"><img mat-card-xs-image class="dashboard-icons" [src]='menuItems[1].icon' /></span>
@@ -38,8 +36,7 @@
           <mat-card-title class="mat-card-title" *ngIf="!menuItems[1].route">{{ menuItems[1].displayName | translate }}
           </mat-card-title>
 
-          <mat-card-title class="mat-card-title" [id]="menuItems[1].displayName" *ngIf="menuItems[1].route"
-            (click)="onItemSelected(menuItems[1].route)">{{
+          <mat-card-title class="mat-card-title" [id]="menuItems[1].displayName" *ngIf="menuItems[1].route">{{
             menuItems[1].displayName | translate }}</mat-card-title>
         </div>
         <mat-card-subtitle class="display-description" style="margin-bottom: 0px;">{{menuItems[1].availableServicesDescription}}:</mat-card-subtitle>
@@ -55,7 +52,7 @@
     </div>
     </mat-grid-tile>
     <mat-grid-tile colspan="1" rowspan="1">
-    <div class="item3 item-card" id="dashboardCard3"  (click)="onItemSelected(menuItems[2].displayName)">
+    <div class="item3 item-card" id="dashboardCard3"  (click)="onItemSelected('Booking an Appointment')">
       <mat-card >
         <div class="title">
           <span class="icon"><img mat-card-xs-image  class="dashboard-icons" [src]='menuItems[2].icon' /></span>

resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts

@@ -5,9 +5,9 @@ import { DataStorageService } from "src/app/core/services/data-storage.service";
 import { AppConfigService } from 'src/app/app-config.service';
 import { Subscription } from "rxjs";
 import { AuditService } from "src/app/core/services/audit.service";
-import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
+import { BreakpointService } from "src/app/core/services/breakpoint.service";
+import { LoginRedirectService } from 'src/app/core/services/loginredirect.service'
 
-import { LoginRedirectService } from 'src/app/core/services/loginredirect.service';
 @Component({
   selector: "app-dashboard",
   templateUrl: "./dashboard.component.html",
@@ -20,41 +20,36 @@ export class DashboardComponent implements OnInit, OnDestroy {
   subscriptions: Subscription[] = [];
   userPreferredLangCode = localStorage.getItem("langCode");
   cols : number;
+  sitealignment:string = localStorage.getItem('direction');
 
   constructor(
     private router: Router,
     private dataStorageService: DataStorageService,
     private translateService: TranslateService,
     private appConfigService: AppConfigService,
     private auditService: AuditService,
-    private breakpointObserver: BreakpointObserver,
+    private breakPointService: BreakpointService,
     private redirectService: LoginRedirectService
   ) {
-    this.breakpointObserver.observe([
-      Breakpoints.XSmall,
-      Breakpoints.Small,
-      Breakpoints.Medium,
-      Breakpoints.Large,
-      Breakpoints.XLarge,
-    ]).subscribe(result => {
-      if (result.matches) {
-        if (result.breakpoints[Breakpoints.XSmall]) {
+    this.breakPointService.isBreakpointActive().subscribe(active =>{
+      if (active) {
+        if(active === "extraSmall"){
           this.cols = 1;
         }
-        if (result.breakpoints[Breakpoints.Small]) {
+        if(active === "small"){
           this.cols = 1;
         }
-        if (result.breakpoints[Breakpoints.Medium]) {
+        if(active === "medium"){
           this.cols = 2;
         }
-        if (result.breakpoints[Breakpoints.Large]) {
+        if(active === "large"){
           this.cols = 3;
         }
-        if (result.breakpoints[Breakpoints.XLarge]) {
+        if(active === "ExtraLarge"){
           this.cols = 3;
         }
       }
-    });  
+    });
   }
 
   async ngOnInit() {
@@ -73,7 +68,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
       this.router.navigate(["regcenter"])
     }else if(item === "Booking an Appointment"){
       this.auditService.audit('RP-043', 'Book an appointment', 'RP-Book an appointment', 'Book an appointment', 'User clicks on "book an appointment" card');
-      window.open(this.appConfigService.getConfig()["mosip-prereg-ui-url"], "_blank");
+      window.open(this.appConfigService.getConfig()["mosip-prereg-ui-url"]+"#/"+localStorage.getItem("langCode"), "_blank");
     }else{
      this.router.navigate([item]); 
    }