Merge pull request #125 from NandiniAV/dev-mdo-fixes

Added rolesaccess search on enter key
sunbird-cb · May 19, 2022 · 02a580f · 02a580f
2 parents 9f12f91 + 59e2c0c
commit 02a580f
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/project/ws/app/src/lib/routes/access/routes/users/users.component.html b/project/ws/app/src/lib/routes/access/routes/users/users.component.html
@@ -2,7 +2,8 @@
   <mat-card class="flex-custom ws-mat-accent-border">
     <mat-card-content>
       <ng-container>
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="data" (actionsClick)="menuActions($event)">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="data" (actionsClick)="menuActions($event)"
+          (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>

diff --git a/project/ws/app/src/lib/routes/access/routes/users/users.component.ts b/project/ws/app/src/lib/routes/access/routes/users/users.component.ts
@@ -161,4 +161,38 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       //     break
     }
   }
+
+  onEnterkySearch(enterValue: any) {
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.usersSvc.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
+      this.usersData = data.result.response
+
+      let users: any[] = []
+      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+        users = _.map(_.compact(_.map(this.usersData.content, i => {
+          let consider = false
+          if (!i.isDeleted && i.organisations && i.organisations.length > 0) {
+            _.each(i.organisations, o => {
+              if (!o.isDeleted && (o.roles || []).indexOf(this.roleName) >= 0) {
+                consider = true
+              }
+            })
+          }
+          return consider ? i : null
+        })),
+          // tslint:disable-next-line
+          user => {
+            return {
+              fullName: `${user.firstName} ${user.lastName}`,
+              email: _.get(user, 'profileDetails.personalDetails.primaryEmail') || user.email,
+              position: user.department_name,
+              role: this.getRoleList(user),
+              wid: user.userId,
+            }
+          })
+      }
+      this.data = users
+    }
+    )
+  }
 }
diff --git a/project/ws/app/src/lib/routes/access/services/users.service.ts b/project/ws/app/src/lib/routes/access/services/users.service.ts
@@ -7,6 +7,7 @@ const API_END_POINTS = {
   USER_BDD: '/apis/protected/v8/portal/mdo/deptAction/userrole',
   ACTIVE_USER: 'apis/proxies/v8/user/v1/unblock',
   DE_ACTIVE_USER: 'apis/proxies/v8/user/v1/block',
+  SEARCH_USER_TABLE: '/apis/proxies/v8/user/v1/search',
 }
 
 @Injectable({
@@ -29,4 +30,16 @@ export class UsersService {
   deleteUser(user: object): Observable<any> {
     return this.http.patch<any>(`${API_END_POINTS.USER_BDD}/`, user)
   }
+  searchUserByenter(value: string, rootOrgId: string) {
+    const reqBody = {
+      request: {
+        query: value,
+        filters: {
+          rootOrgId,
+        },
+      },
+    }
+
+    return this.http.post<any>(`${API_END_POINTS.SEARCH_USER_TABLE}`, reqBody)
+  }
 }