Merge pull request #2 from venkykandagaddala/cbrelease-4.8.16

Fixed the API error - Domains, Designations and Organisations
KB-iGOT · Aug 16, 2024 · 7467c80 · 7467c80
2 parents a91ed83 + 02cc729
commit 7467c80
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 33 deletions.
diff --git a/project/ws/app/src/lib/routes/home/resolvers/approvedrequests-resolver.service.ts b/project/ws/app/src/lib/routes/home/resolvers/approvedrequests-resolver.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Resolve } from '@angular/router'
-import { Observable, of } from 'rxjs'
+import { of } from 'rxjs'
 import { map, catchError } from 'rxjs/operators'
 // import { IResolveResponse } from '@sunbird-cb/utils'
 // import { RequestsService } from '../services/onboarding-requests.service'
@@ -14,7 +14,7 @@ export class ApprovedRequestsResolve
   url: any
   pageLimit = 1000
   constructor(private http: HttpClient) { }
-  resolve(): Observable<any> {
+  resolve(): any {
     const reqArray = window.location.pathname.split('requests/')
     this.requestType = reqArray[1]
     if (this.requestType === 'designation') {
@@ -36,11 +36,13 @@ export class ApprovedRequestsResolve
       offset: 0,
       deptName: 'iGOT',
     }
-    return this.http.post(this.url, reqbody).pipe(
-      map((datanew: any) => ({
-        data: this.requestType === 'domain' ? datanew.result : datanew.result.data, error: null,
-      })),
-      catchError(error => of({ error, data: null })),
-    )
+    setTimeout(() => {
+      return this.http.post(this.url, reqbody).pipe(
+        map((datanew: any) => ({
+          data: this.requestType === 'domain' ? datanew.result : datanew.result.data, error: null,
+        })),
+        catchError(error => of({ error, data: null })),
+      )
+    },         1000)
   }
 }
diff --git a/project/ws/app/src/lib/routes/home/resolvers/rejectedrequests-reoslver.service.ts b/project/ws/app/src/lib/routes/home/resolvers/rejectedrequests-reoslver.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Resolve } from '@angular/router'
-import { Observable, of } from 'rxjs'
+import { of } from 'rxjs'
 import { map, catchError } from 'rxjs/operators'
 
 @Injectable()
@@ -12,7 +12,7 @@ export class RejectedRequestsResolve
   url: any
   pageLimit = 1000
   constructor(private http: HttpClient) { }
-  resolve(): Observable<any> {
+  resolve(): any {
     const reqArray = window.location.pathname.split('requests/')
     this.requestType = reqArray[1]
     if (this.requestType === 'designation') {
@@ -34,11 +34,14 @@ export class RejectedRequestsResolve
       offset: 0,
       deptName: 'iGOT',
     }
-    return this.http.post(this.url, reqbody).pipe(
-      map((datanew: any) => ({
-        data: this.requestType === 'domain' ? datanew.result : datanew.result.data, error: null,
-      })),
-      catchError(error => of({ error, data: null })),
-    )
+    setTimeout(() => {
+      return this.http.post(this.url, reqbody).pipe(
+        map((datanew: any) => ({
+          data: this.requestType === 'domain' ? datanew.result : datanew.result.data, error: null,
+        })),
+        catchError(error => of({ error, data: null })),
+      )
+    },         1000)
+
   }
 }
diff --git a/project/ws/app/src/lib/routes/home/resolvers/requests-resolver.service.ts b/project/ws/app/src/lib/routes/home/resolvers/requests-resolver.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Resolve } from '@angular/router'
-import { Observable, of } from 'rxjs'
+import { of } from 'rxjs'
 import { map, catchError } from 'rxjs/operators'
 // import { IResolveResponse } from '@sunbird-cb/utils'
 // import { RequestsService } from '../services/onboarding-requests.service'
@@ -14,7 +14,7 @@ export class RequestsResolve
   url: any
   pageLimit = 1000
   constructor(private http: HttpClient) { }
-  resolve(): Observable<any> {
+  resolve(): any {
     const reqArray = window.location.pathname.split('requests/')
     this.requestType = reqArray[1]
 
@@ -37,11 +37,14 @@ export class RequestsResolve
       offset: 0,
       deptName: 'iGOT',
     }
-    return this.http.post(this.url, reqbody).pipe(
-      map((datanew: any) => ({
-        data: this.requestType === 'domain' ? datanew.result : datanew.result.data, error: null,
-      })),
-      catchError(error => of({ error, data: null })),
-    )
+    setTimeout(() => {
+      return this.http.post(this.url, reqbody).pipe(
+        map((datanew: any) => ({
+          data: this.requestType === 'domain' ? datanew.result : datanew.result.data, error: null,
+        })),
+        catchError(error => of({ error, data: null })),
+      )
+    },         1000)
+
   }
 }
diff --git a/...ct/ws/app/src/lib/routes/home/routes/onboarding-requests/onboarding-requests.component.ts b/...ct/ws/app/src/lib/routes/home/routes/onboarding-requests/onboarding-requests.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { AfterViewChecked, ChangeDetectorRef, Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { RequestsService } from '../../services/onboarding-requests.service'
 import { PageEvent } from '@angular/material'
@@ -9,7 +9,7 @@ import * as _ from 'lodash'
   templateUrl: './onboarding-requests.component.html',
   styleUrls: ['./onboarding-requests.component.scss'],
 })
-export class OnboardingRequestsComponent implements OnInit {
+export class OnboardingRequestsComponent implements OnInit, AfterViewChecked {
   tabledata: any = []
   tabledataApproved: any = []
   tabledataPositions: any = []
@@ -25,7 +25,10 @@ export class OnboardingRequestsComponent implements OnInit {
   pendingListRecord?: number | 0
   totalRecords?: number | 0
 
-  constructor(private route: Router, private activatedRoute: ActivatedRoute, private requestService: RequestsService) {
+  constructor(private route: Router,
+              private activatedRoute: ActivatedRoute,
+              private requestService: RequestsService,
+              private cdr: ChangeDetectorRef) {
     // this.requestType = this.activatedRoute.snapshot.params.type
   }
 
@@ -43,7 +46,8 @@ export class OnboardingRequestsComponent implements OnInit {
         this.currentFilter = 'pending'
       }
       if (this.requestType === 'position') {
-        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.positionsList.data) {
+        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.positionsList
+          && this.activatedRoute.snapshot.data.positionsList.data) {
           const resData = this.activatedRoute.snapshot.data.positionsList.data
           resData.forEach((req: any) => {
             this.data.push(req)
@@ -53,7 +57,8 @@ export class OnboardingRequestsComponent implements OnInit {
           this.data = []
         }
       } else if (this.requestType === 'organisation') {
-        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.requestsList.data) {
+        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.requestsList
+          && this.activatedRoute.snapshot.data.requestsList.data) {
           const resData = this.activatedRoute.snapshot.data.requestsList.data
           this.formatData(resData, this.currentFilter)
         } else {
@@ -111,6 +116,10 @@ export class OnboardingRequestsComponent implements OnInit {
     })
   }
 
+  ngAfterViewChecked(): void {
+    this.cdr.detectChanges()
+  }
+
   getDisplayName() {
     return this.displayType.charAt(0).toUpperCase() + this.displayType.substr(1).toLowerCase()
   }
@@ -183,7 +192,8 @@ export class OnboardingRequestsComponent implements OnInit {
       case 'pending':
         this.data = []
         this.currentFilter = 'pending'
-        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.requestsList.data && this.requestType === 'organisation') {
+        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.requestsList
+          && this.activatedRoute.snapshot.data.requestsList.data && this.requestType === 'organisation') {
           const resData = this.activatedRoute.snapshot.data.requestsList.data
           this.formatData(resData, 'pending')
         } else {
@@ -193,7 +203,8 @@ export class OnboardingRequestsComponent implements OnInit {
       case 'approved':
         this.data = []
         this.currentFilter = 'approved'
-        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.aprovedrequestsList.data && this.requestType === 'organisation') {
+        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.aprovedrequestsList
+          && this.activatedRoute.snapshot.data.aprovedrequestsList.data && this.requestType === 'organisation') {
           const resData = this.activatedRoute.snapshot.data.aprovedrequestsList.data
           this.formatData(resData, 'approved')
         } else {
@@ -203,7 +214,8 @@ export class OnboardingRequestsComponent implements OnInit {
       case 'rejected':
         this.data = []
         this.currentFilter = 'rejected'
-        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.rejectedList.data && this.requestType === 'organisation') {
+        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.rejectedList
+          && this.activatedRoute.snapshot.data.rejectedList.data && this.requestType === 'organisation') {
           const resData = this.activatedRoute.snapshot.data.rejectedList.data
           this.formatData(resData, 'rejected')
         } else {
@@ -213,7 +225,8 @@ export class OnboardingRequestsComponent implements OnInit {
       case 'designations':
         this.data = []
         this.currentFilter = 'designations'
-        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.positionsList.data) {
+        if (this.activatedRoute.snapshot.data && this.activatedRoute.snapshot.data.positionsList
+          && this.activatedRoute.snapshot.data.positionsList.data) {
           const resData = this.activatedRoute.snapshot.data.positionsList.data
           resData.forEach((req: any) => {
             this.data.push(req)